Merge pull request #23 from LewisW/master

Made "vhost.conf" filename configurable

README.md

@@ -51,6 +51,10 @@ Other SSL directives can be managed with other SSL-related role variables.
 
 The SSL protocols and cipher suites that are used/allowed when clients make secure connections to your server. These are secure/sane defaults, but for maximum security, performand, and/or compatibility, you may need to adjust these settings.
 
+	apache_vhosts_filename: 'vhosts.conf'
+	
+The filename used for the vhost configuration.
+
     apache_mods_enabled:
       - rewrite.load
       - ssl.load

defaults/main.yml

@@ -25,6 +25,7 @@ apache_ssl_protocol: "All -SSLv2 -SSLv3"
 apache_ssl_cipher_suite: "AES256+EECDH:AES256+EDH"
 
 apache_vhosts_version: "2.2"
+apache_vhosts_filename: "vhosts.conf"
 
 apache_mods_enabled:
   - rewrite.load

tasks/configure-Debian.yml

@@ -19,7 +19,7 @@
 - name: Add apache vhosts configuration.
   template:
     src: "vhosts-{{ apache_vhosts_version }}.conf.j2"
-    dest: "{{ apache_conf_path }}/sites-available/vhosts.conf"
+    dest: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
     owner: root
     group: root
     mode: 0644
@@ -28,7 +28,7 @@
 
 - name: Add vhost symlink in sites-enabled.
   file:
-    src: "{{ apache_conf_path }}/sites-available/vhosts.conf"
+    src: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}"
-    dest: "{{ apache_conf_path }}/sites-enabled/vhosts.conf"
+    dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}"
     state: link
   when: apache_create_vhosts

tasks/configure-RedHat.yml

@@ -11,7 +11,7 @@
 - name: Add apache vhosts configuration.
   template:
     src: "vhosts-{{ apache_vhosts_version }}.conf.j2"
-    dest: "{{ apache_conf_path }}/vhosts.conf"
+    dest: "{{ apache_conf_path }}/{{ apache_vhosts_filename }}"
     owner: root
     group: root
     mode: 0644