Use Debians sites-available, sites-enabled structure.

robertdebock · Jan 7, 2025 · c627db8 · c627db8
1 parent 2fe78ad
commit c627db8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -9,6 +9,7 @@
     - role: robertdebock.epel
     - role: robertdebock.buildtools
     - role: robertdebock.python_pip
+      python_pip_update: false
     - role: robertdebock.openssl
       openssl_items:
         - name: apache-httpd

diff --git a/tasks/vhosts.yml b/tasks/vhosts.yml
@@ -23,3 +23,16 @@
   notify:
     - Test httpd configuration validity
     - Restart httpd
+
+- name: vhosts | Enable vhosts
+  ansible.builtin.command:
+    cmd: "a2ensite {{ item.name }}"
+    creates: "{{ httpd_vhosts_enabled_directory }}/{{ item.name }}.conf"
+  loop: "{{ httpd_vhosts }}"
+  loop_control:
+    label: "{{ item.name }}"
+  when:
+    - ansible_os_family == 'Debian'
+  notify:
+    - Test httpd configuration validity
+    - Restart httpd
diff --git a/vars/main.yml b/vars/main.yml
@@ -86,11 +86,13 @@ httpd_config_dest: "{{ _httpd_config_dest[ansible_os_family] }}"
 _httpd_vhosts_directory:
   default: "{{ httpd_server_root }}/conf.d"
   Alpine: "{{ httpd_server_root }}/conf.d"
-  Debian: "{{ httpd_server_root }}/sites-enabled"
+  Debian: "{{ httpd_server_root }}/sites-available"
   Suse: "{{ httpd_server_root }}/conf.d"
 
 httpd_vhosts_directory: "{{ _httpd_vhosts_directory[ansible_os_family] | default(_httpd_vhosts_directory['default']) }}"
 
+httpd_vhosts_enabled_directory: "{{ httpd_server_root }}/sites-enabled"
+
 # Some distributions have the "Listen" parameters somewhere else.
 _httpd_ports_conf:
   Debian: ports.conf