Migration server wireguard pour backend osmose sur osmose.vm

osm-fr · Aug 24, 2024 · 8c7e8c0 · 8c7e8c0
1 parent a165f4d
commit 8c7e8c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...s/proxy.ovh.vm.openstreetmap.fr/wireguard → ...vars/osmose.vm.openstreetmap.fr/wireguard b/...s/proxy.ovh.vm.openstreetmap.fr/wireguard → ...vars/osmose.vm.openstreetmap.fr/wireguard
diff --git a/hosts b/hosts
@@ -306,10 +306,10 @@ renderd-cyclosm.vm.openstreetmap.fr renderd_cyclosm=true
 bzh202.vm.openstreetmap.fr renderd_bzh=true
 
 [wireguard]
-proxy.ovh.vm.openstreetmap.fr wireguard_config=server
-osmose-aquilenet.openstreetmap.fr
-osmose-hivane1.openstreetmap.fr
-osmose-hivane2.openstreetmap.fr
+osmose.vm.openstreetmap.fr wireguard_config=server wireguard_address=10.230.0.10
+osmose-aquilenet.openstreetmap.fr wireguard_server=osmose.vm.openstreetmap.fr wireguard_address=10.230.0.2
+osmose-hivane1.openstreetmap.fr wireguard_server=osmose.vm.openstreetmap.fr wireguard_address=10.230.0.3
+osmose-hivane2.openstreetmap.fr wireguard_server=osmose.vm.openstreetmap.fr wireguard_address=10.230.0.4
 
 [wordpress]
 osm142.openstreetmap.fr

diff --git a/roles/wireguard/templates/wireguard-client-wg0.conf b/roles/wireguard/templates/wireguard-client-wg0.conf
@@ -4,8 +4,8 @@ PrivateKey = {{ lookup('file', 'credentials/wireguard/' + inventory_hostname + '
 Address = {{ lookup('file', 'credentials/wireguard/' + inventory_hostname + '.address') }}/24
 
 [Peer]
-PublicKey = {{ lookup('file', 'credentials/wireguard/proxy.ovh.vm.openstreetmap.fr.public.key') }}
-Endpoint = proxy.ovh.vm.openstreetmap.fr:1500
+PublicKey = {{ lookup('file', 'credentials/wireguard/' + wireguard_server + '.public.key') }}
+Endpoint = {{ wireguard_server }}:1500
 {% for host in wireguard_hosts %}
 # {{ host }}
 {%   if host | ansible.utils.ipv4 %}