...

Merged by Trez.One

.gitea/workflows/pr-ansible-config-only-deploy.yml

@@ -115,7 +115,7 @@ jobs:
           notification_title: 'GITEA: PR Merge Successful'
           notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.'
   ansible-config-deploy:
-    name: Deploy via Ansible & Docker Compose
+    name: Ansible Config Deployment
     runs-on: ubuntu-latest
     needs: [pr-merge]
     env:

.gitea/workflows/pr-cloudflare-docker-deploy.yml

@@ -254,7 +254,7 @@ jobs:
           notification_title: 'GITEA: PR Merge Successful'
           notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.'
   ansible-config-docker-compose-deploy:
-    name: Deploy via Ansible & Docker Compose
+    name: Ansible Configs & Docker Compose Deployment
     runs-on: ubuntu-latest
     needs: [pr-merge]
     env:

ansible/app-configs/crowdsec_local-api-credentials.yaml.j2

@@ -0,0 +1,6 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
+
+url: http://0.0.0.0:8080
+login: localhost
+password: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['CROWDSEC_LOCAL_API_KEY'] }}

ansible/app-configs/homepage_settings.yaml.j2

@@ -22,9 +22,9 @@ provider: duckduckgo
 
 layout:
   System Administration:
-    # style: row
+    style: row
-    # columns: 4
+    columns: 3
-    fiveColumns: true
+    # fiveColumns: true
   Infrastructure/App Performance Monitoring:
     style: row
     columns: 3
@@ -45,7 +45,7 @@ layout:
     row: 5
   Personal Services:
     style: row
-    columns: 3
+    columns: 4
   Professional Services:
     style: row
     columns: 3

ansible/app-configs/sabnzbdvpn_sabnzbd.ini.j2

@@ -342,7 +342,7 @@ host = news.newshosting.com
 port = 563
 timeout = 60
 username = thetrezuredone
