1 files changed, 21 insertions, 16 deletions

diff --git a/nginx/tasks/main.yaml b/nginx/tasks/main.yaml
index 5cace24..846650d 100644
--- a/nginx/tasks/main.yaml
+++ b/nginx/tasks/main.yaml
@@ -1,39 +1,44 @@
 ---
 
-- name: install nginx packages
+- name: apt install nginx
   become: yes
   apt: name="nginx"
 
-- name: install site
+- name: disable default site
   become: yes
-  template: src="{{nginx_conf_src}}" dest="/etc/nginx/sites-available/{{nginx_conf_dst}}"
-  notify: restart nginx
+  file: path="/etc/nginx/sites-enabled/default" state="absent"
 
-- name: install nginx packages
+- name: install base config
   become: yes
-  apt: name="python-certbot-nginx"
+  copy: src="nginx.conf" dest="/etc/nginx/nginx.conf"
   notify: restart nginx
-  when: nginx_enable_certbot
 
-- name: install certbot in nginx
+- name: make stream dirs
   become: yes
-  command: "certbot certonly --nginx -n --agree-tos -d {{nginx_server_name}} -m {{nginx_admin_email}}"
-  changed_when: false
-  when: nginx_enable_certbot
+  file: path="/etc/nginx/streams-{{item}}" state="directory"
+  loop: ["available", "enabled"]
 
-- name: disable default site
+- name: make config available
   become: yes
-  file: path="/etc/nginx/sites-enabled/default" state="absent"
+  template:
+    src:  "{{nginx_conf_src}}"
+    dest: "/etc/nginx/{{nginx_server_type}}s-available/{{nginx_server_name}}.conf"
   notify: restart nginx
 
-- name: enable site
+- name: enable config
   become: yes
   file:
-    src:  "/etc/nginx/sites-available/{{nginx_conf_dst}}"
-    dest: "/etc/nginx/sites-enabled/{{nginx_conf_dst}}"
+    src:  "/etc/nginx/{{nginx_server_type}}s-available/{{nginx_server_name}}.conf"
+    dest: "/etc/nginx/{{nginx_server_type}}s-enabled/{{nginx_server_name}}.conf"
     state: "link"
   notify: restart nginx
 
+- name: copy root files
+  become: yes
+  copy: src="{{nginx_root_src}}" dest="{{nginx_root_dest}}/"
+  when: nginx_root
+  notify: restart nginx
+
 - name: enable nginx service
   become: yes
   systemd: name="nginx" enabled="yes" state="started"