Typo in Scraperr.

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/homepage_settings.yaml.j2

@@ -26,10 +26,10 @@ layout:
     columns: 4
   Infrastructure/App Performance Monitoring:
     style: row
-    columns: 4
+    columns: 3
   Code/DevOps:
     style: row
-    columns: 4
+    columns: 3
   Social:
     style: row
     columns: 4
@@ -41,7 +41,7 @@ layout:
     columns: 5
   Privacy/Security:
     style: row
-    columns: 3
+    columns: 5
   Personal/Professional Services:
     style: row
     columns: 5
@@ -53,4 +53,4 @@ layout:
     columns: 2
   Media Library:
     style: row
-    columns: 3
+    columns: 4

ansible/app-configs/loggifly_config.yaml.j2

@@ -1,5 +1,8 @@
 containers:
-
+  immich-server:
+    action_keywords:
+      - restart:
+          regex: 'ADVICE:.*error'
 global_keywords:
   keywords:
     - panic
@@ -8,7 +11,6 @@ global_keywords:
 notifications:
   apprise:
     url: gotify://gotify/{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['APPRISE_GOTIFY_TOKEN'] }}    # Any Apprise-compatible URL (https://github.com/caronc/apprise/wiki)
-
 # settings are optional because they all have default values
 settings:
   log_level: INFO               # DEBUG, INFO, WARNING, ERROR

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

@@ -64,44 +64,21 @@ services:
       homepage.widget.url: http://adguard:80
       homepage.widget.username: admin
       homepage.widget.password: ${ADGUARD_PASSWORD}
-    networks:
-      default: null
     ports:
+      - "192.168.1.254:53:53/udp"
+      - 53:53/tcp
       - 3001:3000
       - 446:443
       - 8008:80
       - 853:853
       - 67:67
       - 688:68
-      - 53:53
     restart: unless-stopped
     volumes:
-      - bind:
+      - /etc/localtime:/etc/localtime:ro
-          create_host_path: true
+      - ${DOCKER_VOLUME_CONFIG}/adguard/work:/opt/adguardhome/work
-        read_only: true
+      - ${DOCKER_VOLUME_CONFIG}/adguard/conf:/opt/adguardhome/conf
-        source: /etc/localtime
+      - ${DOCKER_VOLUME_CONFIG}/swag/etc/letsencrypt/:/etc/ssl/certs
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/adguard/work
-        target: /opt/adguardhome/work
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/adguard/conf
-        target: /opt/adguardhome/conf
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
-      - source: ${DOCKER_VOLUME_CONFIG}/swag/etc/letsencrypt/archive/trez.wtf
-        target: /etc/ssl/certs
-        type: bind
-        bind:
-          create_host_path: true
   apprise-api:
     container_name: apprise-api
     environment:
@@ -109,6 +86,7 @@ services:
       PGID: $[PGID]
       TZ: ${TZ}
       APPRISE_ATTACH_SIZE: 500
+      APPRISE_STATEFUL_MODE: simple
     image: lscr.io/linuxserver/apprise-api:latest
     labels:
       homepage.group: Infrastructure/App Performance Monitoring
@@ -120,7 +98,7 @@ services:
       - 54995:8000
     restart: unless-stopped
     volumes:
-      - ${DOCKER_VOLUME_CONFIG}/apprise:/etc/apprise
+      - ${DOCKER_VOLUME_CONFIG}/apprise/config:/etc/apprise
       - ${DOCKER_VOLUME_CONFIG}/apprise/attachments:/attachments #optional
   archivebox:
     container_name: archivebox
@@ -963,6 +941,7 @@ services:
       PROMETHEUS_EXPORTER_HOST: 0.0.0.0
       PROMETHEUS_EXPORTER_PORT: 9394
       ENABLE_TELEMETRY: false # More on telemetry: https://dawarich.app/docs/tutorials/telemetry
+      SELF_HOSTED: true
     healthcheck:
       test: [ "CMD-SHELL", "wget -qO - http://127.0.0.1:3000/api/v1/health | grep -q '\"status\"\\s*:\\s*\"ok\"'" ]
       interval: 10s
@@ -1017,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
@@ -1033,21 +1027,7 @@ services:
       PROMETHEUS_EXPORTER_HOST: dawarich-app
       PROMETHEUS_EXPORTER_PORT: 9394
       ENABLE_TELEMETRY: false # More on telemetry: https://dawarich.app/docs/tutorials/telemetry
-    depends_on:
+      SELF_HOSTED: true
-      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
@@ -1312,7 +1292,7 @@ services:
       SYSTEM_URL: http://navidrome:4533
       SYSTEM_USERNAME: ${NAVIDROME_USERNAME}
       SYSTEM_PASSWORD: ${NAVIDROME_PASSWORD}
-      DOWNLOAD_DIR: /path/to/music/folder/explo
+      DOWNLOAD_DIR: /downloads
       PLAYLIST_DIR: /playlists
       LISTENBRAINZ_USER: Trez.One
       YOUTUBE_API_KEY: ${YOUTUBE_DATA_API_V3_KEY}
@@ -1334,6 +1314,7 @@ services:
     image: ghcr.io/lumepart/explo:latest
     restart: unless-stopped
     volumes:
+      - ${DOCKER_VOLUME_CONFIG}/explo/local.env:/opt/explo/.env
       - ${DOCKER_VOLUME_STORAGE}/Audio/Explo:/downloads # has to be in the same path you have your music system pointed to (it's recommended to put explo under a subfolder)
       - ${DOCKER_VOLUME_STORAGE}/Audio/Playlists:/playlists
   fastenhealth:
@@ -1826,6 +1807,7 @@ services:
       immich-pg-db:
         condition: service_healthy
         required: true
+        restart: true
       immich-machine-learning:
         condition: service_healthy
         required: true
@@ -3044,7 +3026,7 @@ services:
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ${DOCKER_VOLUME_CONFIG}/loggifly/config.yml:/app/config.yml  # Path to your config file (ignore if you are only using environment variables)
+      - ${DOCKER_VOLUME_CONFIG}/loggifly/config.yaml:/app/config.yaml  # Path to your config file (ignore if you are only using environment variables)
   maloja:
     container_name: maloja
     environment:
@@ -3733,7 +3715,7 @@ services:
     expose:
       - 9000
       - 9443
-    image: portainer/portainer-ce:2.27.0-alpine
+    image: portainer/portainer-ce:alpine
     labels:
       swag: enable
       swag_proto: http
@@ -4304,6 +4286,8 @@ services:
       - run
       - start
     container_name: scraperr
+    depends_on:
+      - scraperr-api
     expose:
       - 3000
     image: jpyles0524/scraperr:latest
@@ -4327,8 +4311,6 @@ services:
       swag.uptime-kuma.enabled: true
       swag.uptime-kuma.monitor.url: https://scrape.${MY_TLD}
       swag.uptime-kuma.monitor.interval: 300
-    networks:
-      default: null
     restart: unless-stopped
   scraperr-api:
     container_name: scraperr-api
@@ -4336,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
@@ -4344,9 +4326,10 @@ services:
     expose:
       - 8000
     image: jpyles0524/scraperr_api:latest
-    networks:
-      default: null
     restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/scraperr:/project/data
+      # - /var/run/docker.sock:/var/run/docker.sock
   scrutiny:
     cap_add:
       - SYS_RAWIO
@@ -4596,8 +4579,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