Add an option to create docroot.

robertdebock · Dec 8, 2021 · 4f18122 · 4f18122
1 parent fb1259f
commit 4f18122
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -46,6 +46,10 @@
       #       - name: proxy-initial-not-pooled
       #       - name: proxy-sendchunks
       #         value: 1
+      #   - name: no_doc_root
+      #     servername: nodocroot.example.com
+      #     documentroot: /var/www/html/nodocroot
+      #     create_docroot: no
       httpd_directories:
         - name: my_directory
           path: "{{ httpd_data_directory }}/my_directory"

diff --git a/tasks/assert.yml b/tasks/assert.yml
@@ -86,6 +86,18 @@
   when:
     - httpd_vhosts is defined
 
+- name: test if item.create_docroot in httpd_vhosts is set correctly
+  ansible.builtin.assert:
+    that:
+      - item.create_docroot is boolean
+    quiet: yes
+  loop: "{{ httpd_vhosts }}"
+  loop_control:
+    label: "{{ item.name }}"
+  when:
+    - httpd_vhosts is defined
+    - item.create_docroot
+
 - name: test if item.serveralias in httpd_vhosts is set correctly
   ansible.builtin.assert:
     that:

diff --git a/tasks/vhosts.yml b/tasks/vhosts.yml
@@ -11,6 +11,7 @@
   when:
     - httpd_vhosts is defined
     - item.documentroot is defined
+    - item.create_docroot is not defined or item.create_docroot
 
 - name: configure vhosts
   ansible.builtin.template: