Compare commits

..

No commits in common. "f5ada68b2ba27230a45f59a5224d1aa89dbd4cf1" and "4fc4f2712bf42e132077b53c47ee6a7b4fe5dde4" have entirely different histories.

8 changed files with 22 additions and 20 deletions

View file

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

View file

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

View file

@ -1,5 +1,5 @@
personal:
hosts:
hosts:
xps:
ansible_connection: local
desktop:

View file

@ -1,5 +1,7 @@
- name: Arch Linux provisioning
hosts: personal
hosts:
- xps
- desktop
gather_facts: true
roles:
- common

View file

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

View file

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

View file

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

View file

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