Compare commits

...

6 Commits

Author SHA1 Message Date
Chris King
31a5e76cee Disable DupFileManager Stash plugin dryrun mode 2025-02-18 01:19:53 -08:00
Chris King
db5394a2c5 Remove logging options from Stash docker-compose.yml so that it uses defaults (journald) 2025-02-18 01:19:18 -08:00
Chris King
e07521a6ae Migrate Seedsync setup to /docker directory
Now able to track and backup all seedsync configs
Add config backups to gitignore for Seedsync
2025-02-18 01:17:53 -08:00
Chris King
8a2240a43e Finish Komodo setup
Add OIDC snippet to Caddyfile
Add komodo to Caddyfile
2025-02-18 01:12:53 -08:00
Chris King
0dcd0c9823 Move Caddy named volumes to bind mounts for backup 2025-02-18 01:10:39 -08:00
Chris King
5ffc709df3 Move Authentik named volumes to bind mounts for backup 2025-02-18 01:10:03 -08:00
15 changed files with 382 additions and 84 deletions

View File

@@ -10,7 +10,7 @@ services:
retries: 5
timeout: 5s
volumes:
- database:/var/lib/postgresql/data
- ./data/postgres:/var/lib/postgresql/data
environment:
POSTGRES_PASSWORD: ${PG_PASS:?database password required}
POSTGRES_USER: ${PG_USER:-authentik}
@@ -28,7 +28,7 @@ services:
retries: 5
timeout: 3s
volumes:
- redis:/data
- ./data/redis:/data
app:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.12.3}
restart: unless-stopped
@@ -90,12 +90,6 @@ services:
redis:
condition: service_healthy
volumes:
database:
driver: local
redis:
driver: local
networks:
proxy-net:
external: true

View File

