diff options
| -rw-r--r-- | roles/grafana/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/grafana/templates/grafana.nginx.conf.j2 | 3 | ||||
| -rw-r--r-- | roles/nginx/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/nginx/templates/nginx.conf.j2 | 6 | ||||
| -rw-r--r-- | roles/pihole/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/pihole/templates/pihole.nginx.conf.j2 | 3 | ||||
| -rw-r--r-- | roles/prometheus/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/prometheus/templates/prometheus.nginx.conf.j2 | 3 | ||||
| -rw-r--r-- | roles/wg_portal/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/wg_portal/templates/wg_portal.nginx.conf.j2 | 3 |
10 files changed, 20 insertions, 15 deletions
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml index 088d61c7..41a76e5c 100644 --- a/roles/grafana/tasks/main.yml +++ b/roles/grafana/tasks/main.yml @@ -92,7 +92,7 @@ when: proxy_type == "nginx" and grafana_hostname | length > 0 ansible.builtin.template: src: "grafana.nginx.conf.j2" - dest: "/etc/nginx/vhosts.d/grafana.conf" + dest: "/etc/nginx/conf.d/grafana.conf" owner: "root" group: "root" mode: "0644" diff --git a/roles/grafana/templates/grafana.nginx.conf.j2 b/roles/grafana/templates/grafana.nginx.conf.j2 index e6e1052c..a9c105ac 100644 --- a/roles/grafana/templates/grafana.nginx.conf.j2 +++ b/roles/grafana/templates/grafana.nginx.conf.j2 @@ -4,6 +4,9 @@ server { server_name {{ grafana_hostname }}; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + location / { proxy_pass http://127.0.0.1:{{ grafana_port }}/; } diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index f78cd24b..7cb9b449 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -26,14 +26,11 @@ - "/etc/nginx/modules-enabled" - "/var/log/nginx" -- name: "Ensure nginx vhosts.d directory exists" +- name: "Remove default nginx server block shipped by package" become: true ansible.builtin.file: - path: "/etc/nginx/vhosts.d" - state: "directory" - owner: "root" - group: "root" - mode: "0755" + path: "/etc/nginx/conf.d/default.conf" + state: "absent" - name: "Check if SSL certificate exists" become: true diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2 index 1ebbe3df..518a8398 100644 --- a/roles/nginx/templates/nginx.conf.j2 +++ b/roles/nginx/templates/nginx.conf.j2 @@ -43,8 +43,6 @@ http { listen [::]:80 default_server; server_name {{ nginx_server_name }}; - - include /etc/nginx/conf.d/*.conf; } {% else %} # HTTP server - redirect to HTTPS @@ -73,9 +71,7 @@ http { add_header X-Content-Type-Options nosniff always; add_header X-Frame-Options DENY always; - - include /etc/nginx/conf.d/*.conf; } - include /etc/nginx/vhosts.d/*.conf; + include /etc/nginx/conf.d/*.conf; } diff --git a/roles/pihole/tasks/main.yml b/roles/pihole/tasks/main.yml index f6101632..ccd4bd9f 100644 --- a/roles/pihole/tasks/main.yml +++ b/roles/pihole/tasks/main.yml @@ -154,7 +154,7 @@ when: proxy_type == "nginx" and pihole_hostname | length > 0 ansible.builtin.template: src: "pihole.nginx.conf.j2" - dest: "/etc/nginx/vhosts.d/pihole.conf" + dest: "/etc/nginx/conf.d/pihole.conf" owner: "root" group: "root" mode: "0644" diff --git a/roles/pihole/templates/pihole.nginx.conf.j2 b/roles/pihole/templates/pihole.nginx.conf.j2 index 91f0fea4..7a28b821 100644 --- a/roles/pihole/templates/pihole.nginx.conf.j2 +++ b/roles/pihole/templates/pihole.nginx.conf.j2 @@ -4,6 +4,9 @@ server { server_name {{ pihole_hostname }}; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + location = / { return 301 /admin/; } diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 123c1216..9921b441 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -67,7 +67,7 @@ when: proxy_type == "nginx" and prometheus_hostname | length > 0 ansible.builtin.template: src: "prometheus.nginx.conf.j2" - dest: "/etc/nginx/vhosts.d/prometheus.conf" + dest: "/etc/nginx/conf.d/prometheus.conf" owner: "root" group: "root" mode: "0644" diff --git a/roles/prometheus/templates/prometheus.nginx.conf.j2 b/roles/prometheus/templates/prometheus.nginx.conf.j2 index 5ae9c20c..5c8483f8 100644 --- a/roles/prometheus/templates/prometheus.nginx.conf.j2 +++ b/roles/prometheus/templates/prometheus.nginx.conf.j2 @@ -4,6 +4,9 @@ server { server_name {{ prometheus_hostname }}; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + location / { proxy_pass http://127.0.0.1:{{ prometheus_port }}/; } diff --git a/roles/wg_portal/tasks/main.yml b/roles/wg_portal/tasks/main.yml index dc24f892..a12d4533 100644 --- a/roles/wg_portal/tasks/main.yml +++ b/roles/wg_portal/tasks/main.yml @@ -99,7 +99,7 @@ when: proxy_type == "nginx" and wg_portal_hostname | length > 0 ansible.builtin.template: src: "wg_portal.nginx.conf.j2" - dest: "/etc/nginx/vhosts.d/wg-portal.conf" + dest: "/etc/nginx/conf.d/wg-portal.conf" owner: "root" group: "root" mode: "0644" diff --git a/roles/wg_portal/templates/wg_portal.nginx.conf.j2 b/roles/wg_portal/templates/wg_portal.nginx.conf.j2 index 734ecac9..ddac788d 100644 --- a/roles/wg_portal/templates/wg_portal.nginx.conf.j2 +++ b/roles/wg_portal/templates/wg_portal.nginx.conf.j2 @@ -4,6 +4,9 @@ server { server_name {{ wg_portal_hostname }}; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + location / { proxy_pass http://127.0.0.1:{{ wg_portal_port }}/; } |