Umbau: fileserver2 --> fileserver3 (#434)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: #434
This commit is contained in:
Michael Grote 2022-11-24 16:20:57 +01:00
parent 6475d88cd7
commit 4a66b4b485
10 changed files with 27 additions and 26 deletions

View file

@ -17,7 +17,7 @@ services:
- DISABLELOCALNODE=yes - DISABLELOCALNODE=yes
- CRONDELAY=5 - CRONDELAY=5
- 'NODES= - 'NODES=
fileserver2.grote.lan:fileserver2.grote.lan fileserver3.grote.lan:fileserver3.grote.lan
acng2.grote.lan:acng2.grote.lan acng2.grote.lan:acng2.grote.lan
ansible2.grote.lan:ansible2.grote.lan ansible2.grote.lan:ansible2.grote.lan
pve5.grote.lan:pve5.grote.lan pve5.grote.lan:pve5.grote.lan

View file

@ -47,7 +47,7 @@ volumes:
driver_opts: driver_opts:
type: "cifs" type: "cifs"
o: "user=navidrome,password={{ lookup('keepass', 'navidrome_smb_share_password', 'password') }}" 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 ########
networks: networks:
traefik: traefik:

View file

@ -23,7 +23,7 @@
restic_failure_delay: "30 s" restic_failure_delay: "30 s"
restic_schedule: "0/6:00" # alle 6 Stunden 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_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_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}"
restic_mount_user: restic restic_mount_user: restic
restic_mount_password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}" restic_mount_password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}"

View file

@ -16,7 +16,7 @@
comment: 'dns' comment: 'dns'
from_ip: 0.0.0.0/0 from_ip: 0.0.0.0/0
### mgrote.restic ### mgrote.restic
restic_repository: "//192.168.2.36/restic" restic_repository: "//192.168.2.54/restic"
### mgrote.apt_manage_sources ### mgrote.apt_manage_sources
# wird leer gesetzt da dnsmasq NICHT den Router befragt und daher keine Lokalen Hostnamen abfragen kann # wird leer gesetzt da dnsmasq NICHT den Router befragt und daher keine Lokalen Hostnamen abfragen kann
manage_sources_apt_proxy: "" manage_sources_apt_proxy: ""

View file

@ -1,6 +1,6 @@
--- ---
### PROXMOX ### 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 ### oefenweb.ufw
ufw_rules: ufw_rules:

View file

