diff --git a/ansible/files/wireguard/server_head b/ansible/playbooks/files/wireguard/server_head similarity index 100% rename from ansible/files/wireguard/server_head rename to ansible/playbooks/files/wireguard/server_head diff --git a/ansible/files/wireguard/server_private_key b/ansible/playbooks/files/wireguard/server_private_key similarity index 100% rename from ansible/files/wireguard/server_private_key rename to ansible/playbooks/files/wireguard/server_private_key diff --git a/ansible/files/wireguard/server_public_key b/ansible/playbooks/files/wireguard/server_public_key similarity index 100% rename from ansible/files/wireguard/server_public_key rename to ansible/playbooks/files/wireguard/server_public_key diff --git a/wg.mk b/wg.mk index e34f84a..99a39b8 100644 --- a/wg.mk +++ b/wg.mk @@ -25,15 +25,15 @@ wireguard/dmz.conf: xecut/nimbus/dmz.conf | wireguard/dmz_private_key ###### Wireguard configuration ##### -wireguard/wg_peers.txt: wgkeys.rec | xecut/nimbus/wireguard_peer.fmt +wireguard/wg_peers.txt: wgkeys.rec | xecut/nimbus/wg_peer.fmt recsel $< -t $(basename $<) | recfmt -f $| > $@ -ignored += ansible/files/wireguard/wg0.conf +ignored += ansible/playbooks/files/wireguard/wg0.conf -ansible/files/wireguard/wg0.conf: wireguard/wg_peers.txt | ansible/files/wireguard/server_head - cd ansible && ansible-vault view files/wireguard/server_head > files/wireguard/wg0.conf +ansible/playbooks/files/wireguard/wg0.conf: wireguard/wg_peers.txt | ansible/playbooks/files/wireguard/server_head + cd ansible && ansible-vault view playbooks/files/wireguard/server_head > playbooks/files/wireguard/wg0.conf cat $< >> $@ - cd ansible && ansible-vault encrypt files/wireguard/wg0.conf + cd ansible && ansible-vault encrypt playbooks/files/wireguard/wg0.conf ##### Installing Wireguard Client ##### @@ -47,5 +47,5 @@ wg-install: /etc/wireguard/dmz.conf ## Install wireguard keys (use sudo) cp $< $@ .PHONY: wg-setup -wg-setup: ansible/files/wireguard/wg0.conf ## Renew the wireguard config +wg-setup: ansible/playbooks/files/wireguard/wg0.conf ## Renew the wireguard config make -C ansible wireguard