cleanup and fix dokuwik/nginx vhosts

diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index 975d7b7..b3a8797 100644 (file)
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -23,7 +23,14 @@
 - name: install default vhost
   template:
     src: vhosts/default.j2
+    dest: /etc/nginx/sites-available/default
+  notify: reload nginx
+
+- name: eanble nginx default vhost
+  file:
+    src: ../sites-available/default
     dest: /etc/nginx/sites-enabled/default
+    state: link
   notify: reload nginx
 
 - name: generate Diffie-Hellman parameters

diff --git a/ansible/roles/nginx/templates/vhosts/default.j2 b/ansible/roles/nginx/templates/vhosts/default.j2
index 91e5956..24e990d 100644 (file)
--- a/ansible/roles/nginx/templates/vhosts/default.j2
+++ b/ansible/roles/nginx/templates/vhosts/default.j2
@@ -1,32 +1,32 @@
 server {
-       listen 80 default_server;
-       listen [::]:80 default_server;
+    listen 80 default_server;
+    listen [::]:80 default_server;
 
-  server_name _;
+    server_name _;
 
-       include snippets/acmetool.conf;
+    include snippets/acmetool.conf;
 
-       location / {
-    return 301 https://$host$request_uri;
-       }
+    location / {
+        return 301 https://$host$request_uri;
+    }
 }
 
 server {
-       listen 443 ssl default_server;
-       listen [::]:443 ssl default_server;
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;
 
-       server_name _;
+    server_name _;
 
-       include snippets/acmetool.conf;
-       include snippets/ssl.conf;
-       ssl_certificate /var/lib/acme/live/{{ ansible_host }}/fullchain;
-       ssl_certificate_key /var/lib/acme/live/{{ ansible_host }}/privkey;
-       include snippets/hsts.conf;
+    include snippets/acmetool.conf;
+    include snippets/ssl.conf;
+    ssl_certificate /var/lib/acme/live/{{ ansible_host }}/fullchain;
+    ssl_certificate_key /var/lib/acme/live/{{ ansible_host }}/privkey;
+    include snippets/hsts.conf;
 
-       include snippets/security-headers.conf;
+    include snippets/security-headers.conf;
 
-       location / {
-    default_type text/plain;
-    return 200 "Welcome to {{ ansible_host }}!";
-       }
+    location / {
+        default_type text/plain;
+        return 200 "Welcome to {{ ansible_host }}!";
+    }
 }