diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml index 39c143d2..db37f11b 100644 --- a/group_vars/fileserver.yml +++ b/group_vars/fileserver.yml @@ -52,8 +52,6 @@ smb_client_max_protocol: "SMB3_11" smb_enable_snapshots_dir: true smb_users: - - name: 'annemariedroessler2' - password: "{{ lookup('keepass', 'fileserver_smb_user_amd', 'password') }}" - name: 'restic' password: "{{ lookup('keepass', 'fileserver_smb_user_restic', 'password') }}" - name: 'win10' diff --git a/host_vars/fileserver2.grote.lan.yml b/host_vars/fileserver2.grote.lan.yml index ab6191e0..c318a080 100644 --- a/host_vars/fileserver2.grote.lan.yml +++ b/host_vars/fileserver2.grote.lan.yml @@ -39,13 +39,6 @@ ### mgote.rclone rclone_jobs: - - name: smb_amd_glacier - quelle: "/shares_amd" - ziel: "scaleway-encrypt-glacier:/amd" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - name: smb_archiv_glacier quelle: "/shares_archiv" ziel: "scaleway-encrypt-glacier:/archiv" @@ -126,22 +119,18 @@ - name: 'videos' path: '/shares_videos' users_ro: 'kodi' - users_rw: 'annemariedroessler2 michaelgrote win10' + users_rw: 'michaelgrote win10' - name: 'scans' path: '/shares_scans' - users_ro: 'annemariedroessler2 michaelgrote' + users_ro: ' michaelgrote' users_rw: 'brother_ads2700w' - name: 'papa_backup' path: '/shares_papa_backup' users_ro: 'michaelgrote' users_rw: 'win10' - - name: 'amd' - path: '/shares_amd' - users_ro: 'michaelgrote win10' - users_rw: 'annemariedroessler2 win10' - name: 'backup' path: '/shares_backup' - users_ro: 'annemariedroessler2' + users_ro: '' users_rw: 'win10 michaelgrote' - name: 'archiv' path: '/shares_archiv' @@ -153,16 +142,16 @@ users_rw: 'michaelgrote win10' - name: 'musik' path: '/shares_music' - users_ro: 'navidrome kodi annemariedroessler2 ' + users_ro: 'navidrome kodi ' users_rw: 'win10 michaelgrote' - name: 'tmp' path: '/shares_tmp' users_ro: 'win10' - users_rw: 'kodi annemariedroessler2 win10 michaelgrote' + users_rw: 'kodi win10 michaelgrote' - name: 'bilder' path: '/shares_bilder' users_ro: 'photoprism' - users_rw: 'annemariedroessler2 michaelgrote win10' + users_rw: ' michaelgrote win10' - name: 'proxmox' path: '/shares_pve_backup' users_ro: 'michaelgrote' @@ -170,14 +159,14 @@ - name: 'restic' path: '/shares_restic' users_ro: '' - users_rw: 'annemariedroessler2 restic win10 michaelgrote' + users_rw: ' restic win10 michaelgrote' - name: 'buecher' path: '/shares_buecher' - users_ro: 'annemariedroessler2' + users_ro: '' users_rw: 'michaelgrote win10' - name: 'programme' path: '/shares_programme' - users_ro: 'annemariedroessler2' + users_ro: '' users_rw: 'michaelgrote win10' - name: 'vm' path: '/shares_vm' diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml index caf322b8..b4b46c30 100644 --- a/host_vars/pve2.grote.lan.yml +++ b/host_vars/pve2.grote.lan.yml @@ -52,8 +52,6 @@ state: present - dataset: hdd_data_raidz/archiv state: present - - dataset: hdd_data_raidz/amd - state: present - dataset: hdd_data_raidz/bilder state: present recordsize: 1M @@ -105,10 +103,6 @@ template: '14tage' recursive: 'yes' snapshots: true - - path: hdd_data_raidz/amd - recursive: 'no' - snapshots: true - template: '3tage' - path: hdd_data_raidz/bilder recursive: 'no' snapshots: true @@ -195,10 +189,6 @@ mp_nr: 10 mp_path_host: /hdd_data_raidz/restic mp_path_guest: /shares_restic - - vmid: 127 - mp_nr: 11 - mp_path_host: /hdd_data_raidz/amd - mp_path_guest: /shares_amd - vmid: 127 mp_nr: 12 mp_path_host: /hdd_data_raidz/backup diff --git a/keepass_db.kdbx b/keepass_db.kdbx index b9f75f92..11b9f8f3 100644 Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