General improvements

templates/d6_settings.php

@@ -30,13 +30,13 @@ $conf['syslog_identity'] = 'drupal_{{ item.domain }}';
 
 {% if varnish_host|default(false) %}
 $conf['reverse_proxy'] = TRUE;
-$conf['reverse_proxy_addresses'] = array("{{ hostvars[varnish_host]['static_ipv4']|default(hostvars[varnish_host]['ansible_default_ipv4']['address']) }}");
+$conf['reverse_proxy_addresses'] = array("{{ varnish_host_ip|default('') }}");
 $conf['varnish_cache_clear'] = '{{ varnish_cache_clear }}';
 $conf['varnish_control_key'] = '{{ varnish_control_key }}';
 {% if varnish_host == inventory_hostname %}
 $conf['varnish_control_terminal'] = '127.0.0.1:{{ varnish_control_port }}';
 {% else %}
-$conf['varnish_control_terminal'] = "{{ hostvars[varnish_host]['static_ipv4']|default(hostvars[varnish_host]['ansible_default_ipv4']['address']) }}:{{ varnish_control_port }}";
+$conf['varnish_control_terminal'] = "{{ varnish_host_ip|default('') }}:{{ varnish_control_port }}";
 {% endif %}
 $conf['varnish_flush_cron'] = '{{ varnish_flush_cron }}';
 $conf['varnish_socket_timeout'] = '{{ varnish_socket_timeout }}';

templates/d7_settings.php

@@ -47,13 +47,13 @@ $conf['syslog_identity'] = 'drupal_{{ item.domain }}';
 
 {% if varnish_host|default(false) %}
 $conf['reverse_proxy'] = TRUE;
-$conf['reverse_proxy_addresses'] = array("{{ hostvars[varnish_host]['static_ipv4']|default(hostvars[varnish_host]['ansible_default_ipv4']['address']) }}");
+$conf['reverse_proxy_addresses'] = array("{{ varnish_host_ip|default('') }}");
 $conf['varnish_cache_clear'] = '{{ varnish_cache_clear }}';
 $conf['varnish_control_key'] = '{{ varnish_control_key }}';
 {% if varnish_host == inventory_hostname %}
 $conf['varnish_control_terminal'] = '127.0.0.1:{{ varnish_control_port }}';
 {% else %}
-$conf['varnish_control_terminal'] = "{{ hostvars[varnish_host]['static_ipv4']|default(hostvars[varnish_host]['ansible_default_ipv4']['address']) }}:{{ varnish_control_port }}";
+$conf['varnish_control_terminal'] = "{{ varnish_host_ip|default('') }}:{{ varnish_control_port }}";
 {% endif %}
 $conf['varnish_flush_cron'] = '{{ varnish_flush_cron }}';
 $conf['varnish_socket_timeout'] = '{{ varnish_socket_timeout }}';

templates/vhost.conf

@@ -27,7 +27,7 @@
 
 
 {% if drupal.jail is defined %}
-  ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{{ docRoot }}/$1
+  ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:{{ drupal.jail.port }}{{ docRoot }}/$1
 {% endif %}
 
   DocumentRoot {{ docRoot }}