allow multiple domains to optimize setup timeHEADmaster

3 files changed, 24 insertions, 17 deletions

diff --git a/tasks/create-website.yml b/tasks/create-website.yml
new file mode 100644
index 0000000..6f8c81f
--- /dev/null
+++ b/tasks/create-website.yml
@@ -0,0 +1,14 @@
+- name: Make sure root directory {{ nginx_root }} exists
+  file:
+    path: "{{ nginx_root }}"
+    state: directory
+    owner: "{{ nginx_upload_user }}"
+    group: "{{ nginx_upload_group }}"
+
+- name: Install nginx configuration file {{ nginx_filename }}
+  template:
+    src: templates/nginx.j2
+    dest: /etc/nginx/sites-available/{{ nginx_filename }}
+    owner: root
+    group: root
+  notify: restart nginx
diff --git a/tasks/main.yml b/tasks/main.yml
index 4ffde51..dac4bd6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,17 +20,13 @@
     owner: "{{ nginx_upload_user }}"
     group: "{{ nginx_upload_group }}"
 
-- name: Make sure root directory {{ nginx_root }} exists
-  file:
-    path: "{{ nginx_root }}"
-    state: directory
-    owner: "{{ nginx_upload_user }}"
-    group: "{{ nginx_upload_group }}"
-
-- name: Install nginx configuration file {{ nginx_filename }}
-  template:
-    src: templates/nginx.j2
-    dest: /etc/nginx/sites-available/{{ nginx_filename }}
-    owner: root
-    group: root
-  notify: restart nginx
+- include_tasks: create-website.yml
+  vars:
+    nginx_domain: "{{ nginx_item.domain }}"
+    nginx_root: "/var/www/{{ nginx_item.domain }}/"
+    nginx_filename: "static-{{ nginx_item.domain }}"
+    nginx_autoindex: "{{ nginx_item.autoindex | default(None) }}"
+    nginx_auth_file: "{{ nginx_item.auth_file | default(None) }}"
+  with_items: "{{ nginx_domains }}"
+  loop_control:
+    loop_var: nginx_item
diff --git a/vars/main.yml b/vars/main.yml
index 7d4fb5f..dbc3a42 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,5 +1,2 @@
 ---
 # vars file for MicroJoe.staticwebsite
-
-nginx_root: "/var/www/{{ nginx_domain }}/"
-nginx_filename: "static-{{ nginx_domain }}"