From c5ba641b1cb66e19c23691995bcd0661fbf4d027 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Thu, 3 Jan 2019 20:46:13 -0600 Subject: Lots of updates. --- roles/nginx/base/defaults/main.yaml | 3 --- roles/nginx/base/handlers/main.yaml | 5 ----- roles/nginx/base/tasks/certbot.yaml | 12 ---------- roles/nginx/base/tasks/main.yaml | 17 -------------- roles/nginx/defaults/main.yaml | 8 +++++++ roles/nginx/handlers/main.yaml | 5 +++++ roles/nginx/site/defaults/main.yaml | 7 ------ roles/nginx/site/handlers/main.yaml | 5 ----- roles/nginx/site/meta/main.yaml | 4 ---- roles/nginx/site/tasks/main.yaml | 20 ----------------- roles/nginx/tasks/main.yaml | 45 +++++++++++++++++++++++++++++++++++++ 11 files changed, 58 insertions(+), 73 deletions(-) delete mode 100644 roles/nginx/base/defaults/main.yaml delete mode 100644 roles/nginx/base/handlers/main.yaml delete mode 100644 roles/nginx/base/tasks/certbot.yaml delete mode 100644 roles/nginx/base/tasks/main.yaml create mode 100644 roles/nginx/defaults/main.yaml create mode 100644 roles/nginx/handlers/main.yaml delete mode 100644 roles/nginx/site/defaults/main.yaml delete mode 100644 roles/nginx/site/handlers/main.yaml delete mode 100644 roles/nginx/site/meta/main.yaml delete mode 100644 roles/nginx/site/tasks/main.yaml create mode 100644 roles/nginx/tasks/main.yaml (limited to 'roles/nginx') 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/handlers/main.yaml b/roles/nginx/base/handlers/main.yaml deleted file mode 100644 index 1feca07..0000000 --- a/roles/nginx/base/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/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/defaults/main.yaml b/roles/nginx/defaults/main.yaml new file mode 100644 index 0000000..8d65d55 --- /dev/null +++ b/roles/nginx/defaults/main.yaml @@ -0,0 +1,8 @@ +--- + +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/handlers/main.yaml b/roles/nginx/handlers/main.yaml new file mode 100644 index 0000000..1feca07 --- /dev/null +++ b/roles/nginx/handlers/main.yaml @@ -0,0 +1,5 @@ +--- + +- name: restart nginx + become: yes + systemd: name="nginx" state="restarted" daemon_reload="yes" diff --git a/roles/nginx/site/defaults/main.yaml b/roles/nginx/site/defaults/main.yaml deleted file mode 100644 index 0092918..0000000 --- a/roles/nginx/site/defaults/main.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -nginx_port: 80 -nginx_ssl_port: 443 -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/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" -- cgit v1.2.3