Set backend address as host var in proxy role

12 files changed, 48 insertions, 48 deletions

diff --git a/host_vars/163.172.211.128 b/host_vars/163.172.211.128
index a473e66..185d43c 100644
--- a/host_vars/163.172.211.128
+++ b/host_vars/163.172.211.128
@@ -12,4 +12,4 @@ masterlist:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/host_vars/192.168.0.25 b/host_vars/192.168.0.25
index 274b369..96ecc65 100644
--- a/host_vars/192.168.0.25
+++ b/host_vars/192.168.0.25
@@ -46,16 +46,16 @@ auxport:
   - 4433
   - 4434
 peers:
-  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion' ]
-  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net' ]
-  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion' ]
-  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion' ]
-  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net' ]
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net' ]
-  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion' ]
+  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion', '127.0.0.1' ]
+  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net', '127.0.0.1' ]
+  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion', '127.0.0.1' ]
+  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion', '127.0.0.1' ]
+  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net', '127.0.0.1' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net', '127.0.0.1' ]
+  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion', '127.0.0.1' ]
 peerssl:
-  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion' ]
-  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com' ]
+  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion', '127.0.0.1' ]
+  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com', '127.0.0.1' ]
 # bittorrent
 downspeed: 400
 upspeed: 40
diff --git a/host_vars/51.15.179.153 b/host_vars/51.15.179.153
index 1a608da..b5993d1 100644
--- a/host_vars/51.15.179.153
+++ b/host_vars/51.15.179.153
@@ -21,4 +21,4 @@ domainhttps:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/host_vars/bpr7drsao5vozzr5.onion b/host_vars/bpr7drsao5vozzr5.onion
index 1a608da..b5993d1 100644
--- a/host_vars/bpr7drsao5vozzr5.onion
+++ b/host_vars/bpr7drsao5vozzr5.onion
@@ -21,4 +21,4 @@ domainhttps:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/host_vars/d72vewh3wa4lwpaj.onion b/host_vars/d72vewh3wa4lwpaj.onion
index 274b369..96ecc65 100644
--- a/host_vars/d72vewh3wa4lwpaj.onion
+++ b/host_vars/d72vewh3wa4lwpaj.onion
@@ -46,16 +46,16 @@ auxport:
   - 4433
   - 4434
 peers:
-  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion' ]
-  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net' ]
-  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion' ]
-  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion' ]
-  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net' ]
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net' ]
-  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion' ]
+  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion', '127.0.0.1' ]
+  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net', '127.0.0.1' ]
+  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion', '127.0.0.1' ]
+  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion', '127.0.0.1' ]
+  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net', '127.0.0.1' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net', '127.0.0.1' ]
+  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion', '127.0.0.1' ]
 peerssl:
-  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion' ]
-  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com' ]
+  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion', '127.0.0.1' ]
+  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com', '127.0.0.1' ]
 # bittorrent
 downspeed: 400
 upspeed: 40
diff --git a/host_vars/manchester.casperlefantom.net b/host_vars/manchester.casperlefantom.net
index 274b369..96ecc65 100644
--- a/host_vars/manchester.casperlefantom.net
+++ b/host_vars/manchester.casperlefantom.net
@@ -46,16 +46,16 @@ auxport:
   - 4433
   - 4434
 peers:
-  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion' ]
-  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net' ]
-  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion' ]
-  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion' ]
-  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net' ]
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net' ]
-  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion' ]
+  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion', '127.0.0.1' ]
+  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net', '127.0.0.1' ]
+  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion', '127.0.0.1' ]
+  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion', '127.0.0.1' ]
+  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net', '127.0.0.1' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net', '127.0.0.1' ]
+  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion', '127.0.0.1' ]
 peerssl:
-  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion' ]
-  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com' ]
+  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion', '127.0.0.1' ]
+  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com', '127.0.0.1' ]
 # bittorrent
 downspeed: 400
 upspeed: 40
diff --git a/host_vars/manchester.home.casperlefantom.net b/host_vars/manchester.home.casperlefantom.net
index 274b369..96ecc65 100644
--- a/host_vars/manchester.home.casperlefantom.net
+++ b/host_vars/manchester.home.casperlefantom.net
@@ -46,16 +46,16 @@ auxport:
   - 4433
   - 4434
 peers:
