Apply changes from 8920ba56f3 to laptop configuration

vars/desktop.yml

@@ -21,7 +21,7 @@ boot_configuration:
 # TODO: scope variables to their destination file
 vpn_default:
   ip: '10.0.0.3'
-  subnet: '24'
+  prefix: '24'
   interface: 'wg0'
   dns: '10.0.0.1'
   domains:
@@ -30,7 +30,6 @@ vpn_default:
 
   public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub'
   private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key'
-  private_key_source_path: 'files/desktop/wireguard/default/desktop.key'
 
   peers:
     - name: 'zeus'
@@ -46,7 +45,7 @@ vpn_default:
 
 vpn_media:
   ip: '10.0.1.3'
-  subnet: '24'
+  prefix: '24'
   interface: 'wg1'
   dns: '10.0.1.1'
   domains:

vars/laptop.yml

@@ -24,18 +24,23 @@ mkinitcpio_templates:
 
 vpn_default:
   ip: '10.0.0.2'
-  subnet: '24'
+  prefix: '24'
   interface: 'wg0'
   dns: '10.0.0.1'
   domains:
     - ~vpn.fudiggity.nl
+    - ~transmission.fudiggity.nl
 
   public_key_path: '{{ vpn_config_dir }}/keys/public/default/laptop.pub'
   private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.key'
 
   peers:
     - name: 'zeus'
-      allowd_ips: '10.0.0.1/32'
+      allowed_ips:
+        - address: '10.0.0.0/24'
+          create_route: false
+        - address: '172.16.238.0/24'
+          create_route: true
       endpoint: 'fudiggity.nl:51902'
       public_key: 'CeybSMpJiicXmndIuhe89Bay3z3PEdYNyAwIFsacBEo='
       preshared_key_path: '{{ vpn_config_dir }}/keys/private/default/preshared-zeus.psk'
@@ -43,7 +48,7 @@ vpn_default:
 
 vpn_media:
   ip: '10.0.1.2'
-  subnet: '24'
+  prefix: '24'
   interface: 'wg1'
   dns: '10.0.1.1'
   domains:
@@ -54,7 +59,9 @@ vpn_media:
 
   peers:
     - name: 'zeus-media'
-      allowd_ips: '10.0.1.1/32'
+      allowed_ips:
+        - address: '10.0.1.0/24'
+          create_route: false
       endpoint: 'fudiggity.nl:51903'
       public_key: 'EugKeo63C5N5kz9ShMHtYswO9Qh6mE00MtfLSFmqqjg='
       preshared_key_path: '{{ vpn_config_dir }}/keys/private/media/preshared-zeus.psk'