@@ -92,6 +92,24 @@
}
}
}
(oidc) {
{args[0]}.tremendousturtle.tools {
import ttt-log {args[0]}
import tls
@not_cf header !CF-Connecting-IP
@cf header CF-Connecting-IP *
reverse_proxy @not_cf {args[0]}-app-1:{args[1]} {
header_up X-Real-IP {remote_host}
header_up X-Forwarded-Port {server_port}
}
reverse_proxy @cf {args[0]}-app-1:{args[1]} {
header_up X-Real-IP {http.request.header.CF-Connecting-IP}
header_up X-Forwarded-Port {server_port}
}
}
}
(redirect) {
{args[0]}.tremendousturtle.tools {
import tls
@@ -174,6 +192,9 @@ import authentik dozzle
import authentik tautulli
#import authentik-test stash
# Authentik OIDC Configs
import oidc komodo 9120
stash.tremendousturtle.tools {
import ttt-log stash
import tls

View File

@@ -17,13 +17,9 @@ services:
- ./data/site:/srv
- ./data/logs:/logs
- ./config:/etc/caddy
- caddy_data:/data
- caddy_config:/config
- ./data/caddy_data:/data
- ./data/caddy_config:/config
networks:
proxy-net:
external: true
volumes:
caddy_data:
caddy_config:
external: true

View File

@@ -12,14 +12,14 @@ COMPOSE_KOMODO_IMAGE_TAG=latest
## Note: 🚨 Podman does NOT support local logging driver 🚨. See Podman options here:
## `https://docs.podman.io/en/v4.6.1/markdown/podman-run.1.html#log-driver-driver`
COMPOSE_LOGGING_DRIVER=local # Enable log rotation with the local driver.
COMPOSE_LOGGING_DRIVER=journald # Enable log rotation with the local driver.
## DB credentials - Ignored for Sqlite
DB_USERNAME=admin
DB_PASSWORD=admin
KOMODO_DB_USERNAME=admin
KOMODO_DB_PASSWORD_FILE=/run/secrets/KOMODO_DB_PASSWORD
## Configure a secure passkey to authenticate between Core / Periphery.
PASSKEY=a_random_passkey
KOMODO_PASSKEY_FILE=/run/secrets/KOMODO_PASSKEY
#=-------------------------=#
#= Komodo Core Environment =#
@@ -32,7 +32,7 @@ PASSKEY=a_random_passkey
## Docs: https://docs.docker.com/compose/how-tos/use-secrets/#examples
## Used for Oauth / Webhook url suggestion / Caddy reverse proxy.
KOMODO_HOST=https://demo.komo.do
KOMODO_HOST=https://komodo.tremendousturtle.tools
## Displayed in the browser tab.
KOMODO_TITLE=Komodo
## Create a server matching this address as the "first server".
@@ -45,22 +45,20 @@ KOMODO_DISABLE_CONFIRM_DIALOG=false
## status / container status / system stats / alerting.
## Options: 1-sec, 5-sec, 15-sec, 1-min, 5-min.
## Default: 15-sec
KOMODO_MONITORING_INTERVAL="15-sec"
KOMODO_MONITORING_INTERVAL="5-sec"
## Rate Komodo polls Resources for updates,
## like outdated commit hash.
## Options: 1-min, 5-min, 15-min, 30-min, 1-hr.
## Default: 5-min
KOMODO_RESOURCE_POLL_INTERVAL="5-min"
KOMODO_RESOURCE_POLL_INTERVAL="1-min"
## Used to auth against periphery. Alt: KOMODO_PASSKEY_FILE
KOMODO_PASSKEY=${PASSKEY}
## Used to auth incoming webhooks. Alt: KOMODO_WEBHOOK_SECRET_FILE
KOMODO_WEBHOOK_SECRET=a_random_secret
KOMODO_WEBHOOK_SECRET_FILE=/run/secrets/KOMODO_WEBHOOK_SECRET
## Used to generate jwt. Alt: KOMODO_JWT_SECRET_FILE
KOMODO_JWT_SECRET=a_random_jwt_secret
KOMODO_JWT_SECRET_FILE=/run/secrets/KOMODO_JWT_SECRET
## Enable login with username + password.
KOMODO_LOCAL_AUTH=true
KOMODO_LOCAL_AUTH=false
## Disable new user signups.
KOMODO_DISABLE_USER_REGISTRATION=false
## All new logins are auto enabled
@@ -72,18 +70,18 @@ KOMODO_TRANSPARENT_MODE=false
## Time to live for jwt tokens.
## Options: 1-hr, 12-hr, 1-day, 3-day, 1-wk, 2-wk
KOMODO_JWT_TTL="1-day"
KOMODO_JWT_TTL="1-wk"
## OIDC Login
KOMODO_OIDC_ENABLED=false
KOMODO_OIDC_ENABLED=true
## Must reachable from Komodo Core container
# KOMODO_OIDC_PROVIDER=https://oidc.provider.internal/application/o/komodo
KOMODO_OIDC_PROVIDER=https://authentik.tremendousturtle.tools/application/o/komodo/
## Change the host to one reachable be reachable by users (optional if it is the same as above).
## DO NOT include the `path` part of the URL.
# KOMODO_OIDC_REDIRECT_HOST=https://oidc.provider.external
KOMODO_OIDC_REDIRECT_HOST=https://authentik.tremendousturtle.tools
## Your client credentials
# KOMODO_OIDC_CLIENT_ID= # Alt: KOMODO_OIDC_CLIENT_ID_FILE
# KOMODO_OIDC_CLIENT_SECRET= # Alt: KOMODO_OIDC_CLIENT_SECRET_FILE
KOMODO_OIDC_CLIENT_ID_FILE=/run/secrets/KOMODO_OIDC_CLIENT_ID # Alt: KOMODO_OIDC_CLIENT_ID_FILE
KOMODO_OIDC_CLIENT_SECRET_FILE=/run/secrets/KOMODO_OIDC_CLIENT_SECRET # Alt: KOMODO_OIDC_CLIENT_SECRET_FILE
## Make usernames the full email.
# KOMODO_OIDC_USE_FULL_EMAIL=true
## Add additional trusted audiences for token claims verification.
@@ -115,8 +113,11 @@ KOMODO_HETZNER_TOKEN= # Alt: KOMODO_HETZNER_TOKEN_FILE
## Full variable list + descriptions are available here:
## 🦎 https://github.com/mbecker20/komodo/blob/main/config/periphery.config.toml 🦎
## Periphery passkeys must include KOMODO_PASSKEY to authenticate
PERIPHERY_PASSKEYS=${PASSKEY}
## Periphery passkeys must include KOMODO_PASSKEY to authenticate.
PERIPHERY_PASSKEYS_FILE=${KOMODO_PASSKEY_FILE}
## Specify the root directory used by Periphery agent.
PERIPHERY_ROOT_DIRECTORY=/etc/komodo
## Enable SSL using self signed certificates.
## Connect to Periphery at https://address:8120.

View File

@@ -6,7 +6,6 @@
## 1. MongoDB
## 2. Komodo Core
## 3. Komodo Periphery
name: komodo
services:
db:
@@ -22,13 +21,15 @@ services:
# ports:
# - 27017:27017
volumes:
- mongo-data:/data/db
- mongo-config:/data/configdb
- ./data/mongo-data:/data/db
- ./config/mongo-config:/data/configdb
environment:
MONGO_INITDB_ROOT_USERNAME: ${DB_USERNAME}
MONGO_INITDB_ROOT_PASSWORD: ${DB_PASSWORD}
MONGO_INITDB_ROOT_USERNAME: ${KOMODO_DB_USERNAME}
MONGO_INITDB_ROOT_PASSWORD_FILE: ${KOMODO_DB_PASSWORD_FILE}
secrets:
- KOMODO_DB_PASSWORD
core:
app:
image: ghcr.io/mbecker20/komodo:${COMPOSE_KOMODO_IMAGE_TAG:-latest}
labels:
komodo.skip: # Prevent Komodo from stopping with StopAllContainers
@@ -39,24 +40,29 @@ services:
driver: ${COMPOSE_LOGGING_DRIVER:-local}
networks:
- default
- proxy-net
ports:
- 9120:9120
env_file: ./compose.env
env_file: ./.env
environment:
KOMODO_DATABASE_ADDRESS: db:27017
KOMODO_DATABASE_USERNAME: ${DB_USERNAME}
KOMODO_DATABASE_PASSWORD: ${DB_PASSWORD}
KOMODO_DATABASE_USERNAME: ${KOMODO_DB_USERNAME}
KOMODO_DATABASE_PASSWORD_FILE: ${KOMODO_DB_PASSWORD_FILE}
KOMODO_LOGGING_LEVEL: info
volumes:
## Core cache for repos for latest commit hash / contents
- repo-cache:/repo-cache
- ./data/repo-cache:/repo-cache
## Store sync files on server
# - /path/to/syncs:/syncs
- ./data/syncs:/syncs
## Optionally mount a custom core.config.toml
# - /path/to/core.config.toml:/config/config.toml
## Allows for systemd Periphery connection at
## "http://host.docker.internal:8120"
# extra_hosts:
# - host.docker.internal:host-gateway
secrets:
- KOMODO_DB_PASSWORD
- KOMODO_PASSKEY
- KOMODO_WEBHOOK_SECRET
- KOMODO_JWT_SECRET
- KOMODO_OIDC_CLIENT_SECRET
- KOMODO_OIDC_CLIENT_ID
## Deploy Periphery container using this block,
## or deploy the Periphery binary with systemd using
@@ -70,34 +76,40 @@ services:
driver: ${COMPOSE_LOGGING_DRIVER:-local}
networks:
- default
env_file: ./compose.env
env_file: ./.env
environment:
PERIPHERY_REPO_DIR: ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}/repos
PERIPHERY_STACK_DIR: ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}/stacks
PERIPHERY_SSL_KEY_FILE: ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}/ssl/key.pem
PERIPHERY_SSL_CERT_FILE: ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}/ssl/cert.pem
volumes:
## Mount external docker socket
- /var/run/docker.sock:/var/run/docker.sock
## Allow Periphery to see processes outside of container
- /proc:/proc
## use self signed certs in docker volume,
## or mount your own signed certs.
- ssl-certs:/etc/komodo/ssl
## manage repos in a docker volume,
## or change it to an accessible host directory.
- repos:/etc/komodo/repos
## manage stack files in a docker volume,
## or change it to an accessible host directory.
- stacks:/etc/komodo/stacks
## Optionally mount a path to store compose files
# - /path/to/compose:/host/compose
volumes:
# Mongo
mongo-data:
mongo-config:
# Core
repo-cache:
# Periphery
ssl-certs:
repos:
stacks:
## Specify the Periphery agent root directory.
## Must be the same inside and outside the container,
## or docker will get confused. See https://github.com/mbecker20/komodo/discussions/180.
## Default: /etc/komodo.
- ${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}:${PERIPHERY_ROOT_DIRECTORY:-/etc/komodo}
secrets:
- KOMODO_PASSKEY
networks:
default: {}
default: {}
proxy-net:
external: true
secrets:
KOMODO_DB_PASSWORD:
file: ./secrets/KOMODO_DB_PASSWORD
KOMODO_PASSKEY:
file: ./secrets/KOMODO_PASSKEY
KOMODO_WEBHOOK_SECRET:
file: ./secrets/KOMODO_WEBHOOK_SECRET
KOMODO_JWT_SECRET:
file: ./secrets/KOMODO_JWT_SECRET
KOMODO_OIDC_CLIENT_SECRET:
file: ./secrets/KOMODO_OIDC_CLIENT_SECRET
KOMODO_OIDC_CLIENT_ID:
file: ./secrets/KOMODO_OIDC_CLIENT_ID

