diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index fcc0831..a671f2c 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -57,6 +57,13 @@ local_users: - l3d@derpy.l3d.yt - l3d@backup-rsa.l3d.yt - l3d@bsns.l3d + roles: + - l3d@pinkie.l3d.yt + - l3d@mobile.l3d.yt + - l3d@backup.l3d.yt + - l3d@derpy.l3d.yt + - l3d@backup-rsa.l3d.yt + - l3d@bsns.l3d sshd__allowed_users: - "root" @@ -71,6 +78,7 @@ sshd__allowed_users: - 'winkekatze' - 'm2' - 'klima' + - 'roles' sshd__allowed_groups: - "root" @@ -85,6 +93,7 @@ sshd__allowed_groups: - 'winkekatze' - 'm2' - 'klima' + - 'roles' local_accounts: - 'l3d' @@ -96,6 +105,7 @@ local_accounts: - 'winkekatze' - 'm2' - 'klima' + - 'roles' acme_domain_unwant_list: [] # - name: 'example.com' @@ -125,6 +135,8 @@ nginx_sites: - name: 'l3d.space' - name: 'www.l3d.space' - name: 'ansible.l3d.space' + webroot: + user: 'roles' - name: 'www.ansible.l3d.space' - name: 'l3d.yt' - name: 'www.l3d.yt' diff --git a/templates/files/nginx/sites/ansible.l3d.space_tls.conf b/templates/files/nginx/sites/ansible.l3d.space_tls.conf index 3f3ad50..dc1584c 100644 --- a/templates/files/nginx/sites/ansible.l3d.space_tls.conf +++ b/templates/files/nginx/sites/ansible.l3d.space_tls.conf @@ -1,14 +1,17 @@ server { - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl http2; + listen [::]:443 ssl http2; - server_name ansible.l3d.space; + server_name ansible.l3d.space; - include snippets/tls_parameters_{{ site.name }}.snippet.conf; - include snippets/tls_certificate_{{ site.name }}.snippet.conf; - include snippets/logging_{{ site.name }}.snippet.conf; + include snippets/tls_parameters_{{ site.name }}.snippet.conf; + include snippets/tls_certificate_{{ site.name }}.snippet.conf; + include snippets/logging_{{ site.name }}.snippet.conf; - location / { - return 308 https://github.com/roles-ansible/; - } + root /srv/www/ansible.l3d.space; + + location / { + charset utf-8; + try_files $uri $uri/ =404; + } } diff --git a/templates/files/nginx/sites/www.ansible.l3d.space_tls.conf b/templates/files/nginx/sites/www.ansible.l3d.space_tls.conf index 98c35fb..950b6be 100644 --- a/templates/files/nginx/sites/www.ansible.l3d.space_tls.conf +++ b/templates/files/nginx/sites/www.ansible.l3d.space_tls.conf @@ -9,6 +9,6 @@ server { include snippets/logging_{{ site.name }}.snippet.conf; location / { - return 308 https://github.com/roles-ansible/; + return 308 https://ansible.l3d.space$request_uri; } }