ansible-roles/apache#4 Change roles and inventory to change Apache default version to 2.4

defaults/main.yml

@@ -21,7 +21,4 @@ sd_plugins_files_dir: "{{ playbook_dir }}/files/sd-plugins"
 
 sd_uninstallv1: no
 
-apache_conf_dir: 'conf.d'
-apache_conf_ext: ''
-
 mysql_root_password: 'root'

tasks/apache.yml

@@ -27,12 +27,12 @@
 - name: "ServerDensity | Apache | Configuration file for ServerDensity"
   template:
     src=etc-apache2-sites-available-sd-agent
-    dest=/etc/apache2/sites-available/sd-agent{{ apache_conf_ext }}
+    dest=/etc/apache2/sites-available/sd-agent{{ apache_conf_ext|default('.conf') }}
     owner=root
     group=root
     mode=0644
   notify: "ServerDensity | Restart Apache"
 
 - name: "ServerDensity | Apache | Enable the sd-agent site"
-  command: a2ensite sd-agent creates=/etc/apache2/sites-enabled/sd-agent{{ apache_conf_ext }}
+  command: a2ensite sd-agent creates=/etc/apache2/sites-enabled/sd-agent{{ apache_conf_ext|default('.conf') }}
   notify: "ServerDensity | Restart Apache"

templates/etc-apache2-sites-available-sd-agent

 <VirtualHost *:80>
-  Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
+  Include /etc/apache2/{{ apache_conf_dir|default('conf-available') }}/global-redirect.conf
 
   ServerName {{ inventory_hostname }}
   <Location /server-status>