Explorar o código

Update Apache vhosts to make them work with Apache >= 2.4

Emmanuel Bouthenot %!s(int64=10) %!d(string=hai) anos
pai
achega
43a64b24e2
Modificáronse 2 ficheiros con 6 adicións e 6 borrados
  1. 2 2
      roles/monitoring/tasks/munin.yml
  2. 4 4
      roles/webserver/tasks/apache2.yml

+ 2 - 2
roles/monitoring/tasks/munin.yml

@@ -56,13 +56,13 @@
   when: with_munin and with_nginx is defined and with_nginx
 
 - name: Install apache2 virtual host for munin (sites-available)
-  template: src=munin/apache2_vhost.j2 dest=/etc/apache2/sites-available/munin owner=root group=root mode=0644
+  template: src=munin/apache2_vhost.j2 dest=/etc/apache2/sites-available/munin.conf owner=root group=root mode=0644
   notify:
     - Reload apache2 for munin
   when: with_munin and with_apache2 is defined and with_apache2
 
 - name: Install apache2 virtual host for munin (sites-enabled)
-  file: src=/etc/apache2/sites-available/munin path=/etc/apache2/sites-enabled/munin state=link
+  file: src=/etc/apache2/sites-available/munin.conf path=/etc/apache2/sites-enabled/munin.conf state=link
   notify:
     - Reload apache2 for munin
   when: with_munin and with_apache2 is defined and with_apache2

+ 4 - 4
roles/webserver/tasks/apache2.yml

@@ -13,25 +13,25 @@
   when: with_apache2
 
 - name: Install PHPMyAdmin virtual host for apache2 (sites-available)
-  template: src=apache2/pma_vhost.j2 dest=/etc/apache2/sites-available/pma owner=root group=root mode=0644
+  template: src=apache2/pma_vhost.j2 dest=/etc/apache2/sites-available/pma.conf owner=root group=root mode=0644
   notify:
     - Reload apache2
   when: with_phpmyadmin and with_apache2
 
 - name: Install PHPMyAdmin virtual host for apache2 (sites-enabled)
-  file: src=/etc/apache2/sites-available/pma path=/etc/apache2/sites-enabled/pma state=link
+  file: src=/etc/apache2/sites-available/pma.conf path=/etc/apache2/sites-enabled/pma.conf state=link
   notify:
     - Reload apache2
   when: with_phpmyadmin and with_apache2
 
 - name: Install PHP system checks virtual host for apache2 (sites-available)
-  template: src=apache2/sys_vhost.j2 dest=/etc/apache2/sites-available/sys owner=root group=root mode=0644
+  template: src=apache2/sys_vhost.j2 dest=/etc/apache2/sites-available/sys.conf owner=root group=root mode=0644
   notify:
     - Reload apache2
   when: with_php and with_apache2
 
 - name: Install PHP system checks virtual host for apache2 (sites-enabled)
-  file: src=/etc/apache2/sites-available/sys path=/etc/apache2/sites-enabled/sys state=link
+  file: src=/etc/apache2/sites-available/sys.conf path=/etc/apache2/sites-enabled/sys.conf state=link
   notify:
     - Reload apache2
   when: with_php and with_apache2