Auto Merge of PR 38 - dawarich-misc-fixes

Merged by Trez.One

README.md

@@ -101,7 +101,7 @@
 | pgbackweb | eduardolat/pgbackweb:latest |
 | pgbackweb-db | postgres:16-alpine |
 | plantuml-server | plantuml/plantuml-server:jetty |
-| portainer | portainer/portainer-ce:2.27.0-alpine |
+| portainer | portainer/portainer-ce:alpine |
 | portall | need4swede/portall:latest |
 | postal-smtp | ghcr.io/postalserver/postal:latest |
 | postal-web | ghcr.io/postalserver/postal:latest |

ansible/app-configs/multi-scrobbler_config.json.j2

@@ -25,7 +25,7 @@
       "type": "spotify",
       "enable": true,
       "clients": [],
-      "name": "Spotify",
+      "name": "spotify",
       "data": {
         "clientId": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['YOUR_SPOTIFY_ID'] }}",
         "clientSecret": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['YOUR_SPOTIFY_SECRET'] }}",
@@ -34,7 +34,7 @@
     },
     {
       "type:": "lastfm",
-      "name": "Last.fm",
+      "name": "lastfm",
       "enable": true,
       "data": {
         "apiKey": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LASTFM_API_KEY'] }}",
@@ -44,7 +44,7 @@
     },
     {
       "type": "listenbrainz",
-      "name": "ListenBrainz",
+      "name": "listenBrainz",
       "enable": true,
       "data": {
         "token": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MALOJA_LISTENBRAINZ_TOKEN'] }}",
@@ -53,7 +53,7 @@
     },
     {
       "type": "subsonic",
-      "name": "Navidrome",
+      "name": "navidrome",
       "enable": true,
       "data": {
         "url": "http://navidrome:4533",
@@ -65,7 +65,7 @@
   "clients": [
     {
       "type": "lastfm",
-      "name": "Last.fm Client",
+      "name": "lastFmClient",
       "enable": true,
       "data": {
         "apiKey": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LASTFM_API_KEY'] }}",
@@ -75,7 +75,7 @@
     },
     {
       "type": "listenbrainz",
-      "name": "ListenBrainz Client",
+      "name": ";istenBrainzClient",
       "enable": true,
       "data": {
         "token": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MALOJA_LISTENBRAINZ_TOKEN'] }}",
@@ -85,7 +85,7 @@
     {
       "type": "maloja",
       "enable": true,
-      "name": "Maloja",
+      "name": "maloja",
       "data": {
         "url": "http://maloja:42010",
         "apiKey": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['MALOJA_API_KEY'] }}"

docker-compose.yml

@@ -996,6 +996,21 @@ services:
   dawarich-sidekiq:
     command: ['sidekiq']
     container_name: dawarich-sidekiq
+    depends_on:
+      dawarich-app:
+        condition: service_healthy
+        restart: true
+      dawarich-pg-db:
+        condition: service_healthy
+        restart: true
+      redis:
+        condition: service_started
+        restart: true
+    deploy:
+      resources:
+        limits:
+          cpus: '0.50'    # Limit CPU usage to 50% of one core
+          memory: '4G'    # Limit memory usage to 4GB
     entrypoint: sidekiq-entrypoint.sh
     environment:
       RAILS_ENV: development
@@ -1013,21 +1028,6 @@ services:
       PROMETHEUS_EXPORTER_PORT: 9394
       ENABLE_TELEMETRY: false # More on telemetry: https://dawarich.app/docs/tutorials/telemetry
       SELF_HOSTED: true
-    depends_on:
-      dawarich-app:
-        condition: service_healthy
-        restart: true
-      dawarich-pg-db:
-        condition: service_healthy
-        restart: true
-      redis:
-        condition: service_started
-        restart: true
-    deploy:
-      resources:
-        limits:
-          cpus: '0.50'    # Limit CPU usage to 50% of one core
-          memory: '4G'    # Limit memory usage to 4GB
     healthcheck:
       test: [ "CMD-SHELL", "bundle exec sidekiqmon processes | grep $${HOSTNAME}" ]
       interval: 10s
@@ -4318,7 +4318,7 @@ services:
       LOG_LEVEL: DEBUG
       OLLAMA_URL: http://ollama:11434
       OLLAMA_MODEL: phi3
-      MONGODB_URI: mongodb://mongodb:27017/scrapper
+      MONGODB_URI: mongodb://scraperr:${SCRAPERR_MONGODB_PASSWORD}@mongodb:27017/scraperr?replicaSet=rinoa
       SECRET_KEY: ${SCRAPERR_SECRET_KEY}
       ALGORITHM: HS256
       ACCESS_TOKEN_EXPIRE_MINUTES: 600
@@ -4578,8 +4578,8 @@ services:
       minimum_rating: 4.5
       minimum_votes: 50
       quality_profile_id: 1
-      radarr_address: http://sonarr:8989
+      sonarr_address: http://sonarr:8989
-      radarr_api_key: ${SONARR_API_KEY}
+      sonarr_api_key: ${SONARR_API_KEY}
       root_folder_path: /data/media/shows
       search_for_missing_episodes: true
       sonarr_api_timeout: 120