-password = {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSKD_PASSWORD'] }}
+password = {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSK_USER_PASSWORD'] }}
 connections = 8
 ssl = 1
 ssl_verify = 3

ansible/app-configs/soularr_config.ini.j2

@@ -0,0 +1,76 @@
+{% set vault_addr = 'https://vault.trez.wtf' %}
+{% set secrets_path = 'rinoa-docker/env' %}
+
+[Lidarr]
+api_key = {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['LIDARR_API_KEY'] }}
+host_url = http://lidarr:8686
+#This should be the path mounted in lidarr that points to your slskd download directory.
+#If Lidarr is not running in Docker then this may just be the same dir as Slskd is using below.
+download_dir = /storage
+
+[Slskd]
+#Api key from Slskd. Need to set this up manually. See link to Slskd docs above.
+api_key = {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSKD_API_KEY'] }}
+host_url = http://gluetun:5030
+#Slskd download directory. Should have set it up when installing Slskd.
+download_dir = /app/downloads
+#Removes searches from Slskd after the search finishes.
+delete_searches = False
+#Maximum time (in seconds) that the script will wait for downloads to complete.
+#This is used to prevent the script from running forever due to a stalled download. Defaults to 1 hour.
+stalled_timeout = 3600
+
+[Release Settings]
+#Selects the release with the most common amount of tracks out of all the releases.
+use_most_common_tracknum = True
+allow_multi_disc = True
+#See full list of countries below.
+accepted_countries = Europe,Japan,United Kingdom,United States,[Worldwide],Australia,Canada
+#See full list of formats below.
+accepted_formats = CD,Digital Media,Vinyl
+
+[Search Settings]
+search_timeout = 5000
+maximum_peer_queue = 50
+#Min upload speed in bit/s
+minimum_peer_upload_speed = 0
+#Min match ratio accepted when comparing lidarr track names to soulseek filenames.
+minimum_filename_match_ratio = 0.5
+#Specify the file types you prefer from most to least. As well as their attributes such as bitrate / samplerate / bitdepth.
+#For flacs you can choose the bitdepth/samplerate. And for mp3s the bitrate.
+#If you do not care about the specific quality you can still just put "flac" or "mp3".
+#Soularr will then just look at the filetype and ignore file attributes.
+allowed_filetypes = flac 24/192,flac 16/44.1,flac,mp3 320,mp3
+ignored_users = User1,User2,Fred,Bob
+#Set to False if you only want to search for complete albums
+search_for_tracks = True
+#Set to True if you want to add the artist's name to the beginning of the search for albums
+album_prepend_artist = False
+track_prepend_artist = True
+#Valid search types: all || incrementing_page || first_page
+  #"all" will search for every wanted record everytime soularr is run.
+  #"incrementing_page" will start with the first page and increment to the next on each run.
+  #"first_page" will repeatedly search the first page.
+#If using the search type "first_page" remove_wanted_on_failure should be enabled.
+search_type = incrementing_page
+#How mancy records to grab each run, must be a number between 1 - 2,147,483,647
+number_of_albums_to_grab = 10
+#Unmonitors the album if Soularr can't find it and places it in "failure_list.txt".
+#Failed albums can be re monitored by filtering "Unmonitored" in the Lidarr wanted list.
+remove_wanted_on_failure = False
+#Comma separated list of words that can't be in the title of albums or tracks. Case insensitive.
+title_blacklist = BlacklistWord1,blacklistword2
+#Lidarr source to use for searching. Accepted values are "all", "missing", or "cutoff_unmet". If "all" is selected
+# then both missing and cutoff_unme will be searched. The default value is "missing".
+search_source = missing
+
+[Logging]
+#These options are passed into the logger's basicConfig() method as-is.
+#This means, if you're familiar with Python's logging module, you can configure
+#the logger with options beyond what's listed here by default.
+#For more information on available options  --  https://docs.python.org/3/library/logging.html#logging.basicConfig
+level = INFO
+# Format of log message  --  https://docs.python.org/3/library/logging.html#logrecord-attributes
+format = [%(levelname)s|%(module)s|L%(lineno)d] %(asctime)s: %(message)s
+# Format of datetimes  --  https://docs.python.org/3/library/time.html#time.strftime
+datefmt = %Y-%m-%dT%H:%M:%S%z

ansible/app-configs/soulseek_slskd.yml.j2

@@ -1,238 +1,212 @@
 {% set vault_addr = 'https://vault.trez.wtf' %}
 {% set secrets_path = 'rinoa-docker/env' %}
 
-# debug: false
+directories:
-# remote_configuration: false
+  incomplete: /app/incomplete
-# remote_file_management: false
+  downloads: /app/downloads
-# instance_name: default
+shares:
-# flags:
+  directories:
-#   no_logo: false
+    - /music
-#   no_start: false
+rooms:
-#   no_config_watch: false
+  - '! meow chat :3'
-#   no_connect: false
+  - '#ANUS'
-#   no_share_scan: false
+  - '#CORONAVIRUS'
-#   force_share_scan: false
+  - '#Horrorcore'
-#   no_version_check: false
+  - '#La France'
-#   log_sql: false
+  - '#icilombre-hardcore'
-#   experimental: false
+  - '#polska'
-#   volatile: false
+  - '#vegan'
-#   case_sensitive_reg_ex: false
+  - $$RARE RAP MUSIC$$
-#   legacy_windows_tcp_keepalive: false
+  - ([6)]
-# relay:
+  - +Autism+
-#   enabled: false
+  - +BlackMetal+
-#   mode: controller # controller (default), agent, or debug (for local development)
+  - +HIP_HOP_SCENE_RELEASES+
-#   # controller config is required when running in 'agent' mode
+  - /mu/
-#   # this specifies the relay controller that will be controlling this agent
+  - 60lover
-#   controller:
+  - 60lover v2
-#     address: https://some.site.com:5000
+  - 70 Rare groove Soul Jazz
-#     ignore_certificate_errors: false
+  - 80's 12 Inches & More
-#     api_key: <a 16-255 character string corresponding to one of the controller's 'readwrite' or 'administrator' API keys>
+  - 90's Rare Riddim !!
-#     secret: <a 16-255 character shared secret matching the controller's config for this agent>
+  - 90's emo
-#     downloads: false
+  - <>Electronics Labels<>
-#   # agent config is optional when running in 'controller' mode
+  - ACID
-#   # this specifies all of the agents capable of connecting
+  - ARGENTINA
-#   agents:
+  - "ATLLUMINATI\u201Cawareness"
-#     my_agent:
+  - AUSTRALIA
-#       instance_name: my_agent # make sure the top-level instance_name of the agent matches!
+  - Alcohol
-#       secret: <a 16-255 character string unique to this agent>
+  - Ambient
-#       cidr: 0.0.0.0/0,::/0
+  - Anime
-# permissions:
+  - Audiobooks
-#   file:
+  - Avantgarde
-#     mode: ~ # not for Windows, chmod syntax, e.g. 644, 777. can't escalate beyond umask
+  - BDSM
-# directories:
+  - BLUES BUNKER MUSIC
-#   incomplete: ~
+  - BOB DYLAN ROOM
-#   downloads: ~
+  - BigEdsClassicRock
-# shares:
+  - BigedsSixties
-#   directories:
+  - Blues&Soul
-#     - ~
+  - Bootlegged concerts
-#   filters:
+  - Brasil
-#     - \.ini$
+  - Breakcore
-#     - Thumbs.db$
+  - CHILE
-#     - \.DS_Store$
+  - Canada
-#   cache:
+  - China Room
-#     storage_mode: memory
+  - Chiptunes
-#     workers: 16
+  - Christians
-#     retention: ~ # retain indefinitely (do not automatically re-scan)
+  - Classical
-# rooms:
+  - Come To The Sabbath !
-#   - ~
+  - Communism
-# global:
+  - DEATH METAL CLUB
-#   upload:
+  - Dark Ambient
-#     slots: 20
+  - De Koffie Shop
-#     speed_limit: 1000 # in kibibytes
+  - De Kroeg
-#   limits:
+  - Deathrock
-#     queued:
+  - DieMilitarmusik
-#       files: 500
+  - Disco Classics
-#       megabytes: 5000
+  - Doom Metal
-#     daily:
+  - Doujin Music
-#       files: 1000
+  - Dub Techno
-#       megabytes: 10000
+  - Dubstep
-#       failures: 200
+  - EBM-GOTHIC-INDUSTRIAL
-#     weekly:
+  - EBooks
-#       files: 5000
+  - Emo
-#       megabytes: 50000
+  - Eurodance
-#       failures: 1000
+  - Eurovision Song Contest
-#   download:
+  - Experimental Electronica
-#     slots: 500
+  - FOLK MUSIC
-#     speed_limit: 1000
+  - Free Jazz
-# groups:
+  - Furry
-#   default:
+  - Gay
-#     upload:
+  - Gothic
-#       priority: 500
+  - Greece
-#       strategy: roundrobin
+  - Grindcore
-#       slots: 10
+  - HEE cum eaters 1! !
-#     limits:
+  - HOUSE MUSIC LOVERS (AG)
-#       queued:
+  - Happy Hardcore
-#         files: 150
+  - Hardcore NL
-#         megabytes: 1500
+  - Hardcore/punk
-#       daily: ~ # no daily limits (weekly still apply)
+  - Hip Hop
-#       weekly:
+  - Horror movies
-#         files: 1500
+  - IDM
-#         megabytes: 15000
+  - INDUSTRIAL
-#         failures: 150
+  - IReGGaeGaLaXy
-#   leechers:
+  - Incredibly Strange Music
-#     thresholds:
+  - Israel
-#       files: 1
+  - Jaz (Full CDs)
-#       directories: 1
+  - Jazz
-#     upload:
+  - Jazz-Rock-Fusion-Guitar
-#       priority: 999
+  - Juggalo Family
-#       strategy: roundrobin
+  - Jungle
-#       slots: 1
+  - Korean Music
-#       speed_limit: 100
+  - LANGUAGE EXCHANGE here
-#     limits:
+  - LGBTQ+!!
-#       queued:
+  - Last.fm
-#         files: 15
+  - Linux
-#         megabytes: 150
+  - Lossless Scores
-#       daily:
+  - MOVIES
-#         files: 30
+  - Mac Users
-#         megabytes: 300
+  - Metal
-#         failures: 10
+  - MovieMusic
-#       weekly:
+  - NORWAY
-#         files: 150
+  - New Crystal Vibrations
-#         megabytes: 1500
+  - New Wave
-#         failures: 30
+  - New Zealand
-#   blacklisted:
+  - OLD SKOOL GANGSTA SHIT
-#     members:
+  - OLDSCHOOL 88-94
-#       - <username to blacklist>
+  - OLI SHOTA CUB ROOM!
-#     cidrs:
+  - Original Blues Bunker
-#       - <CIDR to blacklist, e.g. 255.255.255.255/32>
+  - PSYCHEDELIA
-#   user_defined:
+  - PUNK/HARDCORE/GRIND
-#     my_buddies:
+  - Portugal
-#       upload:
+  - Post Punk
-#         priority: 250
+  - Post-Hardcore (modern)
-#         strategy: firstinfirstout
+  - Progressive Rock
-#         slots: 10
+  - Psychedelic/Acid Rock
-#       limits:
+  - Psytrance
-#         queued:
+  - Quebec
-#           files: 1000 # override global default
+  - REGGAE
-#       members:
+  - Rare Music
-#         - alice
+  - RareVHS/DVD/Rips
-#         - bob
+  - Retro Gaming
-# blacklist:
+  - Romania
-#   enabled: true
+  - Room Name
-#   file: <path to file containing CIDRs to blacklist>
+  - SIsk Idiots !!
-# filters:
+  - SLUDGE!
-#   search:
+  - Slovenia
-#     request:
+  - Soundtracks&Scores
-#       - ^.{1,2}$
+  - Spain
-# web:
+  - Stoner HiVe
-#   port: 5030
+  - Stoner Rock
-#   https:
+  - Strange Music
-#     disabled: false
+  - TECHNO, Mixes and Tunes
-#     port: 5031
+  - THC
-#     force: false
+  - Talia
-#     certificate:
+  - The Dangerous Kitchen
-#       pfx: ~
+  - TheScoreZone
-#       password: ~
+  - Thrash Metal
-#   url_base: /
+  - Tinmans Movie Room
-#   content_path: wwwroot
+  - Trip-Hop
-#   logging: false
+  - Ttalian_dancefloor
-#   authentication:
+  - Twee Folks
-#     disabled: false
+  - UK DUB
-#     username: slskd
+  - URIDDIM!!
-#     password: slskd
+  - Ukraine
-#     jwt:
+  - Underground Hiphop
-#       key: ~
+  - VAPORWAVE
-#       ttl: 604800000
+  - Video Game Chat
-#     api_keys:
+  - Vinyl Addicts
-#       my_api_key:
+  - Vocaloid
-#         key: <some example string between 16 and 255 characters>
+  - WHATCDs
-#         role: readonly # readonly, readwrite, administrator
+  - World Music
-#         cidr: 0.0.0.0/0,::/0
+  - Yacht Rock
-# retention:
+  - '[German] [Deutsch]'
-#   transfers:
+  - abbey road Itd
-#     upload:
+  - anime cunny
-#       succeeded: 1440 # 1 day
+  - bleeps&klonks
-#       errored: 30
+  - breakbeat
-#       cancelled: 5
+  - comics
-#     download:
+  - deep house connection
-#       succeeded: 1440 # 1 day
+  - drum'n'bass
-#       errored: 20160 # 2 weeks 
+  - eesti mehed
-#       cancelled: 5
+  - electro
-#   files:
+  - flacfield
-#     complete: 20160 # 2 weeks
+  - food
-#     incomplete: 43200 # 30 days
+  - for Losers
-#   logs: 259200 # 180 days
+  - hungary
-# logger:
+  - indie
-#   disk: false
+  - japanese music
-#   no_color: false
+  - library music
-#   loki: ~
+  - lossless
-# metrics:
+  - minimal music
-#   enabled: false
+  - museek
-#   url: /metrics
+  - noise
-#   authentication:
+  - 'on'
-#     disabled: false
+  - postrock
-#     username: slskd
+  - programming
-#     password: slskd
+  - progressive house
-# feature:
+  - public porn
-#   swagger: false
+  - r/musichoarder
-# soulseek:
+  - ru
-#   address: vps.slsknet.org
+  - shoegaze
-#   port: 2271
+  - tapekvit
-#   username: ~
+  - test
-#   password: ~
+  - trancEaddict
-#   description: |
+  - trivia
-#     A slskd user. https://github.com/slskd/slskd
+  - what.cd
-#   listen_ip_address: 0.0.0.0
+  - what.cd electronic
-#   listen_port: 50300
+  - what.cd-flac
-#   diagnostic_level: Info
+  - '{Italo Disco'
-#   distributed_network:
+web:
-#     disabled: false
+  authentication:
-#     disable_children: false
+    username: slskd
-#     child_limit: 25
+    password: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSKD_WEB_PASSSWORD'] }}
-#     logging: false
+    api_keys:
-#   connection:
+      my_api_key:
-#     timeout:
+        key: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSKD_API_KEY'] }}
-#       connect: 10000
+        role: readwrite0
-#       inactivity: 15000
+        cidr: 0.0.0.0/0,::/0
-#     buffer:
+soulseek:
-#       read: 16384
+  address: vps.slsknet.org
-#       write: 16384
+  port: 2271
-#       transfer: 262144
+  username: Trez.One
-#       write_queue: 250
+  password: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['SLSK_USER_PASSWORD'] }}
-#     proxy:
+  diagnostic_level: Info
-#       enabled: false
-#       address: ~
-#       port: ~
-#       username: ~
-#       password: ~
-# integration:
-#   ftp:
-#     enabled: false
-#     address: ~
-#     port: ~
-#     username: ~
-#     password: ~
-#     remote_path: /
-#     encryption_mode: auto
-#     ignore_certificate_errors: false
-#     overwrite_existing: true
-#     connection_timeout: 5000
-#     retry_attempts: 3
-#   pushbullet:
-#     enabled: false
-#     access_token: ~
-#     notification_prefix: "From slskd:"
-#     notify_on_private_message: true
-#     notify_on_room_mention: true
-#     retry_attempts: 3
-#     cooldown_time: 900000

