Make new apache config to also work with 2.2

defaults/main.yml

@@ -2,9 +2,6 @@ apache_repositories: []
 apache_packages:
   - apache2
   - apache2-utils
-  - apache2-mpm-event
-  - apache2-mpm-worker
-  - apache2-suexec-custom
   - libapache2-mod-fcgid
 apache_modules:
   - actions
@@ -13,9 +10,9 @@ apache_modules:
   - fcgid
   - rewrite
   - ssl
-  - suexec
   - vhost_alias
 apache_version: '2.2'
+apache_conf_dir: 'conf.d'
 apache_conf_ext: ''
 apache_conf_default_prefix: ''
 apache_server_admin: 'webmaster@paragon-es.de'

tasks/apache.yml

@@ -31,7 +31,7 @@
 - name: "Apache | Configure Security Settings"
   template:
     src='etc-apache2-conf-available-security'
-    dest='/etc/apache2/conf-available/security.conf'
+    dest='/etc/apache2/{{ apache_conf_dir }}/security.conf'
     owner='root'
     group='root'
     mode='644'
@@ -41,7 +41,7 @@
 - name: "Apache | Create Global Redirect Configuration"
   template:
     src='etc-apache2-conf-available-global-redirect'
-    dest='/etc/apache2/conf-available/global-redirect.conf'
+    dest='/etc/apache2/{{ apache_conf_dir }}/global-redirect.conf'
     owner='root'
     group='root'
     mode='644'
@@ -51,7 +51,7 @@
 - name: "Apache | Create Global Deny Configuration"
   template:
     src='etc-apache2-conf-available-global-deny'
-    dest='/etc/apache2/conf-available/global-deny.conf'
+    dest='/etc/apache2/{{ apache_conf_dir }}/global-deny.conf'
     owner='root'
     group='root'
     mode='644'
@@ -147,6 +147,13 @@
     mode=640
   when: apache_auth
 
+- name: "Apache | Create default content directory"
+  file:
+    dest=/var/www/html
+    state=directory
+    owner=www-data
+    group=www-data
+
 - name: "Apache | Copy default HTML site"
   template:
     src=index.html

templates/etc-apache2-conf-available-global-deny

 {% if apache_version == '2.2' %}
-Order allow,deny
-allow from all
+# Nothing to do here, this is on purpose
 {% else %}
 <RequireAll>
   Require all granted