sonny/arch-setup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert to route only domains

Browse source 
Resolution sometimes fails as HTTPS requests are not possible yet to
some domains. This causes HTTP requests to fail later on. Can be reproduced
by doing a HTTPS request first (for a domain configured without HTTPS) and retrying
with a HTTP request afterwards.
This commit is contained in:
Sonny Bakker 2025-04-26 09:48:58 +02:00
parent 4fc4f2712b
commit c5c7c8ce88
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
host_vars/desktop/vpn.yml
View file

@ -5,11 +5,11 @@ vpn_default:
interface: wg0 interface: wg0
dns: 10.0.0.1 dns: 10.0.0.1
domains: domains:
- 'vpn.{{ server_domain }}' - '~vpn.{{ server_domain }}'
- 'transmission.{{ server_domain }}' - '~transmission.{{ server_domain }}'
- 'syncthing.{{ server_domain }}' - '~syncthing.{{ server_domain }}'
- 'radicale.{{ server_domain }}' - '~radicale.{{ server_domain }}'
- 'mpd.{{ server_domain }}' - '~mpd.{{ server_domain }}'
public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub' public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub'
private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key' private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key'
@ -33,8 +33,8 @@ vpn_media:
interface: wg1 interface: wg1
dns: 10.0.1.1 dns: 10.0.1.1
domains: domains:
- 'media-vpn.{{ server_domain }}' - '~media-vpn.{{ server_domain }}'
- 'jellyfin.{{ server_domain }}' - '~jellyfin.{{ server_domain }}'
public_key_path: '{{ vpn_config_dir }}/keys/public/media/desktop.pub' public_key_path: '{{ vpn_config_dir }}/keys/public/media/desktop.pub'
private_key_path: '{{ vpn_config_dir }}/keys/private/media/desktop.key' private_key_path: '{{ vpn_config_dir }}/keys/private/media/desktop.key'

14
host_vars/xps/vpn.yml
View file

@ -7,11 +7,11 @@ vpn_default:
interface: wg0 interface: wg0
dns: 10.0.0.1 dns: 10.0.0.1
domains: domains:
- 'vpn.{{ server_domain }}' - '~vpn.{{ server_domain }}'
- 'transmission.{{ server_domain }}' - '~transmission.{{ server_domain }}'
- 'syncthing.{{ server_domain }}' - '~syncthing.{{ server_domain }}'
- 'radicale.{{ server_domain }}' - '~radicale.{{ server_domain }}'
- 'mpd.{{ server_domain }}' - '~mpd.{{ server_domain }}'
public_key_path: '{{ vpn_config_dir }}/keys/public/default/laptop.pub' public_key_path: '{{ vpn_config_dir }}/keys/public/default/laptop.pub'
private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.key' private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.key'
@ -35,8 +35,8 @@ vpn_media:
interface: wg1 interface: wg1
dns: 10.0.1.1 dns: 10.0.1.1
domains: domains:
- 'media-vpn.{{ server_domain }}' - '~media-vpn.{{ server_domain }}'
- 'jellyfin.{{ server_domain }}' - '~jellyfin.{{ server_domain }}'
public_key_path: '{{ vpn_config_dir }}/keys/public/media/laptop.pub' public_key_path: '{{ vpn_config_dir }}/keys/public/media/laptop.pub'
private_key_path: '{{ vpn_config_dir }}/keys/private/media/laptop.key' private_key_path: '{{ vpn_config_dir }}/keys/private/media/laptop.key'

2
templates/personal/desktop/network/wg0.network.j2
View file

@ -6,4 +6,4 @@ Name={{ vpn_default.interface }}
[Network] [Network]
Address={{ vpn_default.ip }}/{{ vpn_default.prefix }} Address={{ vpn_default.ip }}/{{ vpn_default.prefix }}
DNS={{ vpn_default.dns }} DNS={{ vpn_default.dns }}
Domains={{ vpn_default.domains | join(' ') }} {{ vpn_default.domains | map('regex_replace', '^(.*)$', '~\\1') | join(' ') }} Domains={{ vpn_default.domains | join(' ') }}

2
templates/personal/desktop/network/wg1.network.j2
View file

@ -6,4 +6,4 @@ Name={{ vpn_media.interface }}
[Network] [Network]
Address={{ vpn_media.ip }}/{{ vpn_media.prefix }} Address={{ vpn_media.ip }}/{{ vpn_media.prefix }}
DNS={{ vpn_media.dns }} DNS={{ vpn_media.dns }}
Domains={{ vpn_media.domains | join(' ') }} {{ vpn_media.domains | map('regex_replace', '^(.*)$', '~\\1') | join(' ') }} Domains={{ vpn_media.domains | join(' ') }}

2
templates/personal/xps/network/wg0.network.j2
View file

@ -6,4 +6,4 @@ Name={{ vpn_default.interface }}
[Network] [Network]
Address={{ vpn_default.ip }}/{{ vpn_default.prefix }} Address={{ vpn_default.ip }}/{{ vpn_default.prefix }}
DNS={{ vpn_default.dns }} DNS={{ vpn_default.dns }}
Domains={{ vpn_default.domains | join(' ') }} {{ vpn_default.domains | map('regex_replace', '^(.*)$', '~\\1') | join(' ') }} Domains={{ vpn_default.domains | join(' ') }}

2
templates/personal/xps/network/wg1.network.j2
View file

@ -6,4 +6,4 @@ Name={{ vpn_media.interface }}
[Network] [Network]
Address={{ vpn_media.ip }}/{{ vpn_media.prefix }} Address={{ vpn_media.ip }}/{{ vpn_media.prefix }}
DNS={{ vpn_media.dns }} DNS={{ vpn_media.dns }}
Domains={{ vpn_media.domains | join(' ') }} {{ vpn_media.domains | map('regex_replace', '^(.*)$', '~\\1') | join(' ') }} Domains={{ vpn_media.domains | join(' ') }}