3
seedsync/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
config/**/*.persist
config/**/*.bak
config/**/*.backup

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/junk_transfer
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_junk_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 2
num_max_connections_per_root_file = 5
num_max_connections_per_dir_file = 5
num_max_total_connections = 5
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8802
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = True

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/junk_transfer_movies
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_junk_movies_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 2
num_max_connections_per_root_file = 5
num_max_connections_per_dir_file = 5
num_max_total_connections = 5
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8805
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = True

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/junk_transfer_packs
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_junk_packs_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 2
num_max_connections_per_root_file = 5
num_max_connections_per_dir_file = 5
num_max_total_connections = 5
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8804
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = True

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/transfer/movies
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_movies_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 1
num_max_connections_per_root_file = 6
num_max_connections_per_dir_file = 6
num_max_total_connections = 6
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8801
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = True

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/transfer/other
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_other_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 2
num_max_connections_per_root_file = 4
num_max_connections_per_dir_file = 4
num_max_total_connections = 4
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8803
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = False

View File

@@ -0,0 +1,35 @@
[General]
debug = False
verbose = False
[Lftp]
remote_address = asia.feralhosting.com
remote_username = tinyturtle
remote_password = password
remote_port = 22
remote_path = /media/dmg/tinyturtle/transfer/tv
local_path = /downloads
remote_path_to_scan_script = /media/dmg/tinyturtle/.seedsync_tv_bin
use_ssh_key = True
num_max_parallel_downloads = 1
num_max_parallel_files_per_download = 2
num_max_connections_per_root_file = 4
num_max_connections_per_dir_file = 4
num_max_total_connections = 4
use_temp_file = True
[Controller]
interval_ms_remote_scan = 30000
interval_ms_local_scan = 10000
interval_ms_downloading_scan = 1000
extract_path = /seedsynctmp
use_local_path_as_extract_path = True
[Web]
port = 8800
[AutoQueue]
enabled = True
patterns_only = False
auto_extract = True

