Skip to content

Commit 7700e28

Browse files
committed
💚 Fix alpine 3 php path changes
PHP5 is now using /etc/php5/... instead of /etc/php/...
1 parent a0d2a47 commit 7700e28

File tree

54 files changed

+30
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+30
-664
lines changed

docker/php/alpine-3-php7/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22

33
- include: bootstrap/php.yml
4-
- include: bootstrap/php-module.yml
54
- include: bootstrap/php-fpm.main.yml
65
- include: bootstrap/php-fpm.pool.yml
76
- include: bootstrap/php-fpm.yml

docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212

1313
- name: Set php main file
1414
set_fact:
15-
php_main_conf: /etc/php/php-fpm.conf
16-
when: ansible_os_family == 'Alpine'
17-
18-
- name: Set php main file
19-
set_fact:
20-
php_main_conf: /etc/php/php-fpm.conf
15+
php_main_conf: /etc/php5/php-fpm.conf
2116
when: ansible_os_family == 'Alpine'
2217

2318
- name: Move php-fpm main file to /opt/docker/etc/php/fpm/

docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
- name: Set php pool file
3838
set_fact:
3939
php_pool_conf: www.conf
40-
php_pool_dir: /etc/php/fpm.d
40+
php_pool_dir: /etc/php5/fpm.d
4141
when: ansible_os_family == 'Alpine'
4242

4343
- name: Move php-fpm pool directory file to /opt/docker/etc/php/

docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

docker/php/alpine-3/conf/provision/roles/webdevops-php/tasks/bootstrap/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
- name: Create link for additional php.ini [Alpine family]
5454
file:
5555
src: '/opt/docker/etc/php/{{ item.file }}'
56-
dest: '/etc/php/conf.d/{{ item.target }}'
56+
dest: '/etc/php5/conf.d/{{ item.target }}'
5757
state: link
5858
force: yes
5959
with_items:
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22

33
- include: bootstrap/php.yml
4-
- include: bootstrap/php-module.yml
54
- include: bootstrap/php-fpm.main.yml
65
- include: bootstrap/php-fpm.pool.yml
76
- include: bootstrap/php-fpm.yml

docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.main.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212

1313
- name: Set php main file
1414
set_fact:
15-
php_main_conf: /etc/php/php-fpm.conf
16-
when: ansible_os_family == 'Alpine'
17-
18-
- name: Set php main file
19-
set_fact:
20-
php_main_conf: /etc/php/php-fpm.conf
15+
php_main_conf: /etc/php5/php-fpm.conf
2116
when: ansible_os_family == 'Alpine'
2217

2318
- name: Move php-fpm main file to /opt/docker/etc/php/fpm/

docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-fpm.pool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
- name: Set php pool file
3838
set_fact:
3939
php_pool_conf: www.conf
40-
php_pool_dir: /etc/php/fpm.d
40+
php_pool_dir: /etc/php5/fpm.d
4141
when: ansible_os_family == 'Alpine'
4242

4343
- name: Move php-fpm pool directory file to /opt/docker/etc/php/

docker/php/centos-7-php56/conf/provision/roles/webdevops-php/tasks/bootstrap/php-module.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)