diff --git a/README.md b/README.md index 4b430f9..4b5b8e2 100644 --- a/README.md +++ b/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 diff --git a/defaults/main.yml b/defaults/main.yml index 6deceda..fecd353 100644 --- a/defaults/main.yml +++ b/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 diff --git a/tasks/configure-Debian.yml b/tasks/configure-Debian.yml index 1e67072..f653e8c 100644 --- a/tasks/configure-Debian.yml +++ b/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" - dest: "{{ apache_conf_path }}/sites-enabled/vhosts.conf" + src: "{{ apache_conf_path }}/sites-available/{{ apache_vhosts_filename }}" + dest: "{{ apache_conf_path }}/sites-enabled/{{ apache_vhosts_filename }}" state: link when: apache_create_vhosts diff --git a/tasks/configure-RedHat.yml b/tasks/configure-RedHat.yml index 2c1c01b..695a9cf 100644 --- a/tasks/configure-RedHat.yml +++ b/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