From 460d9365f11acff71ddbf1e57916cfce017b2cff Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 2 Mar 2025 20:11:23 +0100 Subject: [PATCH 1/2] Remove thermal control monitoring provisioning --- tasks/setup-laptop.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tasks/setup-laptop.yml b/tasks/setup-laptop.yml index 19d26e5..01517f4 100644 --- a/tasks/setup-laptop.yml +++ b/tasks/setup-laptop.yml @@ -1,10 +1,6 @@ -- name: set fan and thermal monitoring control +- name: Provision powertop systemd service become: true - command: smbios-thermal-ctl --set-thermal-mode quiet - -- name: provision powertop systemd service - become: true - template: + ansible.builtin.template: src: 'templates/laptop/powertop.service.j2' dest: '/etc/systemd/system/powertop.service' owner: root From 079b45be28812a7c42de66dd1682e2e563afae51 Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Thu, 6 Mar 2025 02:22:49 +0100 Subject: [PATCH 2/2] Use DNS from wireguard interface --- templates/desktop/network/wg0.network.j2 | 2 ++ templates/desktop/network/wg1.network.j2 | 2 ++ templates/laptop/network/wg0.network.j2 | 2 ++ templates/laptop/network/wg1.network.j2 | 2 ++ vars/desktop.yml | 6 ++++++ vars/laptop.yml | 6 ++++++ vars/mpd.yml | 2 +- 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/templates/desktop/network/wg0.network.j2 b/templates/desktop/network/wg0.network.j2 index 4dbb494..9253528 100644 --- a/templates/desktop/network/wg0.network.j2 +++ b/templates/desktop/network/wg0.network.j2 @@ -5,3 +5,5 @@ Name={{ vpn_default.interface }} [Network] Address={{ vpn_default.ip }}/{{ vpn_default.subnet }} +DNS={{ vpn_default.dns }} +Domains={{ vpn_default.domains | join(' ') }} diff --git a/templates/desktop/network/wg1.network.j2 b/templates/desktop/network/wg1.network.j2 index 3f8e7a1..9a03d7b 100644 --- a/templates/desktop/network/wg1.network.j2 +++ b/templates/desktop/network/wg1.network.j2 @@ -5,3 +5,5 @@ Name={{ vpn_media.interface }} [Network] Address={{ vpn_media.ip }}/{{ vpn_media.subnet }} +DNS={{ vpn_media.dns }} +Domains={{ vpn_media.domains | join(' ') }} diff --git a/templates/laptop/network/wg0.network.j2 b/templates/laptop/network/wg0.network.j2 index 4dbb494..9253528 100644 --- a/templates/laptop/network/wg0.network.j2 +++ b/templates/laptop/network/wg0.network.j2 @@ -5,3 +5,5 @@ Name={{ vpn_default.interface }} [Network] Address={{ vpn_default.ip }}/{{ vpn_default.subnet }} +DNS={{ vpn_default.dns }} +Domains={{ vpn_default.domains | join(' ') }} diff --git a/templates/laptop/network/wg1.network.j2 b/templates/laptop/network/wg1.network.j2 index 3f8e7a1..9a03d7b 100644 --- a/templates/laptop/network/wg1.network.j2 +++ b/templates/laptop/network/wg1.network.j2 @@ -5,3 +5,5 @@ Name={{ vpn_media.interface }} [Network] Address={{ vpn_media.ip }}/{{ vpn_media.subnet }} +DNS={{ vpn_media.dns }} +Domains={{ vpn_media.domains | join(' ') }} diff --git a/vars/desktop.yml b/vars/desktop.yml index 3f39782..d9646c5 100644 --- a/vars/desktop.yml +++ b/vars/desktop.yml @@ -22,6 +22,9 @@ vpn_default: ip: '10.0.0.3' subnet: '24' interface: 'wg0' + dns: '10.0.0.1' + domains: + - ~vpn.fudiggity.nl public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub' private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key' @@ -39,6 +42,9 @@ vpn_media: ip: '10.0.1.3' subnet: '24' interface: 'wg1' + dns: '10.0.1.1' + domains: + - ~media-vpn.fudiggity.nl public_key_path: '{{ vpn_config_dir }}/keys/public/media/desktop.pub' private_key_path: '{{ vpn_config_dir }}/keys/private/media/desktop.key' diff --git a/vars/laptop.yml b/vars/laptop.yml index f2e5dbc..cba4fa9 100644 --- a/vars/laptop.yml +++ b/vars/laptop.yml @@ -26,6 +26,9 @@ vpn_default: ip: '10.0.0.2' subnet: '24' interface: 'wg0' + dns: '10.0.0.1' + domains: + - ~vpn.fudiggity.nl public_key_path: '{{ vpn_config_dir }}/keys/public/default/laptop.pub' private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.key' @@ -42,6 +45,9 @@ vpn_media: ip: '10.0.1.2' subnet: '24' interface: 'wg1' + dns: '10.0.1.1' + domains: + - ~media-vpn.fudiggity.nl public_key_path: '{{ vpn_config_dir }}/keys/public/media/laptop.pub' private_key_path: '{{ vpn_config_dir }}/keys/private/media/laptop.key' diff --git a/vars/mpd.yml b/vars/mpd.yml index 742d0d4..fa1b0be 100644 --- a/vars/mpd.yml +++ b/vars/mpd.yml @@ -1,7 +1,7 @@ mpd_listen_address: '127.0.0.1' mpd_listen_port: '6600' -mpd_remote_address: '10.0.0.1' +mpd_remote_address: 'vpn.fudiggity.nl' mpd_remote_port: '21000' mpd_remote_stream_port: '8000' # note that this is not used (yet)