fix nginx-proxy dependency in acmetool, fix socket paths in webserver

acmetool/tasks/main.yml

@@ -2,7 +2,9 @@
 # file: acmetool/tasks/main.yml
 
 - name: ensure acmetool is installed
-  apt: name=acmetool state=present
+  apt:
+    name: acmetool
+    state: present
   tags:
     - acmetool
     - packages
@@ -54,6 +56,7 @@
     mode: '0755'
   notify:
     - reload systemd service files
+  when: 'nginx-proxy' in acmetool_services
   tags:
     - acmetool
     - services
@@ -67,6 +70,7 @@
     mode: '0644'
   notify:
     - reload systemd service files
+  when: 'nginx-proxy' in acmetool_services
   tags:
     - acmetool
     - services

webserver/templates/locations/proxy.conf

@@ -18,7 +18,7 @@
         {% elif location.proxy_unix is defined %}
         proxy_pass http://unix:{{location.proxy_unix}};
         {% else %}
-        proxy_pass http://unix:{{server.socket|default(server.server_name ~ '.sock')}};
+        proxy_pass http://unix:{{server.socket|default('/run/nginx/' ~ server.server_name ~ '.sock')}};
         {% endif %}
         {% if location.pass_ip|default(true) %}
         proxy_set_header Host {{server.server_name}};

webserver/templates/sites/mediawiki.conf

@@ -4,7 +4,7 @@ server {
     listen localhost:{{server.port}};
     {% else %}
 
-    listen unix:{{server.socket|default(server.server_name ~ '.sock')}};
+    listen unix:{{server.socket|default('/run/nginx/' ~ server.server_name ~ '.sock')}};
     {% endif %}
 
     server_name {{server.server_names|default([server.server_name])|join(" ")}};

webserver/templates/sites/webapp.conf

@@ -2,7 +2,7 @@ server {
     {% if server.port is defined %}
     listen localhost:{{server.port}};
     {% else %}
-    listen unix:{{server.socket|default(server.server_name ~ '.sock')}};
+    listen unix:{{server.socket|default('/run/nginx/' ~ server.server_name ~ '.sock')}};
     {% endif %}
 
     server_name {{server.server_names|default([server.server_name])|join(" ")}};