2 files changed, 40 insertions, 24 deletions
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 8b32f07..042b317 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -1,24 +1 @@
----
-- name: Install nginx
-  apt: name=nginx state=present
-
-- name: Copy nginx configuration for wordpress
-  template: src=default.conf dest=/etc/nginx/conf.d/default.conf
-  notify: restart nginx
-
-mkdir -p /srv/http/default
-
-- name: Setup default nginx pages
-  copy:
-    src: "{{item.src}}"
-    dest: "/srv/http/default/www/{{item.dest}}"
-    owner: www-data
-    group: www-data
-    force: no
-  tags:
-    - nginx
-  with_items:
-    - {src: "static_files/nginx_default_404.html", dest: "404.html"}
-    - {src: "static_files/nginx_default_50x.html", dest: "50x.html"}
-    - {src: "static_files/nginx_default_favicon.png", dest: "favicon.png"}
-    - {src: "static_files/nginx_default_index.html", dest: "index.html"}
+- include: nginx.yml tags=nginx
diff --git a/roles/nginx/tasks/nginx.yml b/roles/nginx/tasks/nginx.yml
new file mode 100644
index 0000000..fdc91c8
--- /dev/null
+++ b/roles/nginx/tasks/nginx.yml
@@ -0,0 +1,39 @@
+---
+
+- name: Ensure Apache HTTP is Not Installed
+  apt: name=apache2 state=absent
+
+- name: Install nginx
+  apt: name=nginx state=present
+
+- name: Create default nginx content directory
+  file: path=/srv/http/default/www
+        state=directory
+        owner=www-data
+        group=www-data
+        mode=0775
+        recurse=yes
+
+- name: Setup default nginx pages
+  copy:
+    src: "{{item.src}}"
+    dest: "/srv/http/default/www/{{item.dest}}"
+    owner: www-data
+    group: www-data
+    force: no
+  with_items:
+    - {src: "{{ nginx_default_404 }}",      dest: "404.html"}
+    - {src: "{{ nginx_default_50x }}",      dest: "50x.html"}
+    - {src: "{{ nginx_default_favicon }}",  dest: "favicon.png"}
+    - {src: "{{ nginx_default_index }}",    dest: "index.html"}
+
+- name: Copy generic (default) nginx site configuration
+  template: src=etc_nginx_sites-available_default.j2
+            dest=/etc/nginx/sites-available/default
+
+- name: Create nginx symlink for default
+  file: state=link
+        src=/etc/nginx/sites-available/default
+        dest=/etc/nginx/sites-enabled/default
+  notify: nginx restart     # reload not sufficient?
+