@ -167,65 +167,66 @@
### mgrote.cv4pve-autosnap ### mgrote.cv4pve-autosnap
cv4pve_api_user: root@pam!cv4pve-autosnap cv4pve_api_user: root@pam!cv4pve-autosnap
cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}" 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_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 ### mgrote.proxmox_bind_mounts
pve_bind_mounts: pve_bind_mounts:
- vmid: 127 ### fileserver3
- vmid: 115
mp_nr: 0 mp_nr: 0
mp_path_host: /hdd_data_raidz/videos mp_path_host: /hdd_data_raidz/videos
mp_path_guest: /shares_videos mp_path_guest: /shares_videos
- vmid: 127 - vmid: 115
mp_nr: 2 mp_nr: 2
mp_path_host: /hdd_data_raidz/pve_backup mp_path_host: /hdd_data_raidz/pve_backup
mp_path_guest: /shares_pve_backup mp_path_guest: /shares_pve_backup
- vmid: 127 - vmid: 115
mp_nr: 3 mp_nr: 3
mp_path_host: /hdd_data_raidz/papa_backup mp_path_host: /hdd_data_raidz/papa_backup
mp_path_guest: /shares_papa_backup mp_path_guest: /shares_papa_backup
- vmid: 127 - vmid: 115
mp_nr: 4 mp_nr: 4
mp_path_host: /hdd_data_raidz/music mp_path_host: /hdd_data_raidz/music
mp_path_guest: /shares_music mp_path_guest: /shares_music
- vmid: 127 - vmid: 115
mp_nr: 5 mp_nr: 5
mp_path_host: /hdd_data_raidz/tmp mp_path_host: /hdd_data_raidz/tmp
mp_path_guest: /shares_tmp mp_path_guest: /shares_tmp
- vmid: 127 - vmid: 115
mp_nr: 6 mp_nr: 6
mp_path_host: /hdd_data_raidz/archiv mp_path_host: /hdd_data_raidz/archiv
mp_path_guest: /shares_archiv mp_path_guest: /shares_archiv
- vmid: 127 - vmid: 115
mp_nr: 7 mp_nr: 7
mp_path_host: /hdd_data_raidz/bilder mp_path_host: /hdd_data_raidz/bilder
mp_path_guest: /shares_bilder mp_path_guest: /shares_bilder
- vmid: 127 - vmid: 115
mp_nr: 8 mp_nr: 8
mp_path_host: /hdd_data_raidz/hm mp_path_host: /hdd_data_raidz/hm
mp_path_guest: /shares_hm mp_path_guest: /shares_hm
- vmid: 127 - vmid: 115
mp_nr: 9 mp_nr: 9
mp_path_host: /hdd_data_raidz/scans mp_path_host: /hdd_data_raidz/scans
mp_path_guest: /shares_scans mp_path_guest: /shares_scans
- vmid: 127 - vmid: 115
mp_nr: 10 mp_nr: 10
mp_path_host: /hdd_data_raidz/restic mp_path_host: /hdd_data_raidz/restic
mp_path_guest: /shares_restic mp_path_guest: /shares_restic
- vmid: 127 - vmid: 115
mp_nr: 12 mp_nr: 12
mp_path_host: /hdd_data_raidz/backup mp_path_host: /hdd_data_raidz/backup
mp_path_guest: /shares_backup mp_path_guest: /shares_backup
- vmid: 127 - vmid: 115
mp_nr: 14 mp_nr: 14
mp_path_host: /hdd_data_raidz/buecher mp_path_host: /hdd_data_raidz/buecher
mp_path_guest: /shares_buecher mp_path_guest: /shares_buecher
- vmid: 127 - vmid: 115
mp_nr: 15 mp_nr: 15
mp_path_host: /hdd_data_raidz/programme mp_path_host: /hdd_data_raidz/programme
mp_path_guest: /shares_programme mp_path_guest: /shares_programme
- vmid: 127 - vmid: 115
mp_nr: 16 mp_nr: 16
mp_path_host: /hdd_data_raidz/vm mp_path_host: /hdd_data_raidz/vm
mp_path_guest: /shares_vm mp_path_guest: /shares_vm

View file

@ -5,7 +5,7 @@ all:
dokuwiki2.grote.lan: dokuwiki2.grote.lan:
fileserver: fileserver:
hosts: hosts:
fileserver2.grote.lan: fileserver3.grote.lan:
dnsmasq: dnsmasq:
hosts: hosts:
dnsmasq.grote.lan: dnsmasq.grote.lan:
@ -48,7 +48,7 @@ all:
production: production:
hosts: hosts:
dokuwiki2.grote.lan: dokuwiki2.grote.lan:
fileserver2.grote.lan: fileserver3.grote.lan:
acng2.grote.lan: acng2.grote.lan:
ansible2.grote.lan: ansible2.grote.lan:
pve5.grote.lan: pve5.grote.lan:

View file

@ -1,10 +1,10 @@
--- ---
cifs_mounts: cifs_mounts:
- name: pve_backup_mount_fileserver2 - name: pve_backup_mount_fileserver3
type: cifs type: cifs
state: absent state: absent
dest: /pve_backup_mount dest: /pve_backup_mount
src: //fileserver2.grote.lan/proxmox src: //fileserver3.grote.lan/proxmox
user: pve user: pve
password: XXXXXXXXXXXXXXX password: XXXXXXXXXXXXXXX
domain: grote.lan domain: grote.lan

View file

@ -21,7 +21,7 @@
restic_schedule: "*:0/2" restic_schedule: "*:0/2"
# welche ordner sollen gesichert werden # welche ordner sollen gesichert werden
restic_folders_to_backup: "/usr/local /etc /root /var/www /home" 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" restic_repository: "//fileserver.domain/restic"
# password für das repo # password für das repo
restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}" restic_repository_password: "{{ lookup('keepass', 'restic_repository_password', 'password') }}"