diff --git a/docker-compose/munin/docker-compose.yml.j2 b/docker-compose/munin/docker-compose.yml.j2 index 27e5150e..70ccf2c6 100644 --- a/docker-compose/munin/docker-compose.yml.j2 +++ b/docker-compose/munin/docker-compose.yml.j2 @@ -17,7 +17,7 @@ services: - DISABLELOCALNODE=yes - CRONDELAY=5 - 'NODES= - fileserver2.grote.lan:fileserver2.grote.lan + fileserver3.grote.lan:fileserver3.grote.lan acng2.grote.lan:acng2.grote.lan ansible2.grote.lan:ansible2.grote.lan pve5.grote.lan:pve5.grote.lan diff --git a/docker-compose/navidrome/docker-compose.yml.j2 b/docker-compose/navidrome/docker-compose.yml.j2 index 48ddfd4a..e1935c71 100644 --- a/docker-compose/navidrome/docker-compose.yml.j2 +++ b/docker-compose/navidrome/docker-compose.yml.j2 @@ -47,7 +47,7 @@ volumes: driver_opts: type: "cifs" o: "user=navidrome,password={{ lookup('keepass', 'navidrome_smb_share_password', 'password') }}" - device: "//192.168.2.36/musik/Musik" + device: "//192.168.2.54/musik/Musik" ######## Networks ######## networks: traefik: diff --git a/group_vars/all.yml b/group_vars/all.yml index d5f392de..08b1b465 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -23,7 +23,7 @@ restic_failure_delay: "30 s" restic_schedule: "0/6:00" # alle 6 Stunden restic_folders_to_backup: "/" # --one-file-system ist gesetzt, also werden weitere Dateisysteme nicht eingeschlossen, es sei denn sie werden hier explizit angegeben; https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files - restic_repository: "//fileserver2.grote.lan/restic" + restic_repository: "//fileserver3.grote.lan/restic" restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}" restic_mount_user: restic restic_mount_password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}" diff --git a/group_vars/dnsmasq.yml b/group_vars/dnsmasq.yml index 895a94a3..3726cf29 100644 --- a/group_vars/dnsmasq.yml +++ b/group_vars/dnsmasq.yml @@ -16,7 +16,7 @@ comment: 'dns' from_ip: 0.0.0.0/0 ### mgrote.restic - restic_repository: "//192.168.2.36/restic" + restic_repository: "//192.168.2.54/restic" ### mgrote.apt_manage_sources # wird leer gesetzt da dnsmasq NICHT den Router befragt und daher keine Lokalen Hostnamen abfragen kann manage_sources_apt_proxy: "" diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml index 5a34bff7..2f753dfc 100644 --- a/group_vars/fileserver.yml +++ b/group_vars/fileserver.yml @@ -1,6 +1,6 @@ --- ### PROXMOX - # fileserver2 ist ein LXC-Container; der Container ist "privileged" damit der Bind-Mount die richtigen Rechte bekommt + # fileserver3 ist ein LXC-Container; der Container ist "privileged" damit der Bind-Mount die richtigen Rechte bekommt ### oefenweb.ufw ufw_rules: diff --git a/host_vars/fileserver2.grote.lan.yml b/host_vars/fileserver3.grote.lan.yml similarity index 100% rename from host_vars/fileserver2.grote.lan.yml rename to host_vars/fileserver3.grote.lan.yml diff --git a/host_vars/pve5.grote.lan.yml b/host_vars/pve5.grote.lan.yml index d9e55464..767d2950 100644 --- a/host_vars/pve5.grote.lan.yml +++ b/host_vars/pve5.grote.lan.yml @@ -167,65 +167,66 @@ ### mgrote.cv4pve-autosnap cv4pve_api_user: root@pam!cv4pve-autosnap cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}" - cv4pve_vmid: all,-127,-112,-116,-101,-102,-106 # k3s* wieder in snaps aktivieren! + cv4pve_vmid: all,-106,-112,-115 cv4pve_keep_snapshots: 5 - cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip" + cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.14.7/cv4pve-autosnap-linux-x64.zip" ### mgrote.proxmox_bind_mounts pve_bind_mounts: - - vmid: 127 + ### fileserver3 + - vmid: 115 mp_nr: 0 mp_path_host: /hdd_data_raidz/videos mp_path_guest: /shares_videos - - vmid: 127 + - vmid: 115 mp_nr: 2 mp_path_host: /hdd_data_raidz/pve_backup mp_path_guest: /shares_pve_backup - - vmid: 127 + - vmid: 115 mp_nr: 3 mp_path_host: /hdd_data_raidz/papa_backup mp_path_guest: /shares_papa_backup - - vmid: 127 + - vmid: 115 mp_nr: 4 mp_path_host: /hdd_data_raidz/music mp_path_guest: /shares_music - - vmid: 127 + - vmid: 115 mp_nr: 5 mp_path_host: /hdd_data_raidz/tmp mp_path_guest: /shares_tmp - - vmid: 127 + - vmid: 115 mp_nr: 6 mp_path_host: /hdd_data_raidz/archiv mp_path_guest: /shares_archiv - - vmid: 127 + - vmid: 115 mp_nr: 7 mp_path_host: /hdd_data_raidz/bilder mp_path_guest: /shares_bilder - - vmid: 127 + - vmid: 115 mp_nr: 8 mp_path_host: /hdd_data_raidz/hm mp_path_guest: /shares_hm - - vmid: 127 + - vmid: 115 mp_nr: 9 mp_path_host: /hdd_data_raidz/scans mp_path_guest: /shares_scans - - vmid: 127 + - vmid: 115 mp_nr: 10 mp_path_host: /hdd_data_raidz/restic mp_path_guest: /shares_restic - - vmid: 127 + - vmid: 115 mp_nr: 12 mp_path_host: /hdd_data_raidz/backup mp_path_guest: /shares_backup - - vmid: 127 + - vmid: 115 mp_nr: 14 mp_path_host: /hdd_data_raidz/buecher mp_path_guest: /shares_buecher - - vmid: 127 + - vmid: 115 mp_nr: 15 mp_path_host: /hdd_data_raidz/programme mp_path_guest: /shares_programme - - vmid: 127 + - vmid: 115 mp_nr: 16 mp_path_host: /hdd_data_raidz/vm mp_path_guest: /shares_vm diff --git a/inventory b/inventory index e7649ab8..40286b5d 100644 --- a/inventory +++ b/inventory @@ -5,7 +5,7 @@ all: dokuwiki2.grote.lan: fileserver: hosts: - fileserver2.grote.lan: + fileserver3.grote.lan: dnsmasq: hosts: dnsmasq.grote.lan: @@ -48,7 +48,7 @@ all: production: hosts: dokuwiki2.grote.lan: - fileserver2.grote.lan: + fileserver3.grote.lan: acng2.grote.lan: ansible2.grote.lan: pve5.grote.lan: diff --git a/roles/mgrote.mount_cifs/defaults/main.yml b/roles/mgrote.mount_cifs/defaults/main.yml index b927b72e..1acff73b 100644 --- a/roles/mgrote.mount_cifs/defaults/main.yml +++ b/roles/mgrote.mount_cifs/defaults/main.yml @@ -1,10 +1,10 @@ --- cifs_mounts: - - name: pve_backup_mount_fileserver2 + - name: pve_backup_mount_fileserver3 type: cifs state: absent dest: /pve_backup_mount - src: //fileserver2.grote.lan/proxmox + src: //fileserver3.grote.lan/proxmox user: pve password: XXXXXXXXXXXXXXX domain: grote.lan diff --git a/roles/mgrote.restic/defaults/main.yml b/roles/mgrote.restic/defaults/main.yml index 76e838fb..f8032ac0 100644 --- a/roles/mgrote.restic/defaults/main.yml +++ b/roles/mgrote.restic/defaults/main.yml @@ -21,7 +21,7 @@ restic_schedule: "*:0/2" # welche ordner sollen gesichert werden restic_folders_to_backup: "/usr/local /etc /root /var/www /home" - # smb-share mit dem repository: z.B. "//fileserver2.grote.lan/restic" + # smb-share mit dem repository: z.B. "//fileserver3.grote.lan/restic" restic_repository: "//fileserver.domain/restic" # password für das repo restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}"