diff --git a/ai/docker-compose.yml b/ai/docker-compose.yml index 60478c8..69732dd 100644 --- a/ai/docker-compose.yml +++ b/ai/docker-compose.yml @@ -1,6 +1,6 @@ services: openwebui: - image: ghcr.io/open-webui/open-webui:0.7.2 + image: ghcr.io/open-webui/open-webui:0.8.3 container_name: open-webui restart: always environment: diff --git a/hass/docker-compose.yml b/hass/docker-compose.yml index d6db1e1..a047243 100644 --- a/hass/docker-compose.yml +++ b/hass/docker-compose.yml @@ -58,6 +58,6 @@ services: - /run/udev:/run/udev:ro environment: - TZ=Europe/Amsterdam - image: koenkk/zigbee2mqtt:2.7.1 + image: koenkk/zigbee2mqtt:2.8.0 links: - "mqtt:mqtt" diff --git a/hass/homeassistant/automations.yaml b/hass/homeassistant/automations.yaml index 1c0dc1d..8743ca1 100644 --- a/hass/homeassistant/automations.yaml +++ b/hass/homeassistant/automations.yaml @@ -458,7 +458,11 @@ - condition: numeric_state entity_id: sensor.keller_schreibtisch_switch_0_power above: 0 - below: 74 + below: 60 + - condition: state + entity_id: switch.keller_schreibtisch_switch_0 + state: + - 'on' actions: - action: switch.turn_off metadata: {} diff --git a/hass/zb2mqttdata/configuration.yaml b/hass/zb2mqttdata/configuration.yaml index d7dee26..dc6a84a 100644 --- a/hass/zb2mqttdata/configuration.yaml +++ b/hass/zb2mqttdata/configuration.yaml @@ -69,6 +69,8 @@ devices: friendly_name: Bewegungsmelder Treppe oben 2 '0x000d6f001417c142': friendly_name: Fernbedienung Kühlschrank + '0x18690afffe6a7a2b': + friendly_name: Range Extender homeassistant: enabled: true -version: 4 +version: 5 diff --git a/jellyfin/config/.jellyfin-data b/jellyfin/config/.jellyfin-data new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/config/.jellyfin-config b/jellyfin/config/config/.jellyfin-config new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/config/branding.xml b/jellyfin/config/config/branding.xml new file mode 100644 index 0000000..cedc793 --- /dev/null +++ b/jellyfin/config/config/branding.xml @@ -0,0 +1,17 @@ + + + <form action="https://media.home.thoster.net/sso/OID/start/authentik"> + <button class="raised block emby-button button-submit"> + Sign in with SSO + </button> +</form> + a.raised.emby-button { + padding:0.9em 1em; + color: inherit !important; +} + +.disclaimerContainer{ + display: block; +} + false + \ No newline at end of file diff --git a/jellyfin/config/config/database.xml b/jellyfin/config/config/database.xml new file mode 100644 index 0000000..35ad620 --- /dev/null +++ b/jellyfin/config/config/database.xml @@ -0,0 +1,5 @@ + + + Jellyfin-SQLite + NoLock + \ No newline at end of file diff --git a/jellyfin/config/config/migrations.xml b/jellyfin/config/config/migrations.xml deleted file mode 100644 index 9521dfe..0000000 --- a/jellyfin/config/config/migrations.xml +++ /dev/null @@ -1,281 +0,0 @@ - - - - - 9b354818-94d5-4b68-ac49-e35cb85f9d84 - CreateNetworkConfiguration - - - a6dcacf4-c057-4ef9-80d3-61cef9ddb4f0 - MigrateMusicBrainzTimeout - - - 4fb5c950-1991-11ee-9b4b-0800200c9a66 - MigrateNetworkConfiguration - - - a8e61960-7726-4450-8f3d-82c12daabbcb - MigrateEncodingOptions - - - 4124c2cd-e939-4ffb-9be9-9b311c413638 - DisableTranscodingThrottling - - - ef103419-8451-40d8-9f34-d1a8e93a1679 - CreateLoggingConfigHeirarchy - - - 3793eb59-bc8c-456c-8b9f-bd5a62a42978 - MigrateActivityLogDatabase - - - acbe17b7-8435-4a83-8b64-6fcf162cb9bd - RemoveDuplicateExtras - - - 5c4b82a2-f053-4009-bd05-b6fcad82f14c - MigrateUserDatabase - - - 06387815-c3cc-421f-a888-fb5f9992bea8 - MigrateDisplayPreferencesDatabase - - - a81f75e0-8f43-416f-a5e8-516ccab4d8cc - RemoveDownloadImagesInAdvance - - - 5bd72f41-e6f3-4f60-90aa-09869abe0e22 - MigrateAuthenticationDatabase - - - 615dfa9e-2497-4dbb-a472-61938b752c5b - FixPlaylistOwner - - - d34bfc33-5d2e-4790-8085-069ef6eecb4e - MigrateRatingLevels - - - cf6fabc2-9fbe-4933-84a5-ffe52ef22a58 - FixAudioData - - - 96c156a2-7a13-4b3b-a8b8-fb80c94d20c0 - RemoveDuplicatePlaylistChildren - - - eb58ebee-9514-4b9b-8225-12e1a40020df - AddDefaultPluginRepository - - - 5f86e7f6-d966-4c77-849d-7a7b40b68c4e - ReaddDefaultPluginRepository - - - 34a1a1c4-5572-418e-a2f8-32cdfe2668e8 - AddDefaultCastReceivers - - - 852816e0-2712-49a9-9240-c6fc5fcad1a8 - UpdateDefaultPluginRepository10.9 - - - 4ef123d5-8eff-4b0b-869d-3aed07a60e1b - MoveTrickplayFiles - - - 9b354818-94d5-4b68-ac49-e35cb85f9d84 - CreateNetworkConfiguration - - - a6dcacf4-c057-4ef9-80d3-61cef9ddb4f0 - MigrateMusicBrainzTimeout - - - 4fb5c950-1991-11ee-9b4b-0800200c9a66 - MigrateNetworkConfiguration - - - a8e61960-7726-4450-8f3d-82c12daabbcb - MigrateEncodingOptions - - - 4124c2cd-e939-4ffb-9be9-9b311c413638 - DisableTranscodingThrottling - - - ef103419-8451-40d8-9f34-d1a8e93a1679 - CreateLoggingConfigHeirarchy - - - 3793eb59-bc8c-456c-8b9f-bd5a62a42978 - MigrateActivityLogDatabase - - - acbe17b7-8435-4a83-8b64-6fcf162cb9bd - RemoveDuplicateExtras - - - 5c4b82a2-f053-4009-bd05-b6fcad82f14c - MigrateUserDatabase - - - 06387815-c3cc-421f-a888-fb5f9992bea8 - MigrateDisplayPreferencesDatabase - - - a81f75e0-8f43-416f-a5e8-516ccab4d8cc - RemoveDownloadImagesInAdvance - - - 5bd72f41-e6f3-4f60-90aa-09869abe0e22 - MigrateAuthenticationDatabase - - - 615dfa9e-2497-4dbb-a472-61938b752c5b - FixPlaylistOwner - - - d34bfc33-5d2e-4790-8085-069ef6eecb4e - MigrateRatingLevels - - - cf6fabc2-9fbe-4933-84a5-ffe52ef22a58 - FixAudioData - - - 96c156a2-7a13-4b3b-a8b8-fb80c94d20c0 - RemoveDuplicatePlaylistChildren - - - 9b354818-94d5-4b68-ac49-e35cb85f9d84 - CreateNetworkConfiguration - - - a6dcacf4-c057-4ef9-80d3-61cef9ddb4f0 - MigrateMusicBrainzTimeout - - - 4fb5c950-1991-11ee-9b4b-0800200c9a66 - MigrateNetworkConfiguration - - - a8e61960-7726-4450-8f3d-82c12daabbcb - MigrateEncodingOptions - - - 4124c2cd-e939-4ffb-9be9-9b311c413638 - DisableTranscodingThrottling - - - ef103419-8451-40d8-9f34-d1a8e93a1679 - CreateLoggingConfigHeirarchy - - - 3793eb59-bc8c-456c-8b9f-bd5a62a42978 - MigrateActivityLogDatabase - - - acbe17b7-8435-4a83-8b64-6fcf162cb9bd - RemoveDuplicateExtras - - - 5c4b82a2-f053-4009-bd05-b6fcad82f14c - MigrateUserDatabase - - - 06387815-c3cc-421f-a888-fb5f9992bea8 - MigrateDisplayPreferencesDatabase - - - a81f75e0-8f43-416f-a5e8-516ccab4d8cc - RemoveDownloadImagesInAdvance - - - 5bd72f41-e6f3-4f60-90aa-09869abe0e22 - MigrateAuthenticationDatabase - - - 615dfa9e-2497-4dbb-a472-61938b752c5b - FixPlaylistOwner - - - d34bfc33-5d2e-4790-8085-069ef6eecb4e - MigrateRatingLevels - - - cf6fabc2-9fbe-4933-84a5-ffe52ef22a58 - FixAudioData - - - 96c156a2-7a13-4b3b-a8b8-fb80c94d20c0 - RemoveDuplicatePlaylistChildren - - - 9b354818-94d5-4b68-ac49-e35cb85f9d84 - CreateNetworkConfiguration - - - a6dcacf4-c057-4ef9-80d3-61cef9ddb4f0 - MigrateMusicBrainzTimeout - - - 4fb5c950-1991-11ee-9b4b-0800200c9a66 - MigrateNetworkConfiguration - - - a8e61960-7726-4450-8f3d-82c12daabbcb - MigrateEncodingOptions - - - 4124c2cd-e939-4ffb-9be9-9b311c413638 - DisableTranscodingThrottling - - - ef103419-8451-40d8-9f34-d1a8e93a1679 - CreateLoggingConfigHeirarchy - - - 3793eb59-bc8c-456c-8b9f-bd5a62a42978 - MigrateActivityLogDatabase - - - acbe17b7-8435-4a83-8b64-6fcf162cb9bd - RemoveDuplicateExtras - - - 5c4b82a2-f053-4009-bd05-b6fcad82f14c - MigrateUserDatabase - - - 06387815-c3cc-421f-a888-fb5f9992bea8 - MigrateDisplayPreferencesDatabase - - - a81f75e0-8f43-416f-a5e8-516ccab4d8cc - RemoveDownloadImagesInAdvance - - - 5bd72f41-e6f3-4f60-90aa-09869abe0e22 - MigrateAuthenticationDatabase - - - 615dfa9e-2497-4dbb-a472-61938b752c5b - FixPlaylistOwner - - - d34bfc33-5d2e-4790-8085-069ef6eecb4e - MigrateRatingLevels - - - cf6fabc2-9fbe-4933-84a5-ffe52ef22a58 - FixAudioData - - - 96c156a2-7a13-4b3b-a8b8-fb80c94d20c0 - RemoveDuplicatePlaylistChildren - - - \ No newline at end of file diff --git a/jellyfin/config/config/network.xml b/jellyfin/config/config/network.xml index 5eef56b..afdd283 100644 --- a/jellyfin/config/config/network.xml +++ b/jellyfin/config/config/network.xml @@ -3,20 +3,23 @@ false false - - 8096 8920 8096 8920 true - false true false true - + + 192.168.178.0/24 + 172.16.0.0/12 + 10.0.0.0/8 + - + + 192.168.178.118 + true veth diff --git a/jellyfin/config/config/system.xml b/jellyfin/config/config/system.xml index 48db66f..0691749 100644 --- a/jellyfin/config/config/system.xml +++ b/jellyfin/config/config/system.xml @@ -38,6 +38,7 @@ 0 60 30 + 400 Legacy @@ -137,7 +138,8 @@ 0 false - false + false + false true @@ -163,7 +165,6 @@ 30 0 0 - true true 0 MatchSource @@ -194,4 +195,5 @@ 90 1 + true \ No newline at end of file diff --git a/jellyfin/config/root/.jellyfin-root b/jellyfin/config/root/.jellyfin-root new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Bücher/books.collection b/jellyfin/config/root/default/Bücher/books.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Bücher/ebooks.mblink b/jellyfin/config/root/default/Bücher/ebooks.mblink new file mode 100644 index 0000000..6e65ba3 --- /dev/null +++ b/jellyfin/config/root/default/Bücher/ebooks.mblink @@ -0,0 +1 @@ +/ebooks \ No newline at end of file diff --git a/jellyfin/config/root/default/Bücher/options.xml b/jellyfin/config/root/default/Bücher/options.xml new file mode 100644 index 0000000..3a6b7b5 --- /dev/null +++ b/jellyfin/config/root/default/Bücher/options.xml @@ -0,0 +1,49 @@ + + + true + true + true + true + false + false + false + false + + + /ebooks + + + false + false + false + false + false + 0 + + + Specials + + + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Hörspiele Hörbücher/hoerspiele.mblink b/jellyfin/config/root/default/Hörspiele Hörbücher/hoerspiele.mblink new file mode 100644 index 0000000..15a5ae4 --- /dev/null +++ b/jellyfin/config/root/default/Hörspiele Hörbücher/hoerspiele.mblink @@ -0,0 +1 @@ +/music/hoerspiele \ No newline at end of file diff --git a/jellyfin/config/root/default/Hörspiele Hörbücher/music.collection b/jellyfin/config/root/default/Hörspiele Hörbücher/music.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Hörspiele Hörbücher/options.xml b/jellyfin/config/root/default/Hörspiele Hörbücher/options.xml new file mode 100644 index 0000000..9cbddcc --- /dev/null +++ b/jellyfin/config/root/default/Hörspiele Hörbücher/options.xml @@ -0,0 +1,112 @@ + + + true + true + true + true + false + false + false + false + + + /music/hoerspiele + + + false + false + false + false + false + 0 + + + Specials + + + + Nfo + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + + MusicArtist + + MusicBrainz + + + TheAudioDB + MusicBrainz + + + TheAudioDB + + + TheAudioDB + + + + + MusicAlbum + + MusicBrainz + + + MusicBrainz + TheAudioDB + + + TheAudioDB + + + TheAudioDB + + + + + Audio + + + + Image Extractor + + + Image Extractor + + + + + MusicVideo + + + + Embedded Image Extractor + Screen Grabber + + + Embedded Image Extractor + Screen Grabber + + + + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Kinderprogramm/kids shows.mblink b/jellyfin/config/root/default/Kinderprogramm/kids shows.mblink new file mode 100644 index 0000000..0b02937 --- /dev/null +++ b/jellyfin/config/root/default/Kinderprogramm/kids shows.mblink @@ -0,0 +1 @@ +/video/kids shows \ No newline at end of file diff --git a/jellyfin/config/root/default/Kinderprogramm/options.xml b/jellyfin/config/root/default/Kinderprogramm/options.xml new file mode 100644 index 0000000..ac4c44e --- /dev/null +++ b/jellyfin/config/root/default/Kinderprogramm/options.xml @@ -0,0 +1,110 @@ + + + true + true + true + true + false + false + false + false + + + /video/kids shows + + + false + false + false + false + false + 0 + + + Specials + + + + Nfo + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + + Series + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + + + TheMovieDb + + + TheMovieDb + + + + + Season + + TheMovieDb + + + TheMovieDb + + + TheMovieDb + + + TheMovieDb + + + + + Episode + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + Embedded Image Extractor + Screen Grabber + + + TheMovieDb + The Open Movie Database + Embedded Image Extractor + Screen Grabber + + + + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Kinderprogramm/tvshows.collection b/jellyfin/config/root/default/Kinderprogramm/tvshows.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Movies/movie.mblink b/jellyfin/config/root/default/Movies/movie.mblink new file mode 100644 index 0000000..2a642ec --- /dev/null +++ b/jellyfin/config/root/default/Movies/movie.mblink @@ -0,0 +1 @@ +/video/movie \ No newline at end of file diff --git a/jellyfin/config/root/default/Movies/movies.collection b/jellyfin/config/root/default/Movies/movies.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Movies/options.xml b/jellyfin/config/root/default/Movies/options.xml new file mode 100644 index 0000000..0f57f28 --- /dev/null +++ b/jellyfin/config/root/default/Movies/options.xml @@ -0,0 +1,49 @@ + + + true + true + true + true + false + false + false + false + + + /video/movie + + + false + false + false + false + false + 0 + + + Specials + + + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Musik/alben.mblink b/jellyfin/config/root/default/Musik/alben.mblink new file mode 100644 index 0000000..374e862 --- /dev/null +++ b/jellyfin/config/root/default/Musik/alben.mblink @@ -0,0 +1 @@ +/music/alben \ No newline at end of file diff --git a/jellyfin/config/root/default/Musik/compilations.mblink b/jellyfin/config/root/default/Musik/compilations.mblink new file mode 100644 index 0000000..a7cca93 --- /dev/null +++ b/jellyfin/config/root/default/Musik/compilations.mblink @@ -0,0 +1 @@ +/music/compilations \ No newline at end of file diff --git a/jellyfin/config/root/default/Musik/music.collection b/jellyfin/config/root/default/Musik/music.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/config/root/default/Musik/options.xml b/jellyfin/config/root/default/Musik/options.xml new file mode 100644 index 0000000..cdbb239 --- /dev/null +++ b/jellyfin/config/root/default/Musik/options.xml @@ -0,0 +1,115 @@ + + + true + true + true + true + false + false + false + false + + + /music/alben + + + /music/compilations + + + false + false + false + false + false + 0 + + + Specials + + + + Nfo + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + + MusicArtist + + MusicBrainz + + + TheAudioDB + MusicBrainz + + + TheAudioDB + + + TheAudioDB + + + + + MusicAlbum + + MusicBrainz + + + MusicBrainz + TheAudioDB + + + TheAudioDB + + + TheAudioDB + + + + + Audio + + + + Image Extractor + + + Image Extractor + + + + + MusicVideo + + + + Embedded Image Extractor + Screen Grabber + + + Embedded Image Extractor + Screen Grabber + + + + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Shows/TV show.mblink b/jellyfin/config/root/default/Shows/TV show.mblink new file mode 100644 index 0000000..c2db7b1 --- /dev/null +++ b/jellyfin/config/root/default/Shows/TV show.mblink @@ -0,0 +1 @@ +/video/TV show \ No newline at end of file diff --git a/jellyfin/config/root/default/Shows/options.xml b/jellyfin/config/root/default/Shows/options.xml new file mode 100644 index 0000000..698bb83 --- /dev/null +++ b/jellyfin/config/root/default/Shows/options.xml @@ -0,0 +1,110 @@ + + + true + true + true + true + false + false + false + false + + + /video/TV show + + + false + false + false + false + false + 0 + + + Specials + + + + Nfo + + + + + + false + false + + true + true + + + + / + | + ; + \ + + + false + AllowAll + + + Series + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + + + TheMovieDb + + + TheMovieDb + + + + + Season + + TheMovieDb + + + TheMovieDb + + + TheMovieDb + + + TheMovieDb + + + + + Episode + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + + + TheMovieDb + The Open Movie Database + Embedded Image Extractor + Screen Grabber + + + TheMovieDb + The Open Movie Database + Embedded Image Extractor + Screen Grabber + + + + + \ No newline at end of file diff --git a/jellyfin/config/root/default/Shows/tvshows.collection b/jellyfin/config/root/default/Shows/tvshows.collection new file mode 100644 index 0000000..e69de29 diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml index dac7660..6cf93ff 100644 --- a/jellyfin/docker-compose.yml +++ b/jellyfin/docker-compose.yml @@ -1,6 +1,6 @@ services: jellyfin: - image: jellyfin/jellyfin:10.10.7 + image: jellyfin/jellyfin:10.11.6 container_name: jellyfin user: 1000:1000 # network_mode: 'host' diff --git a/traefik/conf.d/rules.yml b/traefik/conf.d/rules.yml index 6143c02..dfc548b 100644 --- a/traefik/conf.d/rules.yml +++ b/traefik/conf.d/rules.yml @@ -36,6 +36,14 @@ http: service: jellyfin-service tls: certResolver: letsencrypt + media-router-auth: + entryPoints: + - "websecure" + rule: "Host(`media.home.thoster.net`) && PathPrefix(`/outpost.goauthentik.io/`)" + priority: 15 + service: authentik + tls: + certResolver: letsencrypt paperless-router-auth: entryPoints: - "websecure"