From 9c8fc52b8b5875737c4ccb73eaa8bc13cfce39fe Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 4 Jan 2021 09:49:02 +0100 Subject: [PATCH] Renamed native-nginx-docker-proxy to native-docker-reverse-proxy --- roles/docker-elk/meta/main.yml | 2 +- roles/docker-elk/tasks/main.yml | 2 +- roles/docker-gitea/meta/main.yml | 2 +- roles/docker-gitea/tasks/main.yml | 2 +- roles/docker-jenkins/meta/main.yml | 2 +- roles/docker-jenkins/tasks/main.yml | 2 +- roles/docker-joomla/meta/main.yml | 2 +- roles/docker-joomla/tasks/main.yml | 2 +- roles/docker-mailu/meta/main.yml | 2 +- roles/docker-mailu/tasks/main.yml | 2 +- roles/docker-mediawiki/meta/main.yml | 2 +- roles/docker-mediawiki/tasks/main.yml | 2 +- roles/docker-mybb/meta/main.yml | 2 +- roles/docker-mybb/tasks/main.yml | 2 +- roles/docker-nextcloud/meta/main.yml | 2 +- roles/docker-nextcloud/templates/nextcloud.conf.j2 | 2 +- roles/docker-postfix/meta/main.yml | 2 +- roles/docker-postfix/tasks/main.yml | 2 +- roles/docker-wireguard/meta/main.yml | 2 +- roles/docker-wireguard/tasks/main.yml | 2 +- roles/docker-wordpress/meta/main.yml | 2 +- roles/docker-wordpress/tasks/main.yml | 2 +- roles/docker-yourls/meta/main.yml | 2 +- roles/docker-yourls/tasks/main.yml | 2 +- .../meta/main.yml | 0 .../readme.md | 4 +++- .../templates/domain.conf.j2 | 0 .../templates/proxy_pass.conf.j2 | 0 28 files changed, 27 insertions(+), 25 deletions(-) rename roles/{native-nginx-docker-proxy => native-docker-reverse-proxy}/meta/main.yml (100%) rename roles/{native-nginx-docker-proxy => native-docker-reverse-proxy}/readme.md (67%) rename roles/{native-nginx-docker-proxy => native-docker-reverse-proxy}/templates/domain.conf.j2 (100%) rename roles/{native-nginx-docker-proxy => native-docker-reverse-proxy}/templates/proxy_pass.conf.j2 (100%) diff --git a/roles/docker-elk/meta/main.yml b/roles/docker-elk/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-elk/meta/main.yml +++ b/roles/docker-elk/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-elk/tasks/main.yml b/roles/docker-elk/tasks/main.yml index 79611be5..772412b9 100644 --- a/roles/docker-elk/tasks/main.yml +++ b/roles/docker-elk/tasks/main.yml @@ -4,7 +4,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create elasticsearch-sysctl.conf diff --git a/roles/docker-gitea/meta/main.yml b/roles/docker-gitea/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-gitea/meta/main.yml +++ b/roles/docker-gitea/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-gitea/tasks/main.yml b/roles/docker-gitea/tasks/main.yml index 7596872e..1b17059e 100644 --- a/roles/docker-gitea/tasks/main.yml +++ b/roles/docker-gitea/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}} https - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: container present diff --git a/roles/docker-jenkins/meta/main.yml b/roles/docker-jenkins/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-jenkins/meta/main.yml +++ b/roles/docker-jenkins/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml index f56fba33..8d614581 100644 --- a/roles/docker-jenkins/tasks/main.yml +++ b/roles/docker-jenkins/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker jenkins" diff --git a/roles/docker-joomla/meta/main.yml b/roles/docker-joomla/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-joomla/meta/main.yml +++ b/roles/docker-joomla/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml index 12b611a5..eaada19c 100644 --- a/roles/docker-joomla/tasks/main.yml +++ b/roles/docker-joomla/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "setup joomla" diff --git a/roles/docker-mailu/meta/main.yml b/roles/docker-mailu/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-mailu/meta/main.yml +++ b/roles/docker-mailu/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index fec14998..213be9de 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -4,7 +4,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "create /etc/mailu/" diff --git a/roles/docker-mediawiki/meta/main.yml b/roles/docker-mediawiki/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-mediawiki/meta/main.yml +++ b/roles/docker-mediawiki/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml index b527a61d..c5d68fb2 100644 --- a/roles/docker-mediawiki/tasks/main.yml +++ b/roles/docker-mediawiki/tasks/main.yml @@ -2,7 +2,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "docker mediawiki" diff --git a/roles/docker-mybb/meta/main.yml b/roles/docker-mybb/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-mybb/meta/main.yml +++ b/roles/docker-mybb/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml index 4a256bee..6fb827d3 100644 --- a/roles/docker-mybb/tasks/main.yml +++ b/roles/docker-mybb/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: create data folder diff --git a/roles/docker-nextcloud/meta/main.yml b/roles/docker-nextcloud/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-nextcloud/meta/main.yml +++ b/roles/docker-nextcloud/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-nextcloud/templates/nextcloud.conf.j2 b/roles/docker-nextcloud/templates/nextcloud.conf.j2 index 165645e6..86aef9bf 100644 --- a/roles/docker-nextcloud/templates/nextcloud.conf.j2 +++ b/roles/docker-nextcloud/templates/nextcloud.conf.j2 @@ -12,7 +12,7 @@ server client_body_buffer_size 400M; fastcgi_buffers 64 4K; - {% include 'roles/native-nginx-docker-proxy/templates/proxy_pass.conf.j2' %} + {% include 'roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2' %} location ^~ /.well-known { rewrite ^/\.well-known/host-meta\.json /public.php?service=host-meta-json last; diff --git a/roles/docker-postfix/meta/main.yml b/roles/docker-postfix/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-postfix/meta/main.yml +++ b/roles/docker-postfix/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-postfix/tasks/main.yml b/roles/docker-postfix/tasks/main.yml index 05c1a606..54cc5aa1 100644 --- a/roles/docker-postfix/tasks/main.yml +++ b/roles/docker-postfix/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "setup postfix" diff --git a/roles/docker-wireguard/meta/main.yml b/roles/docker-wireguard/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-wireguard/meta/main.yml +++ b/roles/docker-wireguard/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-wireguard/tasks/main.yml b/roles/docker-wireguard/tasks/main.yml index 314523d2..1fcdb901 100644 --- a/roles/docker-wireguard/tasks/main.yml +++ b/roles/docker-wireguard/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: recieve {{domain}} certificate diff --git a/roles/docker-wordpress/meta/main.yml b/roles/docker-wordpress/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-wordpress/meta/main.yml +++ b/roles/docker-wordpress/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/docker-wordpress/tasks/main.yml index 2d46a13d..8708eed5 100644 --- a/roles/docker-wordpress/tasks/main.yml +++ b/roles/docker-wordpress/tasks/main.yml @@ -5,7 +5,7 @@ - name: configure {{domain}}.conf vars: client_max_body_size: "2M" - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "setup wordpress" diff --git a/roles/docker-yourls/meta/main.yml b/roles/docker-yourls/meta/main.yml index ce762785..fb4d4f7b 100644 --- a/roles/docker-yourls/meta/main.yml +++ b/roles/docker-yourls/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- native-nginx-docker-proxy +- native-docker-reverse-proxy diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml index cbd2053b..f5856652 100644 --- a/roles/docker-yourls/tasks/main.yml +++ b/roles/docker-yourls/tasks/main.yml @@ -3,7 +3,7 @@ command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{domain}} - name: configure {{domain}}.conf - template: src=roles/native-nginx-docker-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf + template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf notify: restart nginx - name: "setup yourls" diff --git a/roles/native-nginx-docker-proxy/meta/main.yml b/roles/native-docker-reverse-proxy/meta/main.yml similarity index 100% rename from roles/native-nginx-docker-proxy/meta/main.yml rename to roles/native-docker-reverse-proxy/meta/main.yml diff --git a/roles/native-nginx-docker-proxy/readme.md b/roles/native-docker-reverse-proxy/readme.md similarity index 67% rename from roles/native-nginx-docker-proxy/readme.md rename to roles/native-docker-reverse-proxy/readme.md index 620b65d6..38356c94 100644 --- a/roles/native-nginx-docker-proxy/readme.md +++ b/roles/native-docker-reverse-proxy/readme.md @@ -1,4 +1,6 @@ -# role native-nginx-docker-proxy +# role native-docker-reverse-proxy + +Uses nginx as an [reverse proxy](https://en.wikipedia.org/wiki/Reverse_proxy) for local docker applications. ## debug ```bash diff --git a/roles/native-nginx-docker-proxy/templates/domain.conf.j2 b/roles/native-docker-reverse-proxy/templates/domain.conf.j2 similarity index 100% rename from roles/native-nginx-docker-proxy/templates/domain.conf.j2 rename to roles/native-docker-reverse-proxy/templates/domain.conf.j2 diff --git a/roles/native-nginx-docker-proxy/templates/proxy_pass.conf.j2 b/roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2 similarity index 100% rename from roles/native-nginx-docker-proxy/templates/proxy_pass.conf.j2 rename to roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2