diff --git a/docker-compose/homer/assets/mgmt.yml b/docker-compose/homer/assets/mgmt.yml index 8890aaeb..c62252a3 100644 --- a/docker-compose/homer/assets/mgmt.yml +++ b/docker-compose/homer/assets/mgmt.yml @@ -93,11 +93,6 @@ services: - name: "Internet-MGMT" icon: "fas fa-cloud" items: - - name: "Scaleway" - logo: "assets/icons/scaleway.png" - url: "https://console.scaleway.com/object-storage/buckets" - target: "_blank" - subtitle: "Scaleway S3" - name: "Strato - DNS" logo: "assets/icons/strato.jpg" url: "https://www.strato.de/apps/CustomerService#/skl" diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml index c796edac..0a57df73 100644 --- a/group_vars/fileserver.yml +++ b/group_vars/fileserver.yml @@ -51,7 +51,6 @@ ### mgrote.apt_manage_packages apt_packages_internet: - - https://github.com/rclone/rclone/releases/download/v1.59.2/rclone-v1.59.2-linux-amd64.deb - http://docker10.grote.lan:3344/bash-helper-scripts-mgrote-latest.deb ### mgrote.youtubedl @@ -93,83 +92,6 @@ ytdl_conf_dir: "/etc/youtubedl" #ohne / am ende ytdl_download_limit: "10000K" - ### mgote.rclone - rclone_jobs: - - name: smb_archiv_glacier - quelle: "/shares_archiv" - ziel: "scaleway-encrypt-glacier:/archiv" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_backup_glacier - quelle: "/shares_backup" - ziel: "scaleway-encrypt-glacier:/backup" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_bilder_glacier - quelle: "/shares_bilder" - ziel: "scaleway-encrypt-glacier:/bilder" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_buecher_glacier - quelle: "/shares_buecher" - ziel: "scaleway-encrypt-glacier:/buecher" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_hm_glacier - quelle: "/shares_hm" - ziel: "scaleway-encrypt-glacier:/hm" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_musik_glacier - quelle: "/shares_music" - ziel: "scaleway-encrypt-glacier:/musik" - timer: "*-*-* 23:15" - loglevel: INFO - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_programme_glacier - quelle: "/shares_programme" - ziel: "scaleway-encrypt-glacier:/programme" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - transfers: 4 - - name: smb_tmp_glacier - quelle: "/shares_tmp" - ziel: "scaleway-encrypt-glacier:/tmp" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_scans_glacier - quelle: "/shares_scans" - ziel: "scaleway-encrypt-glacier:/scans" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - name: smb_restic_glacier - quelle: "/shares_restic" - ziel: "scaleway-encrypt-glacier:/restic" - timer: "*-*-* 23:15" - state: true - bwlimit: 2M - mode: "--size-only" - - rclone_config: "{{ lookup('keepass', 'rclone.conf', 'notes') }}" - ### mgrote.smb_fileserver smb_shares: - name: 'videos' diff --git a/keepass_db.kdbx b/keepass_db.kdbx index 6ffae60a..7ca24703 100644 Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ diff --git a/playbooks/3_service/fileserver.yml b/playbooks/3_service/fileserver.yml index f744af9c..fae4fe3a 100644 --- a/playbooks/3_service/fileserver.yml +++ b/playbooks/3_service/fileserver.yml @@ -7,6 +7,5 @@ - hosts: fileserver roles: - { role: mgrote.fileserver_smb, tags: "fileserver_smb" } - - { role: mgrote.rclone, tags: "rclone" } - { role: mgrote.youtubedl, tags: "youtubedl" } - { role: mgrote.disable_oom_killer, tags: "oom" } diff --git a/roles/mgrote.youtubedl/templates/youtubedl.timer.j2 b/roles/mgrote.youtubedl/templates/youtubedl.timer.j2 index fe8b6626..6d4fb92d 100644 --- a/roles/mgrote.youtubedl/templates/youtubedl.timer.j2 +++ b/roles/mgrote.youtubedl/templates/youtubedl.timer.j2 @@ -1,6 +1,6 @@ {{ file_header | default () }} [Unit] -Description=Timer for rclone syncs. +Description=Timer for youtubedl. [Timer] OnCalendar={{ ytdl_timer }}