Skip to content

Commit 9a5ffaa

Browse files
committed
Fix order of injected apache2 configuration
Fixes IfModule statements because modules were loaded after our configuration
1 parent 869d807 commit 9a5ffaa

39 files changed

Lines changed: 78 additions & 78 deletions

File tree

  • docker
    • apache
      • alpine-3/conf/provision/roles/webdevops-apache/tasks
      • centos-7/conf/provision/roles/webdevops-apache/tasks
      • debian-7/conf/provision/roles/webdevops-apache/tasks
      • debian-8/conf/provision/roles/webdevops-apache/tasks
      • debian-9/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks
    • hhvm-apache
      • ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks
    • php-apache-dev
      • alpine-3-php7/conf/provision/roles/webdevops-apache/tasks
      • alpine-3/conf/provision/roles/webdevops-apache/tasks
      • centos-7-php56/conf/provision/roles/webdevops-apache/tasks
      • centos-7/conf/provision/roles/webdevops-apache/tasks
      • debian-7/conf/provision/roles/webdevops-apache/tasks
      • debian-8-php7/conf/provision/roles/webdevops-apache/tasks
      • debian-8/conf/provision/roles/webdevops-apache/tasks
      • debian-9/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks
    • php-apache
      • alpine-3-php7/conf/provision/roles/webdevops-apache/tasks
      • alpine-3/conf/provision/roles/webdevops-apache/tasks
      • centos-7-php56/conf/provision/roles/webdevops-apache/tasks
      • centos-7/conf/provision/roles/webdevops-apache/tasks
      • debian-7/conf/provision/roles/webdevops-apache/tasks
      • debian-8-php7/conf/provision/roles/webdevops-apache/tasks
      • debian-8/conf/provision/roles/webdevops-apache/tasks
      • debian-9/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks
      • ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks
  • provisioning/apache/general/provision/roles/webdevops-apache/tasks

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/centos-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/debian-7/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/debian-8/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/debian-9/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/ubuntu-12.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/ubuntu-14.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/ubuntu-15.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/ubuntu-15.10/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

docker/apache/ubuntu-16.04/conf/provision/roles/webdevops-apache/tasks/bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Set apache vhost file [RedHat family]
44
set_fact:
55
apache_main_path: /etc/httpd/
6-
apache_docker_vhost: /etc/httpd/conf.d/docker.conf
6+
apache_docker_vhost: /etc/httpd/conf.d/zzz-docker.conf
77
when: ansible_os_family == 'RedHat'
88

99
- name: Set apache vhost file [Debian family]
@@ -15,7 +15,7 @@
1515
- name: Set apache vhost file [Alpine family]
1616
set_fact:
1717
apache_main_path: /etc/apache2/
18-
apache_docker_vhost: /etc/apache2/conf.d/docker.conf
18+
apache_docker_vhost: /etc/apache2/conf.d/zzz-docker.conf
1919
when: ansible_os_family == 'Alpine'
2020

2121
- name: Enable apache main config

0 commit comments

Comments
 (0)