View File

@@ -0,0 +1,68 @@
name: seedsync
services:
junksync:
image: ipsingh06/seedsync:latest
container_name: junksync
user: '998'
ports:
- 8802:8802
volumes:
- /media/junk/new_transfer:/downloads
- ./config/seedsync_junk:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped
junkpacksync:
image: ipsingh06/seedsync:latest
container_name: junkpacksync
user: '998'
ports:
- 8804:8804
volumes:
- /media/raid/junk_pack_transfer:/downloads
- ./config/seedsync_junk_packs:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped
junkmoviesync:
image: ipsingh06/seedsync:latest
container_name: junkmoviesync
user: '998'
ports:
- 8805:8805
volumes:
- /media/raid/junk_movies_transfer:/downloads
- ./config/seedsync_junk_movies:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped
moviesync:
image: ipsingh06/seedsync:latest
container_name: moviesync
user: '998'
ports:
- 8801:8801
volumes:
- /media/downloads/movies:/downloads
- ./config/seedsync_movies:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped
tvsync:
image: ipsingh06/seedsync:latest
container_name: tvsync
user: '998'
ports:
- 8800:8800
volumes:
- /media/downloads/tv:/downloads
- ./config/seedsync_tv:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped
othersync:
image: ipsingh06/seedsync:latest
container_name: othersync
user: '998'
ports:
- 8803:8803
volumes:
- /media/downloads/other:/downloads
- ./config/seedsync_other:/config
- /home/media/.ssh:/home/seedsync/.ssh
restart: unless-stopped

View File

@@ -138,14 +138,14 @@ plugins:
zwGraylist: /data,/movies,/packs
zxBlacklist: ""
zySwapBetterBitRate: true
zySwapBetterFrameRate: true
zySwapBetterFrameRate: false
zySwapCodec: true
zySwapHighRes: true
zySwapLongLength: true
zzDebug: true
zzObsoleteSettingsCheckVer2: true
zzTracing: true
zzdryRun: true
zzdryRun: false
PerformerDetailsExtended:
additionalStyling: true
appearsMostWithGendered: true
@@ -352,7 +352,7 @@ ui:
https://theporndb.net/graphql: []
markSceneAsOrganizedOnSave: false
mode: auto
selectedEndpoint: https://stashdb.org/graphql
selectedEndpoint: https://theporndb.net/graphql
setCoverImage: true
setTags: true
showMales: true

View File

@@ -10,13 +10,6 @@ services:
- proxy-net
expose:
- "9999"
## If you intend to use stash's DLNA functionality uncomment the below network mode and comment out the above ports section
# network_mode: host
logging:
driver: "json-file"
options:
max-file: "10"
max-size: "2m"
environment:
- STASH_STASH=/data/
- STASH_GENERATED=/generated/