-  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion' ]
-  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net' ]
-  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion' ]
-  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion' ]
-  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net' ]
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net' ]
-  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion' ]
+  - [ '8085', 'onion1', 'vhost_onion1', 'd72vewh3wa4lwpaj.onion', '127.0.0.1' ]
+  - [ '8087', 'casper-site', 'vhost_casper-site', 'casperlefantom.net blog.casperlefantom.net', '127.0.0.1' ]
+  - [ '8084', 'dl', 'vhost_dl', 'dl.casperlefantom.net dl.home.casperlefantom.net mwyjtiphky5em4yp.onion', '127.0.0.1' ]
+  - [ '8091', 'mirror', 'vhost_mirror', 'mirror.casperlefantom.net mirror.home.casperlefantom.net pmstfd4f6s5bm2xq.onion', '127.0.0.1' ]
+  - [ '8089', 'searx', 'vhost_searx', 'search.casperlefantom.net nrybuqtxgxnavtla.onion search.home.casperlefantom.net', '127.0.0.1' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsa.admin.casperlefantom.net', '127.0.0.1' ]
+  - [ '8092', 'cirrus', 'vhost_cirrus', 'cirrus.casperlefantom.net w77rtjmn4c4oggn6.onion', '127.0.0.1' ]
 peerssl:
-  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion' ]
-  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com' ]
+  - [ '8086', 'onion2', 'vhost_onion2', 'lfa3azuyprfdawxf.onion', '127.0.0.1' ]
+  - [ '8088', 'jays-site', 'vhost_jays-site', 'jaysfoodventure.com www.jaysfoodventure.com admin.jaysfoodventure.com', '127.0.0.1' ]
 # bittorrent
 downspeed: 400
 upspeed: 40
diff --git a/host_vars/ns4.casperlefantom.net b/host_vars/ns4.casperlefantom.net
index 1a608da..b5993d1 100644
--- a/host_vars/ns4.casperlefantom.net
+++ b/host_vars/ns4.casperlefantom.net
@@ -21,4 +21,4 @@ domainhttps:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nsd.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/host_vars/ns5.casperlefantom.net b/host_vars/ns5.casperlefantom.net
index a473e66..185d43c 100644
--- a/host_vars/ns5.casperlefantom.net
+++ b/host_vars/ns5.casperlefantom.net
@@ -12,4 +12,4 @@ masterlist:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/host_vars/wuvphkytdeukbrqm.onion b/host_vars/wuvphkytdeukbrqm.onion
index a473e66..185d43c 100644
--- a/host_vars/wuvphkytdeukbrqm.onion
+++ b/host_vars/wuvphkytdeukbrqm.onion
@@ -12,4 +12,4 @@ masterlist:
 revport: 4435
 revports: 4433
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'nse.admin.casperlefantom.net', '127.0.0.1' ]
diff --git a/roles/proxy/defaults/main.yml b/roles/proxy/defaults/main.yml
index 83803a5..b30fbfe 100644
--- a/roles/proxy/defaults/main.yml
+++ b/roles/proxy/defaults/main.yml
@@ -4,11 +4,11 @@ revport: 80
 revports: 443
 crtversion: 1
 peers:
-  - [ '9090', 'cockpit', 'vhost_cockpit', 'localhost' ]
-  - [ '8101', 'casper-site-dev', 'vhost_casper-site', 'casperdev.home.casperlefantom.net' ]
-  - [ '8102', 'cirrus-dev', 'vhost_cirrus', 'cirrusdev.home.casperlefantom.net' ]
+  - [ '9090', 'cockpit', 'vhost_cockpit', 'localhost', '127.0.0.1' ]
+  - [ '8101', 'casper-site-dev', 'vhost_casper-site', 'casperdev.home.casperlefantom.net', '127.0.0.1' ]
+  - [ '8102', 'cirrus-dev', 'vhost_cirrus', 'cirrusdev.home.casperlefantom.net', '127.0.0.1' ]
 peerssl:
-  - [ '8103', 'jays-site-dev', 'vhost_jays-site', 'jaydev.home.casperlefantom.net' ]
+  - [ '8103', 'jays-site-dev', 'vhost_jays-site', 'jaydev.home.casperlefantom.net', '127.0.0.1' ]
 iface:
   - 127.0.0.1
   - "[::1]"
diff --git a/roles/proxy/templates/squid.conf.j2 b/roles/proxy/templates/squid.conf.j2
index 01e80ff..d8591a5 100644
--- a/roles/proxy/templates/squid.conf.j2
+++ b/roles/proxy/templates/squid.conf.j2
@@ -27,7 +27,7 @@ https_port {{ item }}:{{ revports }} accel ignore-cc  \
 
 
 {% for peer in peers %}
-cache_peer 127.0.0.1 parent {{ peer.0 }} 0 no-query originserver no-digest name={{ peer.1 }}
+cache_peer {{ peer.4 }} parent {{ peer.0 }} 0 no-query originserver no-digest name={{ peer.1 }}
 acl {{ peer.2 }} dstdomain {{ peer.3 }}
 cache_peer_access {{ peer.1 }} allow {{ peer.2 }}
 http_access allow {{ peer.2 }}
@@ -35,7 +35,7 @@ http_access allow {{ peer.2 }}
 {% endfor %}
 
 {% for peer in peerssl %}
-cache_peer 127.0.0.1 parent {{ peer.0 }} 0 no-query originserver no-digest  \
+cache_peer {{ peer.4 }} parent {{ peer.0 }} 0 no-query originserver no-digest  \
            tls                                                      \
            sslflags=DONT_VERIFY_PEER                                \
            name={{ peer.1 }}