Lots of updates.

9 files changed, 46 insertions, 61 deletions

diff --git a/roles/nginx/base/defaults/main.yaml b/roles/nginx/base/defaults/main.yaml
deleted file mode 100644
index 44b37f8..0000000
--- a/roles/nginx/base/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-nginx_enable_ssl: No
diff --git a/roles/nginx/base/tasks/certbot.yaml b/roles/nginx/base/tasks/certbot.yaml
deleted file mode 100644
index 194f5c9..0000000
--- a/roles/nginx/base/tasks/certbot.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# https://certbot.eff.org/lets-encrypt/ubuntuxenial-nginx
-
-- name: add certbot (letsencrypt) repo
-  become: yes
-  apt_repository: repo="ppa:certbot/certbot"
-
-- name: install nginx packages
-  become: yes
-  apt: name="python-certbot-nginx"
-  notify: restart nginx
diff --git a/roles/nginx/base/tasks/main.yaml b/roles/nginx/base/tasks/main.yaml
deleted file mode 100644
index ee66773..0000000
--- a/roles/nginx/base/tasks/main.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- name: install nginx packages
-  become: yes
-  apt: name="nginx"
-
-- name: disable default site
-  become: yes
-  file: path="/etc/nginx/sites-enabled/default" state="absent"
-  notify: restart nginx
-
-- import_tasks: certbot.yaml
-  when: nginx_enable_ssl
-
-- name: enable nginx service
-  become: yes
-  systemd: name="nginx" enabled="yes" state="started"
diff --git a/roles/nginx/site/defaults/main.yaml b/roles/nginx/defaults/main.yaml
index 0092918..8d65d55 100644
--- a/roles/nginx/site/defaults/main.yaml
+++ b/roles/nginx/defaults/main.yaml
@@ -2,6 +2,7 @@
 
 nginx_port: 80
 nginx_ssl_port: 443
+nginx_enable_ssl: No
 nginx_server_name: "{{ansible_host}}"
 nginx_conf_dst: "{{nginx_server_name}}.nginx.conf"
 nginx_admin_email: "admin@{{nginx_server_name}}"
diff --git a/roles/nginx/base/handlers/main.yaml b/roles/nginx/handlers/main.yaml
index 1feca07..1feca07 100644
--- a/roles/nginx/base/handlers/main.yaml
+++ b/roles/nginx/handlers/main.yaml
diff --git a/roles/nginx/site/handlers/main.yaml b/roles/nginx/site/handlers/main.yaml
deleted file mode 100644
index 1feca07..0000000
--- a/roles/nginx/site/handlers/main.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: restart nginx
-  become: yes
-  systemd: name="nginx" state="restarted" daemon_reload="yes"
diff --git a/roles/nginx/site/meta/main.yaml b/roles/nginx/site/meta/main.yaml
deleted file mode 100644
index af2cf0f..0000000
--- a/roles/nginx/site/meta/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-dependencies:
-  - nginx/base
diff --git a/roles/nginx/site/tasks/main.yaml b/roles/nginx/site/tasks/main.yaml
deleted file mode 100644
index 9b51013..0000000
--- a/roles/nginx/site/tasks/main.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-
-- name: install site
-  become: yes
-  template: src="{{nginx_conf_src}}" dest="/etc/nginx/sites-available/{{nginx_conf_dst}}"
-  notify: restart nginx
-
-- name: install certbot in nginx
-  become: yes
-  command: "certbot certonly --nginx -n --agree-tos -d {{nginx_server_name}} -m {{nginx_admin_email}}"
-  notify: restart nginx
-  when: nginx_enable_ssl
-
-- name: enable site
-  become: yes
-  file:
-    src:  "/etc/nginx/sites-available/{{nginx_conf_dst}}"
-    dest: "/etc/nginx/sites-enabled/{{nginx_conf_dst}}"
-    state: "link"
-  notify: restart nginx
diff --git a/roles/nginx/tasks/main.yaml b/roles/nginx/tasks/main.yaml
new file mode 100644
index 0000000..7a0589f
--- /dev/null
+++ b/roles/nginx/tasks/main.yaml
@@ -0,0 +1,45 @@
+---
+
+- name: install nginx packages
+  become: yes
+  apt: name="nginx"
+
+- name: install site
+  become: yes
+  template: src="{{nginx_conf_src}}" dest="/etc/nginx/sites-available/{{nginx_conf_dst}}"
+  notify: restart nginx
+
+# https://certbot.eff.org/lets-encrypt/ubuntuxenial-nginx
+- name: add certbot (letsencrypt) repo
+  become: yes
+  apt_repository: repo="ppa:certbot/certbot"
+  when: nginx_enable_ssl
+
+- name: install nginx packages
+  become: yes
+  apt: name="python-certbot-nginx"
+  notify: restart nginx
+  when: nginx_enable_ssl
+
+- name: install certbot in nginx
+  become: yes
+  command: "certbot certonly --nginx -n --agree-tos -d {{nginx_server_name}} -m {{nginx_admin_email}}"
+  notify: restart nginx
+  when: nginx_enable_ssl
+
+- name: disable default site
+  become: yes
+  file: path="/etc/nginx/sites-enabled/default" state="absent"
+  notify: restart nginx
+
+- name: enable site
+  become: yes
+  file:
+    src:  "/etc/nginx/sites-available/{{nginx_conf_dst}}"
+    dest: "/etc/nginx/sites-enabled/{{nginx_conf_dst}}"
+    state: "link"
+  notify: restart nginx
+
+- name: enable nginx service
+  become: yes
+  systemd: name="nginx" enabled="yes" state="started"