diff --git a/.env b/.env index 09241d8..a606efc 100644 --- a/.env +++ b/.env @@ -87,7 +87,7 @@ AUTHELIA_JWT_SECRET="" # tell you how to add users # Currently there is only one user (user1 with password 'password') and it has access to everything. # If you would like to configure access control policies, you will need to edit the access_control key -# in the ${DOCKER_DATA_DIR}/data/authelia/config/configuration.yml file. +# in the ${DOCKER_APP_DIR}/authelia/config/configuration.yml file. # ========================================================== # CLOUDFLARE DDNS diff --git a/apps/aiostremio/compose.yaml b/apps/aiostremio/compose.yaml index fdfad15..4401529 100644 --- a/apps/aiostremio/compose.yaml +++ b/apps/aiostremio/compose.yaml @@ -6,7 +6,7 @@ services: expose: - 8469 volumes: - - ${DOCKER_DATA_DIR}/aiostremio:/app/data + - ./config.json:/app/data/config.json - ${DOCKER_DATA_DIR}/aiostremio/db:/app/db env_file: - .env diff --git a/data/aiostremio/config.json b/apps/aiostremio/config.json similarity index 100% rename from data/aiostremio/config.json rename to apps/aiostremio/config.json diff --git a/apps/authelia/.env b/apps/authelia/.env index 4cdf547..f2976a0 100644 --- a/apps/authelia/.env +++ b/apps/authelia/.env @@ -23,13 +23,13 @@ AUTHELIA_WEBAUTHN_DISPLAY_NAME="Authelia" # The valid users for Authelia are stored in the users.yml file. -# This is located in `${DOCKER_DATA_DIR}/data/authelia/config/users.yml` +# This is located in `./config/users.yml` # You must add your users to this file in order to be able to access secured services. # Note: When you first login with a user, Authelia will ask for a code that it says it sent to you. # This will be located in the notification.txt file in the same directory as the users.yml file. -# You can run this command to view the file, replacing ${DOCKER_DATA_DIR} with its actual value: -# cat ${DOCKER_DATA_DIR}/data/authelia/config/notification.txt +# You can run this command to view the file: +# cat /opt/docker/apps/authelia/config/notification.txt # A list of domains to apply page specific rules to. # Although we can't fully protect Stremio addons, we can still add authentication to specific pages like the configuration pages. diff --git a/apps/authelia/compose.yaml b/apps/authelia/compose.yaml index 4718bf5..281274b 100644 --- a/apps/authelia/compose.yaml +++ b/apps/authelia/compose.yaml @@ -24,7 +24,7 @@ services: - "traefik.http.middlewares.authelia.forwardAuth.trustForwardHeader=true" - "traefik.http.middlewares.authelia.forwardAuth.authResponseHeaders=Remote-User,Remote-Groups,Remote-Email,Remote-Name" volumes: - - '${DOCKER_DATA_DIR}/authelia/config:/config' + - './config:/config' depends_on: authelia_redis: condition: service_healthy diff --git a/data/authelia/config/assets/empty b/apps/authelia/config/assets/empty similarity index 100% rename from data/authelia/config/assets/empty rename to apps/authelia/config/assets/empty diff --git a/data/authelia/config/certificates/empty b/apps/authelia/config/certificates/empty similarity index 100% rename from data/authelia/config/certificates/empty rename to apps/authelia/config/certificates/empty diff --git a/data/authelia/config/configuration.yml b/apps/authelia/config/configuration.yml similarity index 100% rename from data/authelia/config/configuration.yml rename to apps/authelia/config/configuration.yml diff --git a/data/authelia/config/users.yml b/apps/authelia/config/users.yml similarity index 100% rename from data/authelia/config/users.yml rename to apps/authelia/config/users.yml diff --git a/apps/autosync/compose.yaml b/apps/autosync/compose.yaml index 44d98d6..98c05d9 100644 --- a/apps/autosync/compose.yaml +++ b/apps/autosync/compose.yaml @@ -18,7 +18,7 @@ services: - "traefik.http.routers.autosync.middlewares=authelia@docker" - "traefik.http.services.autosync.loadbalancer.server.port=3536" volumes: - - ${DOCKER_DATA_DIR}/autosync/config.yaml:/app/config.yaml + - ./config.yaml:/app/config.yaml - /etc/localtime:/etc/localtime:ro - /mnt:/mnt:rslave depends_on: diff --git a/data/autosync/config.yml b/apps/autosync/config.yaml similarity index 100% rename from data/autosync/config.yml rename to apps/autosync/config.yaml diff --git a/apps/debridav/compose.yaml b/apps/debridav/compose.yaml index afe7c49..db62373 100644 --- a/apps/debridav/compose.yaml +++ b/apps/debridav/compose.yaml @@ -64,7 +64,7 @@ services: - PGID=${PGID} volumes: - ${DEBRIDAV_MOUNT_PATH_HOST_FS}:${DEBRIDAV_MOUNT_PATH_CONTAINERS}:rshared - - /opt/docker/data/debridav/rclone.conf:/config/rclone/rclone.conf + - ./rclone.conf:/config/rclone/rclone.conf - /dev/fuse:/dev/fuse cap_add: - SYS_ADMIN diff --git a/data/debridav/rclone.conf b/apps/debridav/rclone.conf similarity index 100% rename from data/debridav/rclone.conf rename to apps/debridav/rclone.conf diff --git a/apps/decypharr/compose.yaml b/apps/decypharr/compose.yaml index f87e3a4..12e3c4e 100644 --- a/apps/decypharr/compose.yaml +++ b/apps/decypharr/compose.yaml @@ -11,8 +11,12 @@ services: - PGID=${PGID} - UMASK=002 volumes: - - /mnt/:/mnt:rslave - - ${DOCKER_DATA_DIR}/decypharr/:/app # config.json must be in this directory + - /mnt:/mnt:rslave + - ./config.json:/app/config.json + - ${DOCKER_DATA_DIR}/decypharr/repair.json:/app/repair.json + - ${DOCKER_DATA_DIR}/decypharr/torrents.json:/app/torrents.json + - ${DOCKER_DATA_DIR}/decypharr/logs:/app/logs + - ${DOCKER_DATA_DIR}/decypharr/cache:/app/cache labels: - "traefik.enable=true" - "traefik.http.routers.decypharr.rule=Host(`${DECYPHARR_HOSTNAME?}`)" @@ -42,7 +46,7 @@ services: RCLONE_VFS_CACHE_MAX_AGE: "72h" volumes: - /mnt/remote/realdebrid:/data:rshared - - ${DOCKER_DATA_DIR}/decypharr/rclone.conf:/config/rclone/rclone.conf + - ./rclone.conf:/config/rclone/rclone.conf - /mnt:/mnt - ${DOCKER_DATA_DIR}/decypharr/cache:/cache cap_add: diff --git a/data/decypharr/config.json b/apps/decypharr/config.json similarity index 100% rename from data/decypharr/config.json rename to apps/decypharr/config.json diff --git a/data/decypharr/rclone.conf b/apps/decypharr/rclone.conf similarity index 100% rename from data/decypharr/rclone.conf rename to apps/decypharr/rclone.conf diff --git a/apps/honey/compose.yaml b/apps/honey/compose.yaml index a523b0c..0a01e61 100644 --- a/apps/honey/compose.yaml +++ b/apps/honey/compose.yaml @@ -5,8 +5,8 @@ services: restart: unless-stopped user: $PUID:$PGID volumes: - - ${DOCKER_DATA_DIR}/honey:/app/dist/config - - ${DOCKER_DATA_DIR}/honey/img:/app/dist/img/custom + - ./config.json:/app/dist/config/config.json + - ${DOCKER_DATA_DIR}/honey:/app/dist/img/custom # place any images in this folder, and use custom/image_name.jpg in the config.json expose: - 4173 labels: diff --git a/data/honey/config.json b/apps/honey/config.json similarity index 100% rename from data/honey/config.json rename to apps/honey/config.json diff --git a/apps/kometa/compose.yaml b/apps/kometa/compose.yaml index 58ac30b..9c6e4ca 100644 --- a/apps/kometa/compose.yaml +++ b/apps/kometa/compose.yaml @@ -8,7 +8,7 @@ services: - TZ=${TZ:-Etc/UTC} - KOMETA_RUN=True volumes: - - ${DOCKER_DATA_DIR}/kometa:/config + - ./config:/config profiles: - kometa - all @@ -24,7 +24,7 @@ services: - KOMETA_TIME=00:00,02:00,04:00,06:00,08:00,10:00,12:00,14:00,16:00,18:00,20:00,22:00 - KOMETA_RUN=False volumes: - - ${DOCKER_DATA_DIR}/kometa:/config + - ./config:/config profiles: - kometa - all diff --git a/data/kometa/config.yml b/apps/kometa/config/config.yml similarity index 100% rename from data/kometa/config.yml rename to apps/kometa/config/config.yml diff --git a/apps/plausible/compose.yaml b/apps/plausible/compose.yaml index b5acd8d..230d6c9 100644 --- a/apps/plausible/compose.yaml +++ b/apps/plausible/compose.yaml @@ -41,9 +41,9 @@ services: volumes: - ${DOCKER_DATA_DIR}/plausible/clickhouse/db:/var/lib/clickhouse - ${DOCKER_DATA_DIR}/plausible/clickhouse/logs:/var/log/clickhouse-server - - ${DOCKER_DATA_DIR}/plausible/clickhouse/logs.xml:/etc/clickhouse-server/config.d/logs.xml:ro - - ${DOCKER_DATA_DIR}/plausible/clickhouse/ipv4-only.xml:/etc/clickhouse-server/config.d/ipv4-only.xml:ro - - ${DOCKER_DATA_DIR}/plausible/clickhouse/low-resources.xml:/etc/clickhouse-server/config.d/low-resources.xml:ro + - ./logs.xml:/etc/clickhouse-server/config.d/logs.xml:ro + - ./ipv4-only.xml:/etc/clickhouse-server/config.d/ipv4-only.xml:ro + - ./low-resources.xml:/etc/clickhouse-server/config.d/low-resources.xml:ro ulimits: nofile: soft: 262144 diff --git a/data/plausible/clickhouse/ip4-only.xml b/apps/plausible/ip4-only.xml similarity index 100% rename from data/plausible/clickhouse/ip4-only.xml rename to apps/plausible/ip4-only.xml diff --git a/data/plausible/clickhouse/logs.xml b/apps/plausible/logs.xml similarity index 100% rename from data/plausible/clickhouse/logs.xml rename to apps/plausible/logs.xml diff --git a/data/plausible/clickhouse/low-resources.xml b/apps/plausible/low-resources.xml similarity index 100% rename from data/plausible/clickhouse/low-resources.xml rename to apps/plausible/low-resources.xml diff --git a/apps/prowlarr/compose.yaml b/apps/prowlarr/compose.yaml index fd32667..bdfb2df 100644 --- a/apps/prowlarr/compose.yaml +++ b/apps/prowlarr/compose.yaml @@ -11,6 +11,7 @@ services: - 9696 volumes: - ${DOCKER_DATA_DIR}/prowlarr:/config + - ./definitions:/config/Definitions/Custom restart: unless-stopped labels: - "traefik.enable=true" diff --git a/data/prowlarr/Definitions/Custom/52btCustom.yml b/apps/prowlarr/definitions/52btCustom.yml similarity index 100% rename from data/prowlarr/Definitions/Custom/52btCustom.yml rename to apps/prowlarr/definitions/52btCustom.yml diff --git a/data/prowlarr/Definitions/Custom/debridio.yml b/apps/prowlarr/definitions/debridio.yml similarity index 100% rename from data/prowlarr/Definitions/Custom/debridio.yml rename to apps/prowlarr/definitions/debridio.yml diff --git a/data/prowlarr/Definitions/Custom/torbox.yml b/apps/prowlarr/definitions/torbox.yml similarity index 100% rename from data/prowlarr/Definitions/Custom/torbox.yml rename to apps/prowlarr/definitions/torbox.yml diff --git a/apps/recyclarr/compose.yaml b/apps/recyclarr/compose.yaml index 9251140..8dea5ca 100644 --- a/apps/recyclarr/compose.yaml +++ b/apps/recyclarr/compose.yaml @@ -7,7 +7,14 @@ services: environment: - TZ=${TZ:-UTC} volumes: - - ${DOCKER_DATA_DIR}/recyclarr:/config + # - ${DOCKER_DATA_DIR}/recyclarr:/config + - ${DOCKER_DATA_DIR}/recyclarr/cache:/config/cache + - ${DOCKER_DATA_DIR}/recyclarr/logs:/config/logs + - ${DOCKER_DATA_DIR}/recyclarr/repositories:/config/repositories + - ${DOCKER_DATA_DIR}/recyclarr/configs:/config/configs + - ${DOCKER_DATA_DIR}/recyclarr/includes:/config/includes + - ./recyclarr.yml:/config/recyclarr.yml + - ./secrets.yml:/config/secrets.yml depends_on: - sonarr - sonarr4k diff --git a/data/recyclarr/recyclarr.yml b/apps/recyclarr/recyclarr.yml similarity index 100% rename from data/recyclarr/recyclarr.yml rename to apps/recyclarr/recyclarr.yml diff --git a/data/recyclarr/secrets.yml b/apps/recyclarr/secrets.yml similarity index 100% rename from data/recyclarr/secrets.yml rename to apps/recyclarr/secrets.yml diff --git a/apps/tweakio/compose.yaml b/apps/tweakio/compose.yaml index ef131fa..0cc92e6 100644 --- a/apps/tweakio/compose.yaml +++ b/apps/tweakio/compose.yaml @@ -9,7 +9,7 @@ services: network_mode: service:warp user: $PUID:$PGID volumes: - - ${DOCKER_DATA_DIR}/tweakio/config.yaml:/app/config.yaml + - ./config.yaml:/app/config.yaml profiles: - all - debrid_media_server diff --git a/data/tweakio/config.yaml b/apps/tweakio/config.yaml similarity index 100% rename from data/tweakio/config.yaml rename to apps/tweakio/config.yaml diff --git a/apps/zurg/compose.yaml b/apps/zurg/compose.yaml index aa3a4ac..d2079f6 100644 --- a/apps/zurg/compose.yaml +++ b/apps/zurg/compose.yaml @@ -6,7 +6,7 @@ services: healthcheck: test: curl -f localhost:9999/dav/version.txt || exit 1 volumes: - - ${DOCKER_DATA_DIR}/zurg/config-${ZURG_CONFIG_VERSION:-v0.9}.yml:/app/config.yml + - ./config-${ZURG_CONFIG_VERSION:-v0.9}.yml:/app/config.yml - ${DOCKER_DATA_DIR}/zurg/data:/app/data - ${DOCKER_DATA_DIR}/zurg/logs:/app/logs labels: @@ -30,7 +30,7 @@ services: PGID: ${PGID} volumes: - /mnt/remote/realdebrid:/data:rshared - - ${DOCKER_DATA_DIR}/zurg/rclone.conf:/config/rclone/rclone.conf + - ./rclone.conf:/config/rclone/rclone.conf - /mnt:/mnt cap_add: - SYS_ADMIN diff --git a/data/zurg/config-v0.10.yml b/apps/zurg/config-v0.10.yml similarity index 100% rename from data/zurg/config-v0.10.yml rename to apps/zurg/config-v0.10.yml diff --git a/data/zurg/config-v0.9.yml b/apps/zurg/config-v0.9.yml similarity index 100% rename from data/zurg/config-v0.9.yml rename to apps/zurg/config-v0.9.yml diff --git a/data/zurg/rclone.conf b/apps/zurg/rclone.conf similarity index 100% rename from data/zurg/rclone.conf rename to apps/zurg/rclone.conf diff --git a/data/prowlarr/Definitions/Custom/zilean.yml b/data/prowlarr/Definitions/Custom/zilean.yml deleted file mode 100644 index 8130ce3..0000000 --- a/data/prowlarr/Definitions/Custom/zilean.yml +++ /dev/null @@ -1,98 +0,0 @@ -id: zilean -name: Zilean -description: "A custom indexer for Zilean the unofficial DMM indexer using it's Torznab Endpoint" -language: en-US -type: public -encoding: UTF-8 -followredirect: false -testlinktorrent: false -requestDelay: 2 -links: - # Torznab Endpoint is used for better performance - - http://zilean:8181 - - https://zilean.elfhosted.com - -caps: - categories: - Movies: Movies - TV: TV - modes: - search: [q] - movie-search: [q, imdbid] - tv-search: [q, season, ep] - allowrawsearch: false - -settings: [] - -search: - paths: - - path: /dmm/filtered - method: get - response: - type: json - - inputs: - $raw: "{{ if .Query.IMDBID }}ImdbId={{ .Query.IMDBID }}{{ else }}Query={{ .Keywords }}{{ end }}" - Season: "{{ if .Query.Season }}{{ .Query.Season }}{{ else }}{{ end }}" - Episode: "{{ if .Query.Ep }}{{ .Query.Ep }}{{ else }}{{ end }}" - - keywordsfilters: - - name: re_replace - args: ["\\bS\\d+(?:E\\d+)?\\b", ""] # Remove season and episode info - - name: re_replace - args: ["\\b(19|20)\\d{2}\\b", ""] # Remove year info - - name: re_replace - args: ["[\\[\\]()]", ""] # Remove brackets - - name: re_replace - args: ["^$", "limitless"] - - rows: - selector: $ - missingAttributeEqualsNoResults: true - - fields: - title: - selector: raw_title - year: - selector: year - category: - selector: category - filters: - - name: replace - args: ["tvSeries", "TV"] - - name: replace - args: ["movie", "Movies"] - infohash: - selector: info_hash - size: - selector: size - quality: - selector: resolution - filters: - - name: replace - args: ["4k", "2160p"] - codec: - selector: codec - episode: - selector: episodes - season: - selector: seasons - language: - selector: languages - seeders: - text: "30" - leechers: - text: "10" - date: - text: "Apr. 18th '11" - filters: - - name: re_replace - args: ["st|nd|rd|th", ""] - - name: replace - args: ["'", ""] - - name: dateparse - args: "MMM. d yy" - downloadvolumefactor: - text: "1" - uploadvolumefactor: - text: "1" \ No newline at end of file