From f1e20e56e63cd571ee2039953dc32ae8d072a6d1 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Fri, 7 May 2021 23:03:31 +0200 Subject: [PATCH 01/15] Netdata: change image tag to stable, docker socket in RO mode --- services/netdata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/netdata.yaml b/services/netdata.yaml index 5d5a0c9..bc118c6 100644 --- a/services/netdata.yaml +++ b/services/netdata.yaml @@ -1,6 +1,6 @@ services: netdata: - image: netdata/netdata + image: netdata/netdata:stable restart: always container_name: netdata hostname: netdata.${TRAEFIK_DOMAIN} @@ -16,7 +16,7 @@ services: - /etc/passwd:/host/etc/passwd:ro - /etc/group:/host/etc/group:ro - /etc/os-release:/host/etc/os-release:ro - - /var/run/docker.sock:/var/run/docker.sock:rw + - /var/run/docker.sock:/var/run/docker.sock:ro labels: - "traefik.enable=true" - "traefik.http.routers.netdata.rule=Host(`netdata.${TRAEFIK_DOMAIN}`)" From 189be74fb2a0fec0a6a2f12f672353640ef4ab38 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Tue, 1 Jun 2021 10:50:27 +0200 Subject: [PATCH 02/15] Add Ombi --- README.md | 1 + services.conf | 1 + services/ombi.yaml | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 services/ombi.yaml diff --git a/README.md b/README.md index a49a64c..84932b8 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ seedbox and personal media server. | Radarr | radarr.yourdomain.com | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr) | *develop* | Movies monitor | | Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor | | Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor | +| Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests | | Jackett | jackett.yourdomain.com | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett) | *latest* | Tracker indexer | | JDownloader | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest* | Direct downloader | | Tautulli (plexPy) | tautulli.yourdomain.com | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli) | *latest* | Plex stats and admin| diff --git a/services.conf b/services.conf index 6189d0e..d82c0a8 100644 --- a/services.conf +++ b/services.conf @@ -6,6 +6,7 @@ sonarr: enable radarr: enable bazarr: enable lidarr: enable +ombi: enable tautulli: enable jdownloader: enable tdarr: enable diff --git a/services/ombi.yaml b/services/ombi.yaml new file mode 100644 index 0000000..fa9a522 --- /dev/null +++ b/services/ombi.yaml @@ -0,0 +1,21 @@ +services: + ombi: + image: ghcr.io/linuxserver/ombi + container_name: ombi + restart: always + volumes: + - configombi:/config + environment: + - PGID=${PGID} + - PUID=${PUID} + - TZ=${TZ} + labels: + - "traefik.enable=true" + - "traefik.http.routers.ombi.rule=Host(`ombi.${TRAEFIK_DOMAIN}`)" + #- "traefik.http.routers.ombi.middlewares=common-auth@file" + +volumes: + configombi: + driver: local-persist + driver_opts: + mountpoint: /data/config/ombi \ No newline at end of file From d9eefb2e4c4eb288a52e86215129d6662d68aa04 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Tue, 1 Jun 2021 10:54:34 +0200 Subject: [PATCH 03/15] Fix ombi base url --- services/ombi.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/services/ombi.yaml b/services/ombi.yaml index fa9a522..ab41549 100644 --- a/services/ombi.yaml +++ b/services/ombi.yaml @@ -9,6 +9,7 @@ services: - PGID=${PGID} - PUID=${PUID} - TZ=${TZ} + - BASE_URL=/ labels: - "traefik.enable=true" - "traefik.http.routers.ombi.rule=Host(`ombi.${TRAEFIK_DOMAIN}`)" From 27438f9bdc1595894be5f30fadba1f7e6dcae5df Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Wed, 2 Jun 2021 11:35:46 +0200 Subject: [PATCH 04/15] Add Overseerr --- README.md | 1 + services.conf | 3 ++- services/overseerr.yaml | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 services/overseerr.yaml diff --git a/README.md b/README.md index 84932b8..41dac99 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ seedbox and personal media server. | Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor | | Lidarr | lidarr.yourdomain.com | [linuxserver/lidarr](https://hub.docker.com/r/linuxserver/lidarr) | *develop* | Music monitor | | Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests | +| Overseerr | overseerr.yourdomain.com | [linuxserver/overseerr](https://hub.docker.com/r/linuxserver/overseerr) | *latest* | Plex content requests | | Jackett | jackett.yourdomain.com | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett) | *latest* | Tracker indexer | | JDownloader | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest* | Direct downloader | | Tautulli (plexPy) | tautulli.yourdomain.com | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli) | *latest* | Plex stats and admin| diff --git a/services.conf b/services.conf index d82c0a8..4efe49c 100644 --- a/services.conf +++ b/services.conf @@ -6,7 +6,8 @@ sonarr: enable radarr: enable bazarr: enable lidarr: enable -ombi: enable +ombi: disable +overseerr: enable tautulli: enable jdownloader: enable tdarr: enable diff --git a/services/overseerr.yaml b/services/overseerr.yaml new file mode 100644 index 0000000..2eb2833 --- /dev/null +++ b/services/overseerr.yaml @@ -0,0 +1,20 @@ +services: + overseerr: + image: ghcr.io/linuxserver/overseerr + container_name: overseerr + restart: always + volumes: + - configoverseerr:/config + environment: + - PGID=${PGID} + - PUID=${PUID} + - TZ=${TZ} + labels: + - "traefik.enable=true" + - "traefik.http.routers.ombi.rule=Host(`overseerr.${TRAEFIK_DOMAIN}`)" + +volumes: + configoverseerr: + driver: local-persist + driver_opts: + mountpoint: /data/config/overseerr \ No newline at end of file From d58e749e6ff3fecbc2598e422fc446670284252b Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 7 Jun 2021 13:45:26 +0200 Subject: [PATCH 05/15] Add Prowlarr --- README.md | 1 + services.conf | 1 + services/prowlarr.yaml | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 services/prowlarr.yaml diff --git a/README.md b/README.md index 41dac99..23fe522 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ seedbox and personal media server. | Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests | | Overseerr | overseerr.yourdomain.com | [linuxserver/overseerr](https://hub.docker.com/r/linuxserver/overseerr) | *latest* | Plex content requests | | Jackett | jackett.yourdomain.com | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett) | *latest* | Tracker indexer | +| Prowlarr | prowlarr.yourdomain.com | [linuxserver/prowlarr](https://hub.docker.com/r/linuxserver/prowlarr) | *develop* | Tracker indexer **(new)** | | JDownloader | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest* | Direct downloader | | Tautulli (plexPy) | tautulli.yourdomain.com | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli) | *latest* | Plex stats and admin| | Tdarr | tdarr.yourdomain.com | [haveagitgat/tdarr](https://hub.docker.com/r/haveagitgat/tdarr) | *latest* | Re-encode files | diff --git a/services.conf b/services.conf index 4efe49c..4bf8d54 100644 --- a/services.conf +++ b/services.conf @@ -2,6 +2,7 @@ deluge: enable plex: enable flaresolverr: enable jackett: enable +prowlarr: enable sonarr: enable radarr: enable bazarr: enable diff --git a/services/prowlarr.yaml b/services/prowlarr.yaml new file mode 100644 index 0000000..cf75574 --- /dev/null +++ b/services/prowlarr.yaml @@ -0,0 +1,21 @@ +services: + prowlarr: + image: ghcr.io/linuxserver/prowlarr:develop + container_name: prowlarr + restart: always + volumes: + - configprowlarr:/config + environment: + - PGID=${PGID} + - PUID=${PUID} + - TZ=${TZ} + labels: + - "traefik.enable=true" + - "traefik.http.routers.ombi.rule=Host(`prowlarr.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.prowlarr.middlewares=common-auth@file" + +volumes: + configprowlarr: + driver: local-persist + driver_opts: + mountpoint: /data/config/prowlarr \ No newline at end of file From c493f3fb1a3f7b2ab405d6ed254fcf775ab7cb13 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 7 Jun 2021 13:48:30 +0200 Subject: [PATCH 06/15] Fix typos --- services/overseerr.yaml | 2 +- services/prowlarr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/overseerr.yaml b/services/overseerr.yaml index 2eb2833..0c9a0bb 100644 --- a/services/overseerr.yaml +++ b/services/overseerr.yaml @@ -11,7 +11,7 @@ services: - TZ=${TZ} labels: - "traefik.enable=true" - - "traefik.http.routers.ombi.rule=Host(`overseerr.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.overseerr.rule=Host(`overseerr.${TRAEFIK_DOMAIN}`)" volumes: configoverseerr: diff --git a/services/prowlarr.yaml b/services/prowlarr.yaml index cf75574..9c2f910 100644 --- a/services/prowlarr.yaml +++ b/services/prowlarr.yaml @@ -11,7 +11,7 @@ services: - TZ=${TZ} labels: - "traefik.enable=true" - - "traefik.http.routers.ombi.rule=Host(`prowlarr.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.prowlarr.rule=Host(`prowlarr.${TRAEFIK_DOMAIN}`)" - "traefik.http.routers.prowlarr.middlewares=common-auth@file" volumes: From 309b89864ffd3e703f4c6dccaecac067ca2ed57d Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 7 Jun 2021 13:53:59 +0200 Subject: [PATCH 07/15] Set branch to nightly for Prowlarr --- README.md | 2 +- services/prowlarr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23fe522..9bb7efb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ seedbox and personal media server. | Ombi | ombi.yourdomain.com | [linuxserver/ombi](https://hub.docker.com/r/linuxserver/ombi) | *latest* | Plex content requests | | Overseerr | overseerr.yourdomain.com | [linuxserver/overseerr](https://hub.docker.com/r/linuxserver/overseerr) | *latest* | Plex content requests | | Jackett | jackett.yourdomain.com | [linuxserver/jackett](https://hub.docker.com/r/linuxserver/jackett) | *latest* | Tracker indexer | -| Prowlarr | prowlarr.yourdomain.com | [linuxserver/prowlarr](https://hub.docker.com/r/linuxserver/prowlarr) | *develop* | Tracker indexer **(new)** | +| Prowlarr | prowlarr.yourdomain.com | [linuxserver/prowlarr](https://hub.docker.com/r/linuxserver/prowlarr) | *nightly* | Tracker indexer **(new)** | | JDownloader | jdownloader.yourdomain.com | [jlesage/jdownloader-2](https://hub.docker.com/r/jlesage/jdownloader-2)| *latest* | Direct downloader | | Tautulli (plexPy) | tautulli.yourdomain.com | [linuxserver/tautulli](https://hub.docker.com/r/linuxserver/tautulli) | *latest* | Plex stats and admin| | Tdarr | tdarr.yourdomain.com | [haveagitgat/tdarr](https://hub.docker.com/r/haveagitgat/tdarr) | *latest* | Re-encode files | diff --git a/services/prowlarr.yaml b/services/prowlarr.yaml index 9c2f910..11bfc73 100644 --- a/services/prowlarr.yaml +++ b/services/prowlarr.yaml @@ -1,6 +1,6 @@ services: prowlarr: - image: ghcr.io/linuxserver/prowlarr:develop + image: ghcr.io/linuxserver/prowlarr:nightly container_name: prowlarr restart: always volumes: From 4ed6b00440763ae4406f028f774e568da5f0e418 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Mon, 7 Jun 2021 13:59:28 +0200 Subject: [PATCH 08/15] Add parameters handling to update-all script --- update-all.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/update-all.sh b/update-all.sh index 8e4b476..406d5ea 100755 --- a/update-all.sh +++ b/update-all.sh @@ -1,5 +1,19 @@ #!/bin/bash +SKIP_PULL=0 + +for i in "$@"; do + case $i in + --no-pull) + SKIP_PULL=1 + ;; + *) + echo "[$0] ❌ ERROR: unknown parameter \"$i\"" + exit 1 + ;; + esac +done + # Create/update http_auth file according to values in .env file source .env echo "${HTTP_USER}:${HTTP_PASSWORD}" > traefik/http_auth @@ -10,14 +24,17 @@ COMPOSE_HTTP_TIMEOUT=240 # Fetch all YAML files disabled_pattern="" while read -r line ; do - disabled_pattern="${disabled_pattern} ! -name $line.yaml" + disabled_pattern="${disabled_pattern} ! -name $line.yaml" done < <(grep "disable" services.conf | awk -F : '{print $1}' ) SERVICES=$(find services -mindepth 1 -maxdepth 1 -name "*.yaml" ${disabled_pattern} | sed -e 's/^/-f /') ALL_SERVICES="-f docker-compose.yaml $SERVICES" -echo "[$0] ***** Pulling all images... *****" -docker-compose ${ALL_SERVICES} pull +if [[ "${SKIP_PULL}" != "1" ]]; then + echo "[$0] ***** Pulling all images... *****" + docker-compose ${ALL_SERVICES} pull +fi + echo "[$0] ***** Recreating containers if required... *****" docker-compose ${ALL_SERVICES} up -d --remove-orphans echo "[$0] ***** Done updating containers *****" From 4a6e75e0b408b95e1c4e05a7a12f7a52a2b78de4 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 14:48:56 +0200 Subject: [PATCH 09/15] Add flood UI alongside deluge (experimental) --- services/deluge.yaml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/services/deluge.yaml b/services/deluge.yaml index d304ae3..96474d3 100644 --- a/services/deluge.yaml +++ b/services/deluge.yaml @@ -16,8 +16,38 @@ services: - "traefik.http.routers.deluge.rule=Host(`deluge.${TRAEFIK_DOMAIN}`)" - "traefik.http.routers.deluge.middlewares=common-auth@file" + flood: + image: jesec/flood:latest + container_name: flood + restart: always + depends_on: + - deluge + user: ${PUID}:${PGID} + command: + - --auth=none + - --dehost=deluge + - --deport=58846 + - --deuser=deluge + - --depass=deluge + - --rundir=/config + volumes: + - configflood:/config + - torrents:/torrents + - downloads:/downloads + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + - "traefik.http.routers.flood.rule=Host(`flood.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.flood.middlewares=common-auth@file" + - "traefik.http.routers.flood.service=flood-service" + - "traefik.http.services.flood-service.loadbalancer.server.port=3000" + volumes: configdeluge: driver: local-persist driver_opts: - mountpoint: /data/config/deluge \ No newline at end of file + mountpoint: /data/config/deluge + configflood: + driver: local-persist + driver_opts: + mountpoint: /data/config/flood \ No newline at end of file From 389bdab5280cc5fde8fcf2af2b8484286e88a2f7 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 15:26:49 +0200 Subject: [PATCH 10/15] Separate flood to be able to disable it, create user in Deluge rpc daemon is wanted --- .env.sample | 4 ++++ README.md | 1 + services.conf | 1 + services/deluge.yaml | 32 +------------------------------- services/flood.yaml | 32 ++++++++++++++++++++++++++++++++ update-all.sh | 6 ++++++ 6 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 services/flood.yaml diff --git a/.env.sample b/.env.sample index ebd6581..7978b18 100644 --- a/.env.sample +++ b/.env.sample @@ -26,3 +26,7 @@ NEXTCLOUD_ADMIN_PASSWORD=h4ckMePleAse873214668 # Portainer PORTAINER_ADMIN_PASSWORD=h4ckMePleAse + +# Flood username declared in deluge rpc daemon +FLOOD_PASSWORD=myfloodpassword +FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON=false \ No newline at end of file diff --git a/README.md b/README.md index 9bb7efb..6f4d6a7 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ seedbox and personal media server. -----------------------|----------------------------|------------------------------------------------------------------------|-------------------------|---------------------| | Plex | plex.yourdomain.com | [linuxserver/plex](https://hub.docker.com/r/linuxserver/plex) | *latest* | Media Streaming | | Deluge | deluge.yourdomain.com | [linuxserver/deluge](https://hub.docker.com/r/linuxserver/deluge) | *latest* | Torrents downloader | +| Flood | flood.yourdomain.com | [jesec/flood](https://hub.docker.com/r/jesec/flood) | *latest* | Web client for Deluge (experimental) | | Sonarr | sonarr.yourdomain.com | [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr) | *develop* | TV Shows monitor | | Radarr | radarr.yourdomain.com | [linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr) | *develop* | Movies monitor | | Bazarr | bazarr.yourdomain.com | [linuxserver/bazarr](https://hub.docker.com/r/linuxserver/bazarr) | *latest* | Subtitles monitor | diff --git a/services.conf b/services.conf index 4bf8d54..3d4078d 100644 --- a/services.conf +++ b/services.conf @@ -1,4 +1,5 @@ deluge: enable +flood: enable plex: enable flaresolverr: enable jackett: enable diff --git a/services/deluge.yaml b/services/deluge.yaml index 96474d3..d304ae3 100644 --- a/services/deluge.yaml +++ b/services/deluge.yaml @@ -16,38 +16,8 @@ services: - "traefik.http.routers.deluge.rule=Host(`deluge.${TRAEFIK_DOMAIN}`)" - "traefik.http.routers.deluge.middlewares=common-auth@file" - flood: - image: jesec/flood:latest - container_name: flood - restart: always - depends_on: - - deluge - user: ${PUID}:${PGID} - command: - - --auth=none - - --dehost=deluge - - --deport=58846 - - --deuser=deluge - - --depass=deluge - - --rundir=/config - volumes: - - configflood:/config - - torrents:/torrents - - downloads:/downloads - - /etc/localtime:/etc/localtime:ro - labels: - - "traefik.enable=true" - - "traefik.http.routers.flood.rule=Host(`flood.${TRAEFIK_DOMAIN}`)" - - "traefik.http.routers.flood.middlewares=common-auth@file" - - "traefik.http.routers.flood.service=flood-service" - - "traefik.http.services.flood-service.loadbalancer.server.port=3000" - volumes: configdeluge: driver: local-persist driver_opts: - mountpoint: /data/config/deluge - configflood: - driver: local-persist - driver_opts: - mountpoint: /data/config/flood \ No newline at end of file + mountpoint: /data/config/deluge \ No newline at end of file diff --git a/services/flood.yaml b/services/flood.yaml new file mode 100644 index 0000000..8a89089 --- /dev/null +++ b/services/flood.yaml @@ -0,0 +1,32 @@ +services: + flood: + image: jesec/flood:latest + container_name: flood + restart: always + depends_on: + - deluge + user: ${PUID}:${PGID} + command: + - --auth=none + - --dehost=deluge + - --deport=58846 + - --deuser=flood + - --depass=${FLOOD_PASSWORD} + - --rundir=/config + volumes: + - configflood:/config + - torrents:/torrents + - downloads:/downloads + - /etc/localtime:/etc/localtime:ro + labels: + - "traefik.enable=true" + - "traefik.http.routers.flood.rule=Host(`flood.${TRAEFIK_DOMAIN}`)" + - "traefik.http.routers.flood.middlewares=common-auth@file" + - "traefik.http.routers.flood.service=flood-service" + - "traefik.http.services.flood-service.loadbalancer.server.port=3000" + +volumes: + configflood: + driver: local-persist + driver_opts: + mountpoint: /data/config/flood \ No newline at end of file diff --git a/update-all.sh b/update-all.sh index 406d5ea..5c14843 100755 --- a/update-all.sh +++ b/update-all.sh @@ -30,6 +30,12 @@ done < <(grep "disable" services.conf | awk -F : '{print $1}' ) SERVICES=$(find services -mindepth 1 -maxdepth 1 -name "*.yaml" ${disabled_pattern} | sed -e 's/^/-f /') ALL_SERVICES="-f docker-compose.yaml $SERVICES" +# Specific instructions for Flood +# User for Deluge daemon RPC has to be created in deluge auth config file +if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} ]]; then + echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth +fi + if [[ "${SKIP_PULL}" != "1" ]]; then echo "[$0] ***** Pulling all images... *****" docker-compose ${ALL_SERVICES} pull From ebd65276a27a23b678bd8bcc656575aea5d5cd0e Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 15:31:44 +0200 Subject: [PATCH 11/15] Fix condition for flood autocreate user in deluge rpc --- update-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-all.sh b/update-all.sh index 5c14843..1e048c5 100755 --- a/update-all.sh +++ b/update-all.sh @@ -32,7 +32,7 @@ ALL_SERVICES="-f docker-compose.yaml $SERVICES" # Specific instructions for Flood # User for Deluge daemon RPC has to be created in deluge auth config file -if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} ]]; then +if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} == true && ! grep -q "flood" /data/config/deluge/auth ]]; then echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth fi From 5053729640a7cdad2e25db5bbad4a70c4a1f3da1 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 15:35:59 +0200 Subject: [PATCH 12/15] Fix condition --- update-all.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/update-all.sh b/update-all.sh index 1e048c5..59d92c2 100755 --- a/update-all.sh +++ b/update-all.sh @@ -32,8 +32,12 @@ ALL_SERVICES="-f docker-compose.yaml $SERVICES" # Specific instructions for Flood # User for Deluge daemon RPC has to be created in deluge auth config file -if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} == true && ! grep -q "flood" /data/config/deluge/auth ]]; then - echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth +if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} == true ]]; then + if ! grep -q "flood" /data/config/deluge/auth; then + echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth + else + echo "No need to add user/password for flood as it has already been created." + fi fi if [[ "${SKIP_PULL}" != "1" ]]; then From 1d12fce259745a22d3dd4d14e513222477fde499 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 15:40:17 +0200 Subject: [PATCH 13/15] Fix logging --- update-all.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update-all.sh b/update-all.sh index 59d92c2..6817cdd 100755 --- a/update-all.sh +++ b/update-all.sh @@ -36,7 +36,8 @@ if [[ ! -z ${FLOOD_PASSWORD} && ${FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON} == tru if ! grep -q "flood" /data/config/deluge/auth; then echo "flood:${FLOOD_PASSWORD}:10" >> /data/config/deluge/auth else - echo "No need to add user/password for flood as it has already been created." + echo "[$0] No need to add user/password for flood as it has already been created." + echo "[$0] Consider setting FLOOD_AUTOCREATE_USER_IN_DELUGE_DAEMON variable to false in .env file." fi fi From 1d0684a2b4aa58566c03dd88661ac3df8966be40 Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 16:04:04 +0200 Subject: [PATCH 14/15] Feature: local vs upstream services.conf --- .gitignore | 1 + services.conf => services.conf.sample | 0 update-all.sh | 13 +++++++++++++ 3 files changed, 14 insertions(+) rename services.conf => services.conf.sample (100%) diff --git a/.gitignore b/.gitignore index f9f10bb..a8655bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ **/.env **/traefik/http_auth backup/ +services.conf diff --git a/services.conf b/services.conf.sample similarity index 100% rename from services.conf rename to services.conf.sample diff --git a/update-all.sh b/update-all.sh index 6817cdd..7186f0b 100755 --- a/update-all.sh +++ b/update-all.sh @@ -21,6 +21,19 @@ echo "${HTTP_USER}:${HTTP_PASSWORD}" > traefik/http_auth # Docker-compose settings COMPOSE_HTTP_TIMEOUT=240 +if [[ ! -f services.conf ]]; then + echo "[$0] No services.conf file found. Copying from sample file..." + cp services.conf.sample services.conf +fi + +# Alert in case new services have been added (or removed) in sample but active file has not changed +NB_SERVICES_ACTIVE=$(cat services.conf | wc -l) +NB_SERVICES_ORIG=$(cat services.conf.sample | wc -l) +if [[ ${NB_SERVICES_ACTIVE} != ${NB_SERVICES_ORIG} ]]; + echo "[$0] Your services.conf file seems outdated. It appears there are new services available, or services that have been removed." + diff -yt services.conf services.conf.sample +fi + # Fetch all YAML files disabled_pattern="" while read -r line ; do From d531add8f53a2c2115190ca60295bac64d40bdee Mon Sep 17 00:00:00 2001 From: Jean Froment Date: Sun, 20 Jun 2021 16:05:23 +0200 Subject: [PATCH 15/15] Fix update script (typo) --- update-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-all.sh b/update-all.sh index 7186f0b..ecb5659 100755 --- a/update-all.sh +++ b/update-all.sh @@ -29,7 +29,7 @@ fi # Alert in case new services have been added (or removed) in sample but active file has not changed NB_SERVICES_ACTIVE=$(cat services.conf | wc -l) NB_SERVICES_ORIG=$(cat services.conf.sample | wc -l) -if [[ ${NB_SERVICES_ACTIVE} != ${NB_SERVICES_ORIG} ]]; +if [[ ${NB_SERVICES_ACTIVE} != ${NB_SERVICES_ORIG} ]]; then echo "[$0] Your services.conf file seems outdated. It appears there are new services available, or services that have been removed." diff -yt services.conf services.conf.sample fi