From b9b4e0b6c0bef9fd16132d0f7cd99d07268eab2a Mon Sep 17 00:00:00 2001 From: Adrien Poupa Date: Mon, 1 Jan 2024 18:24:40 -0500 Subject: [PATCH] feat: Simplify folder structure --- .gitignore | 11 --------- docker-compose.yml | 41 +++++++++++++++++++++++++++++++++ flaresolverr/docker-compose.yml | 19 --------------- jellyfin/.gitkeep | 0 jellyseerr/.gitkeep | 0 letsencrypt/.gitkeep | 0 lidarr/.gitkeep | 0 pia/.gitkeep | 0 prowlarr/.gitkeep | 0 qbittorrent/.gitkeep | 0 radarr/.gitkeep | 0 sabnzbd/.gitkeep | 0 sabnzbd/docker-compose.yml | 28 ---------------------- sonarr/.gitkeep | 0 14 files changed, 41 insertions(+), 58 deletions(-) delete mode 100644 flaresolverr/docker-compose.yml delete mode 100644 jellyfin/.gitkeep delete mode 100644 jellyseerr/.gitkeep delete mode 100644 letsencrypt/.gitkeep delete mode 100644 lidarr/.gitkeep delete mode 100644 pia/.gitkeep delete mode 100644 prowlarr/.gitkeep delete mode 100644 qbittorrent/.gitkeep delete mode 100644 radarr/.gitkeep delete mode 100644 sabnzbd/.gitkeep delete mode 100644 sabnzbd/docker-compose.yml delete mode 100644 sonarr/.gitkeep diff --git a/.gitignore b/.gitignore index 0238dec..4bb0d45 100644 --- a/.gitignore +++ b/.gitignore @@ -6,29 +6,18 @@ docker-compose.override.yml /homepage/*.css /homepage/*.js /sonarr -!/sonarr/.gitkeep /radarr -!/radarr/.gitkeep /prowlarr -!/prowlarr/.gitkeep /lidarr -!/lidarr/.gitkeep /qbittorrent -!/qbittorrent/.gitkeep /pia -!/pia/.gitkeep /pia-shared -!/pia-shared/.gitkeep /letsencrypt -!/letsencrypt/.gitkeep /jellyfin -!/jellyfin/.gitkeep /jellyseerr -!/jellyseerr/.gitkeep /adguardhome/certs /adguardhome/conf !/adguardhome/conf/.gitkeep /adguardhome/work !/adguardhome/work/.gitkeep /sabnzbd -!/sabnzbd/.gitkeep diff --git a/docker-compose.yml b/docker-compose.yml index 912732b..fa14b61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -229,6 +229,22 @@ services: - homepage.widget.type=prowlarr - homepage.widget.url=http://prowlarr:9696/prowlarr - homepage.widget.key=${PROWLARR_API_KEY} + flaresolverr: + image: ghcr.io/flaresolverr/flaresolverr:latest + container_name: flaresolverr + restart: always + environment: + - LOG_LEVEL=${LOG_LEVEL:-info} + - LOG_HTML=${LOG_HTML:-false} + - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none} + - TZ=${TIMEZONE} + labels: + - traefik.enable=true + - traefik.http.routers.flaresolverr.rule=PathPrefix(`/flaresolverr`) + - traefik.http.routers.flaresolverr.tls=true + - traefik.http.services.flaresolverr.loadbalancer.server.port=8191 + profiles: + - flaresolverr qbittorrent: image: lscr.io/linuxserver/qbittorrent:libtorrentv1 container_name: qbittorrent @@ -321,6 +337,31 @@ services: - UN_RADARR_0_API_KEY=${RADARR_API_KEY} security_opt: - no-new-privileges:true + sabnzbd: + image: lscr.io/linuxserver/sabnzbd:latest + container_name: sabnzbd + environment: + - PUID=${USER_ID} + - PGID=${GROUP_ID} + - TZ=${TIMEZONE} + volumes: + - ./sabnzbd:/config + - ${DATA_ROOT}:/data + restart: always + labels: + - traefik.enable=true + - traefik.http.routers.sabnzbd.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/sabnzbd`) || PathPrefix(`/sabnzbd`)) + - traefik.http.routers.sabnzbd.tls=true + - traefik.http.routers.sabnzbd.tls.certresolver=myresolver + - traefik.http.services.sabnzbd.loadbalancer.server.port=8080 + - homepage.group=Media + - homepage.name=Sabnzbd + - homepage.icon=sabnzbd.png + - homepage.href=/sabnzbd + - homepage.description=Usenet + - homepage.weight=6 + profiles: + - sabnzbd jellyfin: image: lscr.io/linuxserver/jellyfin container_name: jellyfin diff --git a/flaresolverr/docker-compose.yml b/flaresolverr/docker-compose.yml deleted file mode 100644 index b11e5c2..0000000 --- a/flaresolverr/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3.9' - -services: - flaresolverr: - image: ghcr.io/flaresolverr/flaresolverr:latest - container_name: flaresolverr - restart: always - environment: - - LOG_LEVEL=${LOG_LEVEL:-info} - - LOG_HTML=${LOG_HTML:-false} - - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none} - - TZ=${TIMEZONE} - labels: - - traefik.enable=true - - traefik.http.routers.flaresolverr.rule=PathPrefix(`/flaresolverr`) - - traefik.http.routers.flaresolverr.tls=true - - traefik.http.services.flaresolverr.loadbalancer.server.port=8191 - profiles: - - flaresolverr \ No newline at end of file diff --git a/jellyfin/.gitkeep b/jellyfin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/jellyseerr/.gitkeep b/jellyseerr/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/letsencrypt/.gitkeep b/letsencrypt/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/lidarr/.gitkeep b/lidarr/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/pia/.gitkeep b/pia/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/prowlarr/.gitkeep b/prowlarr/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/qbittorrent/.gitkeep b/qbittorrent/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/radarr/.gitkeep b/radarr/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/sabnzbd/.gitkeep b/sabnzbd/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/sabnzbd/docker-compose.yml b/sabnzbd/docker-compose.yml deleted file mode 100644 index 4ad2394..0000000 --- a/sabnzbd/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: '3.9' - -services: - sabnzbd: - image: lscr.io/linuxserver/sabnzbd:latest - container_name: sabnzbd - environment: - - PUID=${USER_ID} - - PGID=${GROUP_ID} - - TZ=${TIMEZONE} - volumes: - - ./sabnzbd:/config - - ${DATA_ROOT}:/data - restart: always - labels: - - traefik.enable=true - - traefik.http.routers.sabnzbd.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/sabnzbd`) || PathPrefix(`/sabnzbd`)) - - traefik.http.routers.sabnzbd.tls=true - - traefik.http.routers.sabnzbd.tls.certresolver=myresolver - - traefik.http.services.sabnzbd.loadbalancer.server.port=8080 - - homepage.group=Media - - homepage.name=Sabnzbd - - homepage.icon=sabnzbd.png - - homepage.href=/sabnzbd - - homepage.description=Usenet - - homepage.weight=6 - profiles: - - sabnzbd \ No newline at end of file diff --git a/sonarr/.gitkeep b/sonarr/.gitkeep deleted file mode 100644 index e69de29..0000000