From bf6385c09018ac305f28fe6b65e392a53bbb67a6 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 7 Sep 2020 14:16:13 +0200 Subject: akili. --- ansible/all.yml | 1 - ansible/group_vars/all/users.yml | 2 +- ansible/inventory | 2 ++ ansible/plays/files/akili/etc/wireguard/public-wg0.key | 2 +- ansible/roles/wireguard/tasks/main.yml | 18 ------------------ 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ansible/all.yml b/ansible/all.yml index f10c7fe..83623cf 100644 --- a/ansible/all.yml +++ b/ansible/all.yml @@ -20,5 +20,4 @@ - import_playbook: plays/postfix-satellite.yml - import_playbook: nftables.yml - import_playbook: lxc-host.yml -- import_playbook: plays/wireguard.yml - import_playbook: unifi.yml diff --git a/ansible/group_vars/all/users.yml b/ansible/group_vars/all/users.yml index e44001c..c1617e9 100644 --- a/ansible/group_vars/all/users.yml +++ b/ansible/group_vars/all/users.yml @@ -5,7 +5,7 @@ users: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAzB6JB/hZ87M6ozsd7lgKxgOacEOZZRxa4ucs11lqq trygvis@conflatorio ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMRccGxF1l7xIUavu5vDqypCe/aon3+bdFgEhPa7pPb trygvis@arius-v3 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/Xrsk69KhaXdHPcbBoCbqlQ2DXmx77OnkLAk22ui5m trygvis@malabaricus - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKXVnzqo+JTVNrt3p0LGeH59DPMc9WkVMXO3wpAyTH6 trygvis@akili + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEkisPUAai4P3Scj1gWdV2TcDr54tb20BDy0NAkGOZnF trygvis@akili-v2 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3UZyrbXX7WMHqcZCRspkoSIfB6egrbOxXPf1zyZkAw trygvis@arius-v4 authorized_keys_absent: diff --git a/ansible/inventory b/ansible/inventory index 895432e..91398d9 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -2,6 +2,7 @@ all: hosts: knot: ansible_host: knot.trygvis.io + ansible_python_interpreter: /usr/bin/python3 numquam: ansible_host: numquam.trygvis.io birgitte: @@ -20,6 +21,7 @@ all: ansible_python_interpreter: /usr/bin/python3 akili: ansible_host: akili.local + ansible_python_interpreter: /usr/bin/python3 nextcloud: ansible_host: 192.168.10.201 unifi: diff --git a/ansible/plays/files/akili/etc/wireguard/public-wg0.key b/ansible/plays/files/akili/etc/wireguard/public-wg0.key index f94a7b2..a257ddf 100644 --- a/ansible/plays/files/akili/etc/wireguard/public-wg0.key +++ b/ansible/plays/files/akili/etc/wireguard/public-wg0.key @@ -1 +1 @@ -pFbHqAJuQPR+JwHDT6YT9pIpGPfDdhM1WU6RXfrZjCQ= +VljF7el9SuYTe4RN9ZOSHPHyqWnUM/DSk4kuh29hJR4= diff --git a/ansible/roles/wireguard/tasks/main.yml b/ansible/roles/wireguard/tasks/main.yml index 734516b..d05cec9 100644 --- a/ansible/roles/wireguard/tasks/main.yml +++ b/ansible/roles/wireguard/tasks/main.yml @@ -21,24 +21,6 @@ name: - wireguard install_recommends: no - - name: Install packages (amd64) - tags: - - never - - packages - apt: - name: - - linux-headers-amd64 - install_recommends: no - when: ansible_architecture == 'x86_64' - - name: Install packages (i686) - tags: - - never - - packages - apt: - name: - - linux-headers-i686-pae - install_recommends: no - when: ansible_architecture == 'i686' - name: systemctl enable systemd-networkd systemd: -- cgit v1.2.3