Merge branch 'master' into rap

abyayala.yml

@@ -15,7 +15,7 @@ matrix:
       - rakiduam
 # END PROXY
 # BEGIN NODES
-  - service_name: marmita
+  - service_name: marmite
     domains:
       - marmite.abyaya.la
     nodo: marmite.comun

ansible.cfg

@@ -1,2 +1,12 @@
 [defaults]
 inventory = ./hosts.production
+forks           = 10
+
+[ssh_connection]
+ssh_args = -C -o ControlMaster=auto -o ControlPersist=1h -o PreferredAuthentications=publickey -o ForwardAgent=yes
+control_path_dir = ~/.ansible/cp
+control_path = /tmp/ssh-%%r@%%h:%%p
+pipelining = True
+scp_if_ssh = smart
+transfer_method = smart
+sftp_batch_mode = True

roles/certbot/tasks/certbot.yml

@@ -26,7 +26,7 @@
             state: started
             volumes:
               - "{{ althost }}_certs_data:/etc/letsencrypt"
-            command: "--staging --non-interactive --agree-tos --email {{ webmaster_email }} certonly --preferred-challenges dns --authenticator dns-standalone --dns-standalone-address={{ host_ip }} --dns-standalone-port=53 --dns-standalone-propagation-seconds=1 -d {{ loop.domains[0] }} -d *.{{ loop.domains[0] }}"
+            command: "--non-interactive --agree-tos --email {{ webmaster_email }} certonly --preferred-challenges dns --authenticator dns-standalone --dns-standalone-address={{ host_ip }} --dns-standalone-port=53 --dns-standalone-propagation-seconds=60 {% for domain in loop.domains }} -d {{ domain }} -d *.{{ domain }} {% endfor %}"
             detach: no
             cleanup: yes
             ports: 

roles/proxy/templates/default_proxy.conf

@@ -1,15 +1,15 @@
 # BEGIN PROXY
     location / {
         proxy_ssl_verify off;
-        proxy_ssl_name $comun;
         proxy_ssl_server_name on;
+        proxy_ssl_name $ssl_server_name;
 
         proxy_pass https://$comun_{{ vhost.nodo | replace(".", "_") }};
 
         proxy_set_header Host      $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Proto https;
 
         {% include "files/custom_proxy_includes/" ~ vhost.domains[0] ignore missing %}
 }

roles/proxy/templates/vhost.conf

@@ -10,7 +10,7 @@ server {
 
     listen 80;
 
-    resolver 127.0.0.1 valid=300s;
+    resolver 10.13.12.1 valid=300s;
     resolver_timeout 5s;
 
 {% if not needs_vhost and ((vhost.ssl | default(domains_default_ssl) ) or (vhost.force_https | default(domains_default_force_https))) %}