docker-compose.yml

@@ -362,6 +362,7 @@ services:
     networks:
       bitmagnet:
         ipv4_address: 192.168.55.8
+      default: null
     restart: unless-stopped
     shm_size: 1g
     volumes:
@@ -696,6 +697,7 @@ services:
       - 8908:3000
     restart: always
     volumes:
+      - ${DOCKER_VOLUME_CONFIG}/crowdsec/local-api-credentials.yaml:/etc/crowdsec/local_api_credentials.yaml
       - source: crowdsec-db
         target: /data/
         type: volume
@@ -4497,6 +4499,32 @@ services:
       - ${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
+  soularr-dashboard:
+    container_name: soularr-dashboard
+    depends_on:
+      soularr:
+        condition: service_started
+        required: true
+    environment:
+      PUID: ${PUID}
+      PGID: ${PGID}
+      TZ: ${TZ}
+    labels:
+      homepage.name: Soularr
+      homepage.group: Downloaders
+      homepage.description: Dashboard for monitoring Soularr
+      homepage.href: https://slsk.${MY_TLD}
+      homepage.icon: /icons/soularr.png
+    image: git.trez.wtf/trez.one/soularr-dashboard:v0.1
+    ports:
+      - 18364:8080
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/soularr/dashboard:/app
+      - ${DOCKER_VOLUME_CONFIG}/soularr:/data
+      - ${DOCKER_VOLUME_CONFIG}/soularr/logs:/data/logs
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    working_dir: /app
   soulseek:
     container_name: soulseek
     depends_on:
@@ -4504,11 +4532,6 @@ services:
         condition: service_started
         required: true
         restart: true
-    environment:
-      SLSKD_PASSWORD: ${SLSKD_PASSWORD}
-      SLSKD_REMOTE_CONFIGURATION: true
-      SLSKD_SHARED_DIR: /music
-      SLSKD_USERNAME: slsk
     image: slskd/slskd
     labels:
       homepage.name: Soulseek
@@ -4526,16 +4549,10 @@ services:
     network_mode: service:gluetun
     restart: always
     volumes:
-      - source: ${DOCKER_VOLUME_CONFIG}/soulseek
+      - ${DOCKER_VOLUME_CONFIG}/soulseek:/app
-        target: /app
+      - ${DOCKER_VOLUME_STORAGE}/Audio/Music:/music
-        type: bind
+      - ${DOCKER_VOLUME_STORAGE}/downloads/completed/slsk:/app/downloads/
-        bind:
+      - ${DOCKER_VOLUME_STORAGE}/downloads/incomplete/slsk:/app/incomplete
-          create_host_path: true
-      - source: ${DOCKER_VOLUME_STORAGE}/Audio/Music
-        target: /music
-        type: bind
-        bind:
-          create_host_path: true
   sourcebot:
     container_name: sourcebot
     environment: