diff --git a/ansible/.wg.yml.swp b/ansible/.wg.yml.swp deleted file mode 100644 index 35c62d8..0000000 Binary files a/ansible/.wg.yml.swp and /dev/null differ diff --git a/ansible/hosts b/ansible/hosts index 99bae8b..fd1298f 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,2 +1,12 @@ [pt] ap33-pt + +[wg] +ap33-mon +ap33-prod + +[wg_master] +ap33-mon + +[wg_cli] +ap33-prod diff --git a/ansible/mkwgconf.sh b/ansible/mkwgconf.sh index 9dcb877..db23337 100644 --- a/ansible/mkwgconf.sh +++ b/ansible/mkwgconf.sh @@ -2,10 +2,10 @@ set -u set -e -AddressAwg=172.16.0.1/24 # Adresse VPN Wireguard extremite A +AddressAwg=10.0.0.1/24 # Adresse VPN Wireguard extremite A EndpointA=172.16.0.122 # Adresse extremite A PortA=51820 # Port ecoute extremite A -AddressBwg=172.16.0.2/24 # Adresse VPN Wireguard extremite B +AddressBwg=10.0.0.2/24 # Adresse VPN Wireguard extremite B EndpointB=172.16.0.121 # Adresse extremite B PortB=51820 # Port ecoute extremite B @@ -21,7 +21,7 @@ pKA=$(cat endpoint-a.pub) PKB=$(cat endpoint-b.key) pKB=$(cat endpoint-b.pub) -cat < wg1-a.conf +cat < wg0-1.conf # local settings for Endpoint A [Interface] PrivateKey = $PKA @@ -35,7 +35,7 @@ Endpoint = ${EndpointB}:$PortB AllowedIPs = $AddressBwg FINI -cat < wg1-b.conf +cat < wg0-2.conf # local settings for Endpoint B [Interface] PrivateKey = $PKB diff --git a/ansible/wg.yml b/ansible/wg.yml index 326b2df..8fb6120 100644 --- a/ansible/wg.yml +++ b/ansible/wg.yml @@ -1,24 +1,65 @@ --- - hosts: wg + become: yes tasks: - - name: installe Wireguard - apt: - name: - - wireguard - - wireguard-tools - state: present + - name: arrete unattended-upgrades + service: + name: unattended-upgrades + state: stopped -- hosts: wg-master - tasks: - - name: copie le fichier wg1-a.conf et wg1-b.conf vers les machines master et cli - copy: - src: mkwgconf.sh - dest: mkwgconf.sh - flat: yes - - name: generations fichier configuration wireguard wg0-1.conf etc - shell: bash mkwgconf.sh - -- hosts: wg-cli - tasks: - - name: copie fichier + - name: installe Wireguard + apt: + name: + - wireguard + - wireguard-tools + state: present +- hosts: wg_master + tasks: + - name: copie le fichier wg0-1.conf et wg0-2.conf vers les machines master et cli + copy: + src: mkwgconf.sh + dest: mkwgconf.sh + + - name: generations fichier configuration wireguard wg0-1.conf etc + shell: bash mkwgconf.sh + + - name: récupération du fichier wg0-1.conf vers ap33-ans + fetch: + src: wg0-1.conf + dest: wg0-1.conf + flat: yes + + - name: récupération du fichier wg0-2.conf vers ap33-ans + fetch: + src: wg0-2.conf + dest: wg0-2.conf + flat: yes + +- hosts: wg + become: yes + tasks: + - name: copie fichier wg0-1 vers les clients + copy: + src: wg0-1.conf + dest: /etc/wireguard/wg0.conf + when: ansible_hostname == "ap33-mon" + + - name: copie fichier wg0-2 vers les clients + copy: + src: wg0-2.conf + dest: /etc/wireguard/wg0.conf + when: ansible_hostname == "ap33-prod" + +- hosts: wg + become: yes + tasks: + - name: Activation de wireguard + service: + name: wg-quick@wg0.service + enabled: yes + + - name: Redémarre le wireguard + service: + name: wg-quick@wg0.service + state: restarted