Skip to content

Commit 44a7b45

Browse files
authored
Merge pull request #2 from Cleming/master
Role upgrade (remove deprecated package and syntax, upgrade PHP default version)
2 parents 9c7dcdb + 4a12a76 commit 44a7b45

File tree

4 files changed

+22
-32
lines changed

4 files changed

+22
-32
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Required packages (installed automatically) :
1111
- php7-fpm
1212
- php7.0-opcache
1313
- php-apcu
14-
- php7.0-mcrypt
1514
- php7.0-gd
1615
- php7.0-curl
1716
- php-pear

defaults/main.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,24 @@ php7_mbstring_http_input: "auto"
88
php7_memory_limit: 128M
99
php7_post_max_size: 40M
1010
php7_upload_max_filesize: 20M
11-
php7_version: 7.0
11+
php7_version: 7.2
12+
php7_default_packages:
13+
- php{{ php7_version }}-fpm
14+
- composer
15+
- php-apcu
16+
- php-pear
17+
- php{{ php7_version }}-bz2
18+
- php{{ php7_version }}-cli
19+
- php{{ php7_version }}-curl
20+
- php{{ php7_version }}-gd
21+
- php{{ php7_version }}-intl
22+
- php{{ php7_version }}-mbstring
23+
- php{{ php7_version }}-mysql
24+
- php{{ php7_version }}-opcache
25+
- php{{ php7_version }}-readline
26+
- php{{ php7_version }}-xml
27+
- php{{ php7_version }}-zip
28+
29+
php7_all_packages:
30+
- "{{ php7_default_packages }}"
31+
- "{{ php7_module_debs }}"

tasks/php7-fpm.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,11 @@
99

1010
- name: Installs php7-fpm
1111
apt:
12-
pkg: "{{ item }}"
12+
pkg: "{{ php7_all_packages }}"
1313
state: latest
1414
update_cache: yes
1515
notify:
1616
- Restart php7-fpm
17-
with_items:
18-
- php{{ php7_version }}-fpm
19-
- composer
20-
- php-apcu
21-
- php-pear
22-
- php{{ php7_version }}-bz2
23-
- php{{ php7_version }}-cli
24-
- php{{ php7_version }}-curl
25-
- php{{ php7_version }}-gd
26-
- php{{ php7_version }}-intl
27-
- php{{ php7_version }}-mbstring
28-
- php{{ php7_version }}-mcrypt
29-
- php{{ php7_version }}-mysql
30-
- php{{ php7_version }}-opcache
31-
- php{{ php7_version }}-readline
32-
- php{{ php7_version }}-xml
33-
- php{{ php7_version }}-zip
34-
- "[{{ php7_module_debs }}]"
3517

3618
- name: Adds php.ini
3719
template:

templates/php.ini.j2

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,17 +1857,6 @@ soap.wsdl_cache_limit = 5
18571857
; Sets the maximum number of open links or -1 for unlimited.
18581858
ldap.max_links = -1
18591859

1860-
[mcrypt]
1861-
; For more information about mcrypt settings see http://php.net/mcrypt-module-open
1862-
1863-
; Directory where to load mcrypt algorithms
1864-
; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
1865-
;mcrypt.algorithms_dir=
1866-
1867-
; Directory where to load mcrypt modes
1868-
; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
1869-
;mcrypt.modes_dir=
1870-
18711860
[dba]
18721861
;dba.default_handler=
18731862

0 commit comments

Comments
 (0)