diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-18 20:01:58 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-18 20:01:58 +0100 |
| commit | a2db5e700f49e4d65bc7cdaca172d9c56009519c (patch) | |
| tree | a64b23d043390d7b64d8d1fb4a9701dab6e7f6bf | |
| parent | a5a46aa7915d5d19c5b216f35c7013939d4122f9 (diff) | |
| download | playbooks-ansible-a2db5e700f49e4d65bc7cdaca172d9c56009519c.tar.gz playbooks-ansible-a2db5e700f49e4d65bc7cdaca172d9c56009519c.tar.xz playbooks-ansible-a2db5e700f49e4d65bc7cdaca172d9c56009519c.zip | |
Remove the outdoor host variable
| -rw-r--r-- | host_vars/163.172.211.128 | 1 | ||||
| -rw-r--r-- | host_vars/51.15.179.153 | 1 | ||||
| -rw-r--r-- | host_vars/bpr7drsao5vozzr5.onion | 1 | ||||
| -rw-r--r-- | host_vars/ns4.casperlefantom.net | 1 | ||||
| -rw-r--r-- | host_vars/ns5.casperlefantom.net | 1 | ||||
| -rw-r--r-- | host_vars/wuvphkytdeukbrqm.onion | 1 | ||||
| -rw-r--r-- | roles/reverseproxy/templates/Caddyfile.j2 | 2 | ||||
| -rw-r--r-- | roles/reverseproxy/vars/main.yml | 1 |
8 files changed, 2 insertions, 7 deletions
diff --git a/host_vars/163.172.211.128 b/host_vars/163.172.211.128 index 03ab67a..a473e66 100644 --- a/host_vars/163.172.211.128 +++ b/host_vars/163.172.211.128 @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/host_vars/51.15.179.153 b/host_vars/51.15.179.153 index 06e3e18..1a608da 100644 --- a/host_vars/51.15.179.153 +++ b/host_vars/51.15.179.153 @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/host_vars/bpr7drsao5vozzr5.onion b/host_vars/bpr7drsao5vozzr5.onion index 06e3e18..1a608da 100644 --- a/host_vars/bpr7drsao5vozzr5.onion +++ b/host_vars/bpr7drsao5vozzr5.onion @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/host_vars/ns4.casperlefantom.net b/host_vars/ns4.casperlefantom.net index 06e3e18..1a608da 100644 --- a/host_vars/ns4.casperlefantom.net +++ b/host_vars/ns4.casperlefantom.net @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/host_vars/ns5.casperlefantom.net b/host_vars/ns5.casperlefantom.net index 03ab67a..a473e66 100644 --- a/host_vars/ns5.casperlefantom.net +++ b/host_vars/ns5.casperlefantom.net @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/host_vars/wuvphkytdeukbrqm.onion b/host_vars/wuvphkytdeukbrqm.onion index 03ab67a..a473e66 100644 --- a/host_vars/wuvphkytdeukbrqm.onion +++ b/host_vars/wuvphkytdeukbrqm.onion @@ -5,7 +5,6 @@ dirport: 110 bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' -outdoor: true # ntpserver masterlist: - ntp1.casperlefantom.net diff --git a/roles/reverseproxy/templates/Caddyfile.j2 b/roles/reverseproxy/templates/Caddyfile.j2 index 4f34a18..335bd47 100644 --- a/roles/reverseproxy/templates/Caddyfile.j2 +++ b/roles/reverseproxy/templates/Caddyfile.j2 @@ -15,7 +15,7 @@ {% endfor %} {% endif %} -{% if outdoor is defined %} +{% if ansible_default_ipv4.network != localnet %} {% for item in publicstatic %} {{ item }} { tls {{ email }} diff --git a/roles/reverseproxy/vars/main.yml b/roles/reverseproxy/vars/main.yml index 226ee88..f1a99c0 100644 --- a/roles/reverseproxy/vars/main.yml +++ b/roles/reverseproxy/vars/main.yml @@ -1,6 +1,7 @@ backendhost: 82.247.103.117 backendport: 4433 redirection: casperlefantom.net +localnet: 192.168.0.0 publicstatic: - "{{ ansible_hostname }}.casperlefantom.net" |