diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 1d24c60..01c5de9 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -6,12 +6,12 @@ timezone: Europe/Berlin rclone_config: "/root/.config/rclone/" puid: "1000" pgid: "1000" -pk_path: "/media/veracrypt1/genesis" +pk_path: "/mnt/veracrypt1/genesis" pubkey: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqc9fnzfCz8fQDFzla+D8PBhvaMmFu2aF+TYkkZRxl9 tuan@genesis-2022-01-20" -local_domain: borg.land -local_subdomains: "@" +local_domain: tudattr.dev +local_subdomains: "local" remote_domain: tudattr.dev remote_subdomains: "www,plex,status,tautulli" backup_domain: seyshiro.de @@ -281,7 +281,7 @@ wg_deps: "wireguard" wg_ip: "192.168.200.2" wg_pubkey: "+LaPESyBF6Sb1lqkk4UcestFpXNaKYyyX99tkqwLQhU=" -wg_endpoint: "{{ local_domain }}:51820" +wg_endpoint: "{{ local_subdomains }}.{{ local_domain }}:51820" wg_allowed_ips: "192.168.20.0/24,192.168.200.1/32" wg_dns: "{{ aya01_ip }},{{ pi_ip }},1.1.1.1" diff --git a/roles/backblaze/tasks/backup.yml b/roles/backblaze/tasks/backup.yml index a5b34ca..595492b 100644 --- a/roles/backblaze/tasks/backup.yml +++ b/roles/backblaze/tasks/backup.yml @@ -13,7 +13,7 @@ - name: Backing up for "{{ inventory_hostname }}" shell: - cmd: "rclone sync {{ item }} secret:{{ item }} -L" + cmd: "rclone sync {{ item }} secret:{{ item }} --skip-links" loop: "{{ host.backblaze.paths }}" become: true diff --git a/roles/docker/tasks/pihole.yml b/roles/docker/tasks/pihole.yml index a98e2ba..a7ca11a 100644 --- a/roles/docker/tasks/pihole.yml +++ b/roles/docker/tasks/pihole.yml @@ -12,10 +12,3 @@ become: true -- name: Copy wildcard config - template: - owner: "{{ puid }}" - src: "templates/common/pihole/etc-dnsmasq/02-wildcard-dns.conf" - dest: "{{ docker_dir }}/pihole/etc-dnsmasq.d/02-wildcard-dns.conf" - mode: '660' - become: true diff --git a/roles/docker/templates/aya01/ddns-updater/data/config.json b/roles/docker/templates/aya01/ddns-updater/data/config.json index 26211f9..ec03c69 100644 --- a/roles/docker/templates/aya01/ddns-updater/data/config.json +++ b/roles/docker/templates/aya01/ddns-updater/data/config.json @@ -4,7 +4,7 @@ "provider": "namecheap", "domain": "{{ local_domain }}", "host": "{{ local_subdomains }}", - "password": "{{ vault_ddns_borgland_password }}", + "password": "{{ vault_ddns_local_password }}", "provider_ip": true } ] diff --git a/roles/docker/templates/common/pihole/etc-dnsmasq/02-wildcard-dns.conf b/roles/docker/templates/common/pihole/etc-dnsmasq/02-wildcard-dns.conf deleted file mode 100644 index c3ad8f6..0000000 --- a/roles/docker/templates/common/pihole/etc-dnsmasq/02-wildcard-dns.conf +++ /dev/null @@ -1,3 +0,0 @@ -address=/pi.borg.land/192.168.20.11 -address=/aya01.borg.land/192.168.20.12 -address=/naruto.borg.land/192.168.20.13