From 9c36560f1166af39297f706415a1e9844da21b7a Mon Sep 17 00:00:00 2001 From: VC Date: Sun, 9 Mar 2025 08:28:33 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B1:=20move=20letsencrypt=20dir=20from?= =?UTF-8?q?=20/srv/http=20to=20/var/www?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/nginx/tasks/main.yml | 10 +--------- roles/nginx/templates/default.j2 | 2 +- roles/nginx/vars/main.yml | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 roles/nginx/vars/main.yml diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index c9219e0..e94d40c 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -33,17 +33,9 @@ - {src: proxy_params.j2, dest: /etc/nginx/proxy_params} - {src: default.j2, dest: /etc/nginx/sites-available/default} -- name: Create base dir - ansible.builtin.file: - path: /srv/http - owner: root - group: www-data - mode: 'u+rwx,g+rs,o-rwx' - state: directory - - name: Create letsencrypt dir ansible.builtin.file: - path: /srv/http/common/letsencrypt + path: "{{ nginx_letsencrypt_dir }}" owner: root group: www-data mode: 'u+rwx,g+rs,o-rwx' diff --git a/roles/nginx/templates/default.j2 b/roles/nginx/templates/default.j2 index d1f936b..22b6586 100644 --- a/roles/nginx/templates/default.j2 +++ b/roles/nginx/templates/default.j2 @@ -16,7 +16,7 @@ server { listen [::]:80 default_server; location /.well-known/acme-challenge { - root /srv/http/common/letsencrypt/; + root {{ nginx_letsencrypt_dir }}; } location / { diff --git a/roles/nginx/vars/main.yml b/roles/nginx/vars/main.yml new file mode 100644 index 0000000..ff1af01 --- /dev/null +++ b/roles/nginx/vars/main.yml @@ -0,0 +1,2 @@ +--- +nginx_letsencrypt_dir: /var/www/common/letsencrypt