From 86f6a5cfcccf6b928bbdc1fa0fa6a537b4a25005 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Wed, 6 Nov 2019 20:37:46 -0500 Subject: [PATCH] 0.1.9-DEV-20191106-202848 ------------------------- * ADD: - gitea.thezengarden.net proxy site - added set_fact define to consolodate packages to install based on distribution - added git clone section to pull in le ssl certs via gitlab --- defaults/main/proxy_site_defs.yml | 1 + defaults/main/proxy_sites.yml | 7 +++++++ tasks/main.yml | 26 ++++++++++++++------------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/defaults/main/proxy_site_defs.yml b/defaults/main/proxy_site_defs.yml index 8ca35d9..f72e16d 100644 --- a/defaults/main/proxy_site_defs.yml +++ b/defaults/main/proxy_site_defs.yml @@ -1,4 +1,5 @@ --- + proxy_package_list : ['nginx','aptitude','git'] proxy_site_conf_dir : /etc/nginx/conf.d proxy_site_file : "{{ proxy_site_conf_dir }}/zen_proxy.conf" proxy_site_version : 1.8 diff --git a/defaults/main/proxy_sites.yml b/defaults/main/proxy_sites.yml index 6ed07d5..d6a8179 100644 --- a/defaults/main/proxy_sites.yml +++ b/defaults/main/proxy_sites.yml @@ -14,6 +14,13 @@ proxy_sites: max_upload : "{{ proxy_default_max_upload }}" + gitea.thezengarden.net: + proto : http + dest : docker.thezengarden.net + port : 3000 + max_upload : "{{ proxy_default_max_upload }}" + + hastebin.thezengarden.net: proto : http dest : docker.thezengarden.net diff --git a/tasks/main.yml b/tasks/main.yml index 219bfde..0ddea7a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,19 +1,15 @@ --- # tasks file for zen_rev_proxy - -- name: install nginx/aptitude for debian nodes - package: - name : ['nginx','aptitude'] - state : present - when : ansible_distribution == "Debian" - - -- name: install nginx for centos nodes - package: - name : nginx - state : present +- name: set up package list + set_fact: + proxy_package_list: ['nginx','git'] when: ansible_distribution == "CentOS" +- name: install proxy packages + package: + name : "{{ proxy_package_list }}" + state : present + - name: enable nginx at boot time service: @@ -36,6 +32,12 @@ mode : 0755 +- name: clone ssl certs + git: + repo: git@gitlab.thezengarden.net:zen/le-ssl-certs.git + dest: "{{ proxy_site_ssl_directory }}" + + - name: write configuration file(s) template: src : proxy_site.j2