From 103a2e9c93eea64225276bf9bf76d899caf273eb Mon Sep 17 00:00:00 2001 From: mg Date: Fri, 26 May 2023 14:39:10 +0200 Subject: [PATCH] Umzug (#524) Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/524 --- docker-compose/homer/assets/mgmt.yml | 2 +- docker-compose/navidrome/docker-compose.yml.j2 | 2 +- group_vars/all.yml | 2 ++ host_vars/docker10.grote.lan.yml | 17 ----------------- host_vars/pve5.grote.lan.yml | 9 ++------- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/docker-compose/homer/assets/mgmt.yml b/docker-compose/homer/assets/mgmt.yml index cf00911c..525bbc57 100644 --- a/docker-compose/homer/assets/mgmt.yml +++ b/docker-compose/homer/assets/mgmt.yml @@ -79,7 +79,7 @@ services: logo: "assets/icons/pve.png" url: "https://pve5.grote.lan:8006" target: "_blank" - subtitle: "Selbstbau" + subtitle: "HP Elitedesk 800 G2" - name: "ProxMox Virtual Environment - Test" logo: "assets/icons/pve.png" url: "https://pve5-test.grote.lan:8006" diff --git a/docker-compose/navidrome/docker-compose.yml.j2 b/docker-compose/navidrome/docker-compose.yml.j2 index c8501a4b..f4af0b19 100644 --- a/docker-compose/navidrome/docker-compose.yml.j2 +++ b/docker-compose/navidrome/docker-compose.yml.j2 @@ -10,7 +10,7 @@ services: ND_SESSIONTIMEOUT: 24h ND_MUSICFOLDER: /music ND_DATAFOLDER: /data - ND_SCANSCHEDULE: 6 * * * * + ND_SCANSCHEDULE: 0 1 * * * ND_TRANSCODINGCACHESIZE: 500MB ND_IMAGECACHESIZE: 100MB ND_AUTOIMPORTPLAYLISTS: false diff --git a/group_vars/all.yml b/group_vars/all.yml index 67bf4ec5..35c13728 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -60,6 +60,8 @@ - name: squid_objectsize # proxmox - name: squid_requests # proxmox - name: squid_traffic # proxmox + - name: solarman_api_inverter + - name: deye munin_node_plugins: - name: timesync src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status diff --git a/host_vars/docker10.grote.lan.yml b/host_vars/docker10.grote.lan.yml index a2abd428..6db9ea6a 100644 --- a/host_vars/docker10.grote.lan.yml +++ b/host_vars/docker10.grote.lan.yml @@ -275,23 +275,6 @@ env.password {{ lookup('keepass', 'munin_user_nextcloud', 'password') }} env.api_path /ocs/v2.php/apps/serverinfo/api/v1/info env.scheme https - - name: deye - src: https://git.mgrote.net/Mirror/munin-contrib/raw/branch/master/plugins/solar/deye - config: | - [deye] - env.user deyeadmin600 - env.password {{ lookup('keepass', 'munin_deye_admin_pass', 'password') }} - env.ip 192.168.10.180 - env.serial_number {{ lookup('keepass', 'SLRM_DEVICE_SN', 'password') }} - - name: solarman_api_inverter - src: https://git.mgrote.net/Mirror/munin-contrib/raw/branch/master/plugins/solar/solarman_api_inverter - config: | - [solarman_api_inverter] - env.SLRM_APPID {{ lookup('keepass', 'SLRM_APPID', 'password') }} - env.SLRM_DEVICE_SN {{ lookup('keepass', 'SLRM_DEVICE_SN', 'password') }} - env.SLRM_MAIL {{ lookup('keepass', 'SLRM_MAIL', 'password') }} - env.SLRM_PASSWORD {{ lookup('keepass', 'SLRM_PASSWORD', 'password') }} - env.SLRM_APPSECRET {{ lookup('keepass', 'SLRM_APPSECRET', 'password') }} - name: dnsresponse_192.168.2.1 src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/network/dns/dnsresponse_ - name: dnsresponse_192.168.2.43 diff --git a/host_vars/pve5.grote.lan.yml b/host_vars/pve5.grote.lan.yml index 1eea9992..a2be2186 100644 --- a/host_vars/pve5.grote.lan.yml +++ b/host_vars/pve5.grote.lan.yml @@ -283,13 +283,6 @@ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count - name: ksm_ src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/system/kernel_same_page_merging - - name: apcupsd_ww - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/power/apcupsd_ww - - name: apcupsd_pwr - src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/apcupsd_pwr - config: | - [apcupsd_pwr] - env.ups_model APC-BX950U-GR - name: http_response src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/http/http_response config: | @@ -306,3 +299,5 @@ group root munin_node_disabled_plugins: - name: lvm_ + - name: apcupsd_ww + - name: apcupsd_pwr