Typo fix for Soularr.

Merged by Trez.One

.gitea/workflows/deployment.yml

@@ -21,7 +21,7 @@ jobs:
             -X 'GET' \
             -H 'Accept: application/json' \
             -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
-            -s | jq '{index: .number, state: .state}')
+            -sS | jq '{index: .number, state: .state}')
           pr_state=$(echo ${pr_check} | jq -r '.state')
 
       - name: Create PR
@@ -125,4 +125,4 @@ jobs:
           echo "Merging PR..."
           tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ gitea.ref_name }} | awk -F, '{print $1}' | sed -e 's|"||g')
-          tea pr m --repo ${{ github.repository }} --title "Auto Merge of ${{ gitea.ref_name }}" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}
+          tea pr m --repo ${{ github.repository }} --title "${{ github.ref_name }} Auto Merge" --message "Merged by ${{ gitea.actor }}" --output table ${pr_index}

README.md

@@ -1,6 +1,8 @@
 # List of Services
 
-```
+```json
+~> yq '.services | to_entries | map({service: .key, image: .value.image})' docker-compose.yml
+
 [
   {
     "service": "actual_server",

docker-compose.yml

@@ -342,7 +342,7 @@ services:
       homepage.group: Downloaders
       homepage.name: Bitmagnet
       homepage.href: https://btmag.${MY_TLD}
-      homepage.icon: /icons/bitmagnet.svg
+      homepage.icon: sh-bitmagnet.png
       homepage.description: Torrent indexer, DHT crawler, search engine, & content classifier
       homepage.widget.type: gluetun
       homepage.widget.url: http://gluetun:8000
@@ -503,6 +503,56 @@ services:
     networks:
       default: null
     restart: unless-stopped
+  bunkerweb:
+    container_name: bunkerweb
+    environment:
+      SERVER_NAME: www.trez.wtf
+      API_WHITELIST_IP: 172.18.0.0/16 192.168.1.0/24
+      USE_REAL_IP: yes
+      REAL_IP_FROM: 172.18.0.0/16
+      REAL_IP_HEADER: X-Forwarded-For
+    expose:
+      - 8080
+      - 8443
+    image: bunkerity/bunkerweb:latest
+    labels:
+      bunkerweb.INSTANCE: yes
+    restart: unless-stopped
+  bunkerweb-scheduler:
+    container_name: bunkerweb-scheduler
+    depends_on:
+      - bunkerweb
+      - docker-socket-proxy
+    environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
+    image: bunkerity/bunkerweb-scheduler:latest
+    restart: unless-stopped
+    volumes:
+      - bunkerweb-data:/data
+  bunkerweb-ui:
+    container_name: bunkerweb-ui
+    depends_on:
+      - bunkerweb
+      - docker-socket-proxy
+    environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
+    expose:
+      - 7000
+    image: bunkerity/bunkerweb-ui:latest
+    labels:
+      homepage.group: Privacy/Security
+      homepage.name: Bunkerweb
+      homepage.href: https://bunker.${MY_TLD}
+      homepage.icon: bunker.svg
+      homepage.description: Next-gen WAF
+      swag: enable
+      swag_port: 7000
+      swag_url: bunker.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://bunker.${MY_TLD}
+    restart: unless-stopped
+    volumes:
+      - bunkerweb-data:/data
   castopod:
     container_name: castopod
     depends_on:
@@ -744,7 +794,7 @@ services:
       homepage.group: System Administration
       homepage.name: Dagu
       homepage.href: https://cron.${MY_TLD}
-      homepage.icon: /icons/dagu.png
+      homepage.icon: sh-dagu.png
       homepage.description: Cron alternative using DAGs (Directed Acyclic Graphs)
       swag: enable
       swag_port: 8080
@@ -983,7 +1033,7 @@ services:
     labels:
       homepage.group: Lifestyle
       homepage.name: Fasten
-      homepage.icon: /icons/fastenhealth.png
+      homepage.icon: sh-fasten-health.svg
       homepage.href: http://health.${MY_TLD}
       homepage.description: Open-source, self-hosted, personal/family electronic medical record aggregator
       swag: enable
@@ -1104,7 +1154,7 @@ services:
       GITEA__mailer__SMTP_PORT: 25
       GITEA__mailer__USER: ${POSTAL_SMTP_AUTH_USER}
       GITEA__mailer__PASSWD: ${POSTAL_SMTP_AUTH_PASSWORD}
-    image: gitea/gitea:1.22.2
+    image: gitea/gitea:1.22.6
     labels:
       homepage.group: Code/DevOps
       homepage.name: Gitea
@@ -1187,7 +1237,7 @@ services:
       homepage.description: Private Code Gists
       homepage.group: Code/DevOps
       homepage.href: https://gist.trez.wtf
-      homepage.icon: /icons/opengist.svg
+      homepage.icon: sh-opengist.svg
       homepage.name: Opengist
       swag: enable
       swag.uptime-kuma.enabled: "true"
@@ -1398,7 +1448,7 @@ services:
       homepage.name: Grafana Alloy
       homepage.description: Agent for metric/log/trace/profile collection and writing
       homepage.href: http://192.168.1.254:12345
-      homepage.icon: /icons/grafana-alloy.svg
+      homepage.icon: sh-grafana-alloy.svg
     networks:
       default: null
     ports:
@@ -1590,6 +1640,31 @@ services:
         type: bind
         bind:
           create_host_path: true
+  guacamole:
+    container_name: guacamole
+    environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
+      EXTENSIONS: 'auth-totp'
+      TZ: ${TZ}
+    image: flcontainers/guacamole:latest
+    labels:
+      homepage.group: System Administration
+      homepage.name: Guacamole
+      homepage.description: Client-less remote desktop gateway
+      homepage.href: https://guac.trez.wtf
+      homepage.icon: guacamole.svg
+      swag: enable
+      swag_proto: http
+      swag_port: 8080
+      swag_url: guac.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://guac.${MY_TLD}
+    ports:
+      - 62173:8080
+    restart: always
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/guacamole/:/config
+      - /etc/localtime:/etc/localtime:ro
   homepage:
     container_name: homepage
     image: ghcr.io/gethomepage/homepage:latest
@@ -2788,7 +2863,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: Lidify
       homepage.href: https://lidify.${MY_TLD}
-      homepage.icon: /icons/lidify.png
+      homepage.icon: sh-lidify.png
       homepage.description: Music Discovery a la Last.fm, Spotify, Pandora, etc.
       swag: enable
       swag_auth: authelia
@@ -2983,58 +3058,6 @@ services:
         type: bind
         bind:
           create_host_path: true
-  mastodon:
-    container_name: mastodon
-    environment:
-      PUID: ${PUID}
-      PGID: ${PGID}
-      TZ: ${TZ}
-      LOCAL_DOMAIN: trez.wtf
-      REDIS_HOST: redis
-      REDIS_PORT: 6379
-      DB_HOST: mastodon-pg-db
-      DB_USER: mastodon
-      DB_NAME: mastodon
-      DB_PASS: ${MASTODON_PG_DB_PASSWORD}
-      DB_PORT: 5432
-      ES_ENABLED: false
-      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: 
-      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: 
-      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: 
-      SECRET_KEY_BASE: 
-      OTP_SECRET: 
-      VAPID_PRIVATE_KEY: 
-      VAPID_PUBLIC_KEY: 
-      SMTP_SERVER: postal-smtp
-      SMTP_PORT: 25
-      SMTP_LOGIN: ${POSTAL_SMTP_AUTH_USER}
-      SMTP_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD}
-      SMTP_FROM_ADDRESS: noreply@trez.wtf
-      S3_ENABLED: true
-      S3_BUCKET: mastodon
-      AWS_ACCESS_KEY_ID: ${MASTODON_MINIO_ACCESS_KEY}
-      AWS_SECRET_ACCESS_KEY: ${MASTODON_MINIO_SECRET_KEY}
-    image: lscr.io/linuxserver/mastodon:latest
-    labels:
-      swag: enable
-      swag_proto: http
-      swag_port: 5678
-      swag_url: mastodon.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://mastodon.${MY_TLD}
-      homepage.group: Social
-      homepage.name: Mastodon
-      homepage.href: https://mastodon.${MY_TLD}
-      homepage.icon: mastodon.svg
-      homepage.description: Open-source social network
-      homepage.widget.type: mastodon
-      homepage.widget.url: http://mastodon
-    ports:
-      - 9044:80
-      - 3444:443
-    restart: unless-stopped
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/mastodon:/config
   mastodon-pg-db:
     container_name: mastodon-pg-db
     environment:
@@ -3053,29 +3076,6 @@ services:
     restart: always
     volumes:
       - mastodon-pg-db:/var/lib/postgresql/data    
-  meshcentral:
-    container_name: meshcentral
-    image: ghcr.io/ylianst/meshcentral:master
-    labels:
-      homepage.group: System Administration
-      homepage.name: MeshCentral
-      homepage.href: https://mesh.${MY_TLD}
-      homepage.icon: meshcentral.png
-      homepage.description: 
-      swag: enable
-      swag_proto: http
-      swag_port: 80
-      swag_url: mesh.${MY_TLD}
-    ports:
-      - 46717:80 # HTTP
-      - 61741:443 # HTTPS
-      - 42865:4433 # AMT (Optional)
-    restart: unless-stopped
-    volumes:
-      - meshcentral-data:/opt/meshcentral/meshcentral-data
-      - meshcentral-user_files:/opt/meshcentral/meshcentral-files
-      - meshcentral-backup:/opt/meshcentral/meshcentral-backups
-      - meshcentral-web:/opt/meshcentral/meshcentral-web
   minio:
     command: server --console-address ":9090" /mnt/data
     container_name: minio
@@ -3149,7 +3149,7 @@ services:
       homepage.group: Media Library
       homepage.name: Multi-Scrobbler
       homepage.href: http://192.168.1.254:9078
-      homepage.icon: /icons/multi-scrobbler.png
+      homepage.icon: sh-multi-scrobbler.svg
       homepage.description: JS App for scrobbling/recording play history from/to multiple sources
     networks:
       default: null
@@ -3588,7 +3588,7 @@ services:
       homepage.group: System Administration
       homepage.name: Postal
       homepage.href: https://post.${MY_TLD}
-      homepage.icon: /icons/postal.png
+      homepage.icon: sh-postal.svg
       homepage.description: OSS Mail delivery platform
     networks:
       default: null
@@ -3692,7 +3692,7 @@ services:
       homepage.group: Servarr Stack
       homepage.name: RadaRec
       homepage.href: https://radarec.${MY_TLD}
-      homepage.icon: /icons/radarec.png
+      homepage.icon: sh-radarec.png
       homepage.description: Movie discovery based on library/tastes
       swag: enable
       swag_proto: http
@@ -4432,6 +4432,24 @@ services:
         source: /etc/localtime
         target: /etc/localtime
         type: bind
+  soularr:
+    container_name: soularr
+    depends_on:
+      - lidarr
+      - soulseek
+    environment: 
+      PUID: ${PUID}
+      PGID: ${PGID}
+      TZ: ${TZ}
+      #Script interval in seconds
+      SCRIPT_INTERVAL: 300
+    image: mrusse08/soularr:latest
+    restart: unless-stopped
+    volumes:
+      #"You can set /downloads to whatever you want but will then need to change the Slskd download dir in your config file"
+      - ${DOCKER_VOLUME_STORAGE}/downloads:/downloads
+      #Select where you are storing your config file. Leave "/data" since thats where the script expects the config file to be
+      - ${DOCKER_VOLUME_CONFIG}/soularr:/data
   soulseek:
     container_name: soulseek
     depends_on:
@@ -6980,6 +6998,8 @@ volumes:
     name: authelia-pg-db
   bitmagnet-pg-db:
     name: bitmagnet-pg-db
+  bunkerweb-data:
+    name: bunkerweb-data
   castopod-media:
     name: castopod-media
   crowdsec-config:
@@ -7034,10 +7054,6 @@ volumes:
     name: localai_data
   mastodon-pg-db:
     name: mastodon-pg-db
-  meshcentral-data:
-  meshcentral-user_files:
-  meshcentral-backup:
-  meshcentral-web:
   mongodb_config:
     name: mongo1_config
   mongodb_data: