From a404561dd7737ba19e2534e179862d6d7fd5f04e Mon Sep 17 00:00:00 2001 From: juftin Date: Fri, 5 Apr 2024 00:35:07 -0600 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20individual=20compose=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 15 ---- README.md | 36 ++++----- docker-compose.yaml | 44 +++++++--- docs/applications/media_center.md | 5 -- docs/config.md | 34 ++++---- docs/example.env | 3 + docs/index.md | 36 ++++----- docs/traefik.md | 80 +++++++++++-------- .../docker-compose.yaml => calibre-web.yaml} | 0 .../docker-compose.yaml => calibre.yaml} | 0 stacks/media-center/docker-compose.yaml | 24 ------ .../docker-compose.yaml => heimdall.yaml} | 0 .../docker-compose.yaml => nzbget.yaml} | 0 .../{ombi/docker-compose.yaml => ombi.yaml} | 0 .../{plex/docker-compose.yaml => plex.yaml} | 0 .../docker-compose.yaml => portainer.yaml} | 0 .../docker-compose.yaml => prowlarr.yaml} | 0 .../docker-compose.yaml => radarr.yaml} | 0 .../docker-compose.yaml => readarr.yaml} | 0 .../docker-compose.yaml => sftpgo.yaml} | 0 .../docker-compose.yaml => sonarr.yaml} | 0 .../docker-compose.yaml => tautulli.yaml} | 0 .../docker-compose.yaml => transmission.yaml} | 0 .../docker-compose.yaml => watchtower.yaml} | 0 ...er-compose.yaml => chat-gpt-next-web.yaml} | 0 ...ker-compose.yaml => chatgpt-in-slack.yaml} | 0 stacks/miscellaneous/docker-compose.yaml | 12 --- .../docker-compose.yaml => pihole.yaml} | 0 stacks/traefik/docker-compose.yaml | 13 --- .../docker-compose.yaml => duckdns.yaml} | 0 .../{oauth/docker-compose.yaml => oauth.yaml} | 0 .../docker-compose.yaml => socket-proxy.yaml} | 0 stacks/traefik/traefik/docker-compose.yaml | 1 + 33 files changed, 130 insertions(+), 173 deletions(-) rename stacks/media-center/{calibre-web/docker-compose.yaml => calibre-web.yaml} (100%) rename stacks/media-center/{calibre/docker-compose.yaml => calibre.yaml} (100%) delete mode 100644 stacks/media-center/docker-compose.yaml rename stacks/media-center/{heimdall/docker-compose.yaml => heimdall.yaml} (100%) rename stacks/media-center/{nzbget/docker-compose.yaml => nzbget.yaml} (100%) rename stacks/media-center/{ombi/docker-compose.yaml => ombi.yaml} (100%) rename stacks/media-center/{plex/docker-compose.yaml => plex.yaml} (100%) rename stacks/media-center/{portainer/docker-compose.yaml => portainer.yaml} (100%) rename stacks/media-center/{prowlarr/docker-compose.yaml => prowlarr.yaml} (100%) rename stacks/media-center/{radarr/docker-compose.yaml => radarr.yaml} (100%) rename stacks/media-center/{readarr/docker-compose.yaml => readarr.yaml} (100%) rename stacks/media-center/{sftpgo/docker-compose.yaml => sftpgo.yaml} (100%) rename stacks/media-center/{sonarr/docker-compose.yaml => sonarr.yaml} (100%) rename stacks/media-center/{tautulli/docker-compose.yaml => tautulli.yaml} (100%) rename stacks/media-center/{transmission/docker-compose.yaml => transmission.yaml} (100%) rename stacks/media-center/{watchtower/docker-compose.yaml => watchtower.yaml} (100%) rename stacks/miscellaneous/{chat-gpt-next-web/docker-compose.yaml => chat-gpt-next-web.yaml} (100%) rename stacks/miscellaneous/{chatgpt-in-slack/docker-compose.yaml => chatgpt-in-slack.yaml} (100%) delete mode 100644 stacks/miscellaneous/docker-compose.yaml rename stacks/miscellaneous/{pihole/docker-compose.yaml => pihole.yaml} (100%) delete mode 100644 stacks/traefik/docker-compose.yaml rename stacks/traefik/{duckdns/docker-compose.yaml => duckdns.yaml} (100%) rename stacks/traefik/{oauth/docker-compose.yaml => oauth.yaml} (100%) rename stacks/traefik/{socket-proxy/docker-compose.yaml => socket-proxy.yaml} (100%) diff --git a/.gitignore b/.gitignore index e276891..ee0ee0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,4 @@ # Secrets .env* secrets/ - -# Application Persistence appdata/ - -# Python Files -__pycache__/ -*.py[cod] -*$py.class -.venv/ -site/ - -# Mac Files -.DS_Store - -# IDE Files -.idea/ diff --git a/README.md b/README.md index 5e9ecfc..123a96e 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,9 @@ This repository is a large [docker compose](https://docs.docker.com/compose/) project that allows you to deploy a variety of services to your homelab. At the root of this repository is a `docker-compose.yaml` file that defines -the entire homelab project - collections of services are broken out into their -own subdirectories inside of the `stacks` directory. Under each stack, -every service gets its own subdirectory and a singular `docker-compose.yaml` file -(`stacks/media-center/plex/docker-compose.yaml`). Using the `include` directive in the -docker compose files, we create a single stack from the top level that deploys -everything. +the entire homelab project - it uses the `include` directive to pull in +individual service docker compose files from the `stacks` directory. +Ultimately a single docker compose stack is created that deploys everything. ```text . @@ -53,25 +50,20 @@ everything. │ └── google_oauth.secret # Google OAuth Credentials and Whitelist ├── stacks │ ├── media-center -│ │ ├── docker-compose.yaml # Media-Center Stack Docker Compose File (Plex, Sonarr, etc.) -│ │ ├── plex # Each individual service has its own subdirectory -│ │ │ └── docker-compose.yaml # Each service has its own docker-compose.yaml file -│ │ └── sonarr -│ │ └── docker-compose.yaml +│ │ ├── plex.yaml # Each individual service has its own docker compose file +│ │ ├── radarr.yaml +│ | ├── ombi.yaml +│ │ └── sonarr.yaml │ ├── traefik # Traefik Reverse Proxy and OAuth -│ │ ├── docker-compose.yaml # Traefik Stack Docker Compose File (Traefik, OAuth, etc.) -│ │ ├── oauth # OAuth Configuration -│ │ │ └── docker-compose.yaml -│ │ └── traefik # Traefik Configuration +│ │ ├── oauth # OAuth Service +│ │ └── traefik # Traefik Reverse Proxy │ │ ├── docker-compose.yaml # Traefik Docker Compose File (Traefik Only) -│ │ └── rules -│ │ ├── middlewares-chains.yml # Traefik Middlewares Chains -│ │ ├── middlewares.yml # Traefik Middlewares -│ │ └── tls-opts.yml # Traefik TLS Options +│ │ └── rules # Traefik Middlewares and Rules +│ │ ├── middlewares-chains.yml +│ │ ├── middlewares.yml +│ │ └── tls-opts.yml │ └── miscellaneous # Non Media Center Services (pihole, chat-gpt-next-web, etc.) -│ ├── docker-compose.yaml # Miscellaneous Stack Docker Compose File -│ └── chat-gpt-next-web -│ └── docker-compose.yaml +│ └── chat-gpt-next-web.yaml └── appdata # Application Data Persistent Volumes ├── media-center │ ├── plex # Each individual service has its own subdirectory diff --git a/docker-compose.yaml b/docker-compose.yaml index a7e5b0a..f5a326b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,18 +2,42 @@ # HOMELAB ################################################################################ -#################################### -# INCLUDED STACKS -#################################### - include: - - stacks/traefik/docker-compose.yaml - - stacks/media-center/docker-compose.yaml - - stacks/miscellaneous/docker-compose.yaml + ############################################################################# + # TRAEFIK (CORE) + ############################################################################# + - stacks/traefik/traefik/docker-compose.yaml # Traefik (Reverse Proxy) + - stacks/traefik/duckdns.yaml # DuckDNS (Dynamic DNS) + - stacks/traefik/oauth.yaml # OAuth (Authentication) + - stacks/traefik/socket-proxy.yaml # Docker Socket Proxy (Security) + ############################################################################# + # MEDIA CENTER + ############################################################################# + - stacks/media-center/watchtower.yaml # Watchtower (Container Updating) + - stacks/media-center/heimdall.yaml # Heimdall (Landing Page) + - stacks/media-center/ombi.yaml # Ombi (Download Requests) + - stacks/media-center/plex.yaml # Plex (Media Server) + - stacks/media-center/tautulli.yaml # Tautulli (Plex Analytics) + - stacks/media-center/sonarr.yaml # Sonarr (TV Show Downloads) + - stacks/media-center/radarr.yaml # Radarr (Movie Downloads) + - stacks/media-center/prowlarr.yaml # Prowlarr (Indexer) + - stacks/media-center/readarr.yaml # Readarr (Ebook Downloads) + - stacks/media-center/calibre.yaml # Calibre (Books Management) + - stacks/media-center/calibre-web.yaml # Calibre Web-UI + - stacks/media-center/transmission.yaml # Transmission (Torrents Behind VPN) + - stacks/media-center/nzbget.yaml # NZBGet (Usenet Downloading) + - stacks/media-center/portainer.yaml # Portainer (Container Management) + - stacks/media-center/sftpgo.yaml # SFTPGo (File Management) + ############################################################################# + # MISCELLANEOUS + ############################################################################# + - stacks/miscellaneous/pihole.yaml # Pi-hole (DNS Ad-Blocking) + - stacks/miscellaneous/chat-gpt-next-web.yaml # ChatGPT Next Web + - stacks/miscellaneous/chatgpt-in-slack.yaml # ChatGPT Slack Bot -#################################### -# CONFIGURATION -#################################### +################################################################################ +# NETWORK CONFIGURATION +################################################################################ networks: traefik: diff --git a/docs/applications/media_center.md b/docs/applications/media_center.md index dea53df..205240f 100644 --- a/docs/applications/media_center.md +++ b/docs/applications/media_center.md @@ -1,10 +1,5 @@ # Media Center Stack -When connecting these applications together, it is important to note that they all share a common -docker network. This means that when you're trying to connect to a service you can simply use -a service name as the hostname. For example, if you're trying to connect to the `sonarr` service -from the `ombi` service, you can simply use `http://sonarr:8989` as the hostname. - ## Table of Contents - [plex](#plex) diff --git a/docs/config.md b/docs/config.md index e54f473..718dca9 100644 --- a/docs/config.md +++ b/docs/config.md @@ -18,10 +18,10 @@ correct service. It is the first service that you should start with: > Once you have all of the pre-requisites set up, you can use the > [up-traefik](cli.md#up-traefik) command to start just the Traefik services. -## Apps +## App Deployment Which apps to deploy are defined in the `docker-compose.yaml` files. For example, -to disable all apps from the `miscellaneous` stack, you would comment out the `include` directive +To disable specific apps in the `media-center` stack, you would comment out the `include` directive in the root `docker-compose.yaml` file.
📄 docker-compose.yaml @@ -34,22 +34,11 @@ in the root `docker-compose.yaml` file.

-To disable specific apps in the `media-center` stack, you would comment out the `include` directive -in the `stacks/media-center/docker-compose.yaml` file. - -
📄 stacks/media-center/docker-compose.yaml -

- -```yaml ---8<-- "stacks/media-center/docker-compose.yaml" -``` - -

-
- -## App Configuration +## Infrastructure Configuration -These project makes use of a few configuration files to make it easier to manage: +All services are configured via a `.env` file at the root of the project and a few secret +files in the `secrets` directory. These files are used to define settings and credentials +for all services that are deployed. You can copy the example files to get started: ```shell cp docs/example.env .env @@ -101,3 +90,14 @@ cp -r docs/example-secrets/ secrets/

+ +## App Configuration + +Each app has its own configuration process - see the `Applications` documentation +for more information about a specific app. + +When connecting these applications together, it is important to note that they +all share a common docker network. This means that when you're trying to connect +to a service you can simply use a service name as the hostname. For example, +if you're trying to connect to the sonarr service from the ombi service +you can simply use http://sonarr:8989 as the hostname. diff --git a/docs/example.env b/docs/example.env index e5613db..2a3f51d 100644 --- a/docs/example.env +++ b/docs/example.env @@ -13,6 +13,9 @@ PGID="1000" # id -g # UNIVERSAL_RESTART_POLICY="unless-stopped" +# Uncomment to test with Let's Encrypt (HTTPS) Staging Environment +# LETS_ENCRYPT_ENV="https://acme-staging-v02.api.letsencrypt.org/directory" + ################################################################## # DIRECTORY SETUP # diff --git a/docs/index.md b/docs/index.md index f5a90bd..16c13d5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -34,12 +34,9 @@ This repository is a large [docker compose](https://docs.docker.com/compose/) project that allows you to deploy a variety of services to your homelab. At the root of this repository is a `docker-compose.yaml` file that defines -the entire homelab project - collections of services are broken out into their -own subdirectories inside of the `stacks` directory. Under each stack, -every service gets its own subdirectory and a singular `docker-compose.yaml` file -(`stacks/media-center/plex/docker-compose.yaml`). Using the `include` directive in the -docker compose files, we create a single stack from the top level that deploys -everything. +the entire homelab project - it uses the `include` directive to pull in +individual service docker compose files from the `stacks` directory. +Ultimately a single docker compose stack is created that deploys everything. ```text . @@ -51,25 +48,20 @@ everything. │ └── google_oauth.secret # Google OAuth Credentials and Whitelist ├── stacks │ ├── media-center -│ │ ├── docker-compose.yaml # Media-Center Stack Docker Compose File (Plex, Sonarr, etc.) -│ │ ├── plex # Each individual service has its own subdirectory -│ │ │ └── docker-compose.yaml # Each service has its own docker-compose.yaml file -│ │ └── sonarr -│ │ └── docker-compose.yaml +│ │ ├── plex.yaml # Each individual service has its own docker compose file +│ │ ├── radarr.yaml +│ | ├── ombi.yaml +│ │ └── sonarr.yaml │ ├── traefik # Traefik Reverse Proxy and OAuth -│ │ ├── docker-compose.yaml # Traefik Stack Docker Compose File (Traefik, OAuth, etc.) -│ │ ├── oauth # OAuth Configuration -│ │ │ └── docker-compose.yaml -│ │ └── traefik # Traefik Configuration +│ │ ├── oauth # OAuth Service +│ │ └── traefik # Traefik Reverse Proxy │ │ ├── docker-compose.yaml # Traefik Docker Compose File (Traefik Only) -│ │ └── rules -│ │ ├── middlewares-chains.yml # Traefik Middlewares Chains -│ │ ├── middlewares.yml # Traefik Middlewares -│ │ └── tls-opts.yml # Traefik TLS Options +│ │ └── rules # Traefik Middlewares and Rules +│ │ ├── middlewares-chains.yml +│ │ ├── middlewares.yml +│ │ └── tls-opts.yml │ └── miscellaneous # Non Media Center Services (pihole, chat-gpt-next-web, etc.) -│ ├── docker-compose.yaml # Miscellaneous Stack Docker Compose File -│ └── chat-gpt-next-web -│ └── docker-compose.yaml +│ └── chat-gpt-next-web.yaml └── appdata # Application Data Persistent Volumes ├── media-center │ ├── plex # Each individual service has its own subdirectory diff --git a/docs/traefik.md b/docs/traefik.md index 3754947..024990b 100644 --- a/docs/traefik.md +++ b/docs/traefik.md @@ -15,18 +15,25 @@ anywhere in the world. > to get started. > > Once you have all of the pre-requisites set up, you can use the -> [up-traefik](cli.md#up-traefik) command to start just the Traefik services. +> [up-traefik](cli.md#up-traefik) command to start just the Traefik services +> and confirm that everything is working as at https://traefik.yourdomain.com. +> Initial DNS propagation and certificate generation can take some time, so +> be patient on the first run. + +> [!INFO] "Acknowledgements" +> This configuration was inspired by, and +> immensely helped by the article at +> [smarthomebeginner.com](https://www.smarthomebeginner.com/traefik-docker-compose-guide-2024/). +> Their massive [home server setup on GitHub](https://github.com/htpcBeginner/docker-traefik) +> and amazing blog series inspired much of this project. -## Special Thank You - -This configuration was inspired by, and -immensely helped by the article at -[smarthomebeginner.com](https://smarthomebeginner.com/traefik-2-docker-tutorial). +## Prerequisites -[Here](https://github.com/htpcBeginner/docker-traefik) -is their massive home server setup on GitHub which this project is based on. +### Personal Domain -## Prerequisites +This guide assumes you have a personal domain name that you can use to +access your services. You can purchase a domain name from a registrar +like [Cloudflare](https://www.cloudflare.com/products/registrar/). ### Port Forwarding @@ -43,7 +50,7 @@ DNS services. SmartHomeBeginner has a great guide on setting up CloudFlare ### Google OAuth 2.0 -The Google Oauth 2.0 configuration can be +A helpful blog post on the Google Oauth 2.0 configuration can be found [here](https://www.smarthomebeginner.com/traefik-forward-auth-google-oauth-2022/). Essentially you must create a project in the Google Developer Console to enable the Google OAuth 2.0 service. You will share credentials with the `oauth` service @@ -59,6 +66,15 @@ provide CloudFlare with the DuckDNS subdomain to point to your server. ### File Configuration +All services are configured via a `.env` file at the root of the project and a few secret +files in the `secrets` directory. These files are used to define settings and credentials +for all services that are deployed. You can copy the example files to get started: + +```shell +cp docs/example.env .env +cp -r docs/example-secrets/ secrets/ +``` + #### .env The `.env` needs to be modified in order for the containers to be build @@ -81,16 +97,29 @@ fields filled out in the `.env` file: ```text DUCKDNS_TOKEN=XXXXXX-XXX-XXXXX-XXXXX DUCKDNS_SUBDOMAIN=example - -GOOGLE_CLIENT_ID=XXXXXXXXXXXXX-XXXXXXXXXXXXXXXXX.apps.googleusercontent.com -GOOGLE_CLIENT_SECRET=XXXXXXXXXXXXXX -OAUTH_SECRET=RANDOM_STRING_OF_CHARACTERS -OAUTH_WHITELIST=example@gmail.com,user_1@gmail.com,user_2@gmail.com - CLOUDFLARE_EMAIL=example@gmail.com -CLOUDFLARE_API_KEY=XXXXXXXXXXXXX ``` +And you should also update the secrets files: + +=== "secrets/google_oauth.secret" + + ```text + --8<-- "docs/example-secrets/google_oauth.secret" + ``` + +=== "secrets/cloudflare_api_key.secret" + + ```text + --8<-- "docs/example-secrets/cloudflare_api_key.secret" + ``` + +=== "secrets/admin_password" + + ```text + --8<-- "docs/example-secrets/admin_password.secret" + ``` + #### acme.json You will need to create an empty `acme.json` file for the @@ -127,7 +156,7 @@ The below example shows you how to create a new service in the docker compose stack and make it accessible via Traefik. In this example, we are creating a Jupyter notebook service that can be accessed at `jupyter.example.com`. -=== "stacks/miscellaneous/jupyter/docker-compose.yaml" +=== "stacks/miscellaneous/jupyter.yaml" ```yaml #################################### @@ -152,21 +181,6 @@ Jupyter notebook service that can be accessed at `jupyter.example.com`. traefik.http.routers.jupyter-rtr.middlewares: chain-oauth-google@file ``` -=== "stacks/miscellaneous/docker-compose.yaml" - - ```yaml - ################################################################################ - # DOCKER COMPOSE - MISCELLANEOUS - ################################################################################ - - #################################### - # INCLUDED APPLICATIONS - #################################### - - include: - - jupyter/docker-compose.yaml # Jupyter Lab - ``` - === "docker-compose.yaml" ```yaml diff --git a/stacks/media-center/calibre-web/docker-compose.yaml b/stacks/media-center/calibre-web.yaml similarity index 100% rename from stacks/media-center/calibre-web/docker-compose.yaml rename to stacks/media-center/calibre-web.yaml diff --git a/stacks/media-center/calibre/docker-compose.yaml b/stacks/media-center/calibre.yaml similarity index 100% rename from stacks/media-center/calibre/docker-compose.yaml rename to stacks/media-center/calibre.yaml diff --git a/stacks/media-center/docker-compose.yaml b/stacks/media-center/docker-compose.yaml deleted file mode 100644 index b491ce2..0000000 --- a/stacks/media-center/docker-compose.yaml +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# DOCKER COMPOSE - MEDIA-CENTER -################################################################################ - -#################################### -# INCLUDED APPLICATIONS -#################################### - -include: - - watchtower/docker-compose.yaml # Watchtower (Container Image Updating) - - heimdall/docker-compose.yaml # Heimdall (Landing Page) - - ombi/docker-compose.yaml # Ombi (Download Requests) - - plex/docker-compose.yaml # Plex (Media Server) - - tautulli/docker-compose.yaml # Tautulli (Plex Analytics) - - sonarr/docker-compose.yaml # Sonarr (TV Show Downloads) - - radarr/docker-compose.yaml # Radarr (Movie Downloads) - - prowlarr/docker-compose.yaml # Prowlarr (Indexer) - - readarr/docker-compose.yaml # Readarr (Ebook Downloads) - - calibre/docker-compose.yaml # Calibre (Books Management) - - calibre-web/docker-compose.yaml # Calibre Web-UI - - transmission/docker-compose.yaml # Transmission (Torrenting Behind VPN) - - nzbget/docker-compose.yaml # NZBGet (Usenet Downloading) - - portainer/docker-compose.yaml # Portainer (Container Management) - - sftpgo/docker-compose.yaml # SFTPGo (File Management) diff --git a/stacks/media-center/heimdall/docker-compose.yaml b/stacks/media-center/heimdall.yaml similarity index 100% rename from stacks/media-center/heimdall/docker-compose.yaml rename to stacks/media-center/heimdall.yaml diff --git a/stacks/media-center/nzbget/docker-compose.yaml b/stacks/media-center/nzbget.yaml similarity index 100% rename from stacks/media-center/nzbget/docker-compose.yaml rename to stacks/media-center/nzbget.yaml diff --git a/stacks/media-center/ombi/docker-compose.yaml b/stacks/media-center/ombi.yaml similarity index 100% rename from stacks/media-center/ombi/docker-compose.yaml rename to stacks/media-center/ombi.yaml diff --git a/stacks/media-center/plex/docker-compose.yaml b/stacks/media-center/plex.yaml similarity index 100% rename from stacks/media-center/plex/docker-compose.yaml rename to stacks/media-center/plex.yaml diff --git a/stacks/media-center/portainer/docker-compose.yaml b/stacks/media-center/portainer.yaml similarity index 100% rename from stacks/media-center/portainer/docker-compose.yaml rename to stacks/media-center/portainer.yaml diff --git a/stacks/media-center/prowlarr/docker-compose.yaml b/stacks/media-center/prowlarr.yaml similarity index 100% rename from stacks/media-center/prowlarr/docker-compose.yaml rename to stacks/media-center/prowlarr.yaml diff --git a/stacks/media-center/radarr/docker-compose.yaml b/stacks/media-center/radarr.yaml similarity index 100% rename from stacks/media-center/radarr/docker-compose.yaml rename to stacks/media-center/radarr.yaml diff --git a/stacks/media-center/readarr/docker-compose.yaml b/stacks/media-center/readarr.yaml similarity index 100% rename from stacks/media-center/readarr/docker-compose.yaml rename to stacks/media-center/readarr.yaml diff --git a/stacks/media-center/sftpgo/docker-compose.yaml b/stacks/media-center/sftpgo.yaml similarity index 100% rename from stacks/media-center/sftpgo/docker-compose.yaml rename to stacks/media-center/sftpgo.yaml diff --git a/stacks/media-center/sonarr/docker-compose.yaml b/stacks/media-center/sonarr.yaml similarity index 100% rename from stacks/media-center/sonarr/docker-compose.yaml rename to stacks/media-center/sonarr.yaml diff --git a/stacks/media-center/tautulli/docker-compose.yaml b/stacks/media-center/tautulli.yaml similarity index 100% rename from stacks/media-center/tautulli/docker-compose.yaml rename to stacks/media-center/tautulli.yaml diff --git a/stacks/media-center/transmission/docker-compose.yaml b/stacks/media-center/transmission.yaml similarity index 100% rename from stacks/media-center/transmission/docker-compose.yaml rename to stacks/media-center/transmission.yaml diff --git a/stacks/media-center/watchtower/docker-compose.yaml b/stacks/media-center/watchtower.yaml similarity index 100% rename from stacks/media-center/watchtower/docker-compose.yaml rename to stacks/media-center/watchtower.yaml diff --git a/stacks/miscellaneous/chat-gpt-next-web/docker-compose.yaml b/stacks/miscellaneous/chat-gpt-next-web.yaml similarity index 100% rename from stacks/miscellaneous/chat-gpt-next-web/docker-compose.yaml rename to stacks/miscellaneous/chat-gpt-next-web.yaml diff --git a/stacks/miscellaneous/chatgpt-in-slack/docker-compose.yaml b/stacks/miscellaneous/chatgpt-in-slack.yaml similarity index 100% rename from stacks/miscellaneous/chatgpt-in-slack/docker-compose.yaml rename to stacks/miscellaneous/chatgpt-in-slack.yaml diff --git a/stacks/miscellaneous/docker-compose.yaml b/stacks/miscellaneous/docker-compose.yaml deleted file mode 100644 index d802216..0000000 --- a/stacks/miscellaneous/docker-compose.yaml +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# DOCKER COMPOSE - MISCELLANEOUS -################################################################################ - -#################################### -# INCLUDED APPLICATIONS -#################################### - -include: - - pihole/docker-compose.yaml # Pi-hole (Private DNS) - - chat-gpt-next-web/docker-compose.yaml # ChatGPT Next Web - - chatgpt-in-slack/docker-compose.yaml # ChatGPT Slack Bot diff --git a/stacks/miscellaneous/pihole/docker-compose.yaml b/stacks/miscellaneous/pihole.yaml similarity index 100% rename from stacks/miscellaneous/pihole/docker-compose.yaml rename to stacks/miscellaneous/pihole.yaml diff --git a/stacks/traefik/docker-compose.yaml b/stacks/traefik/docker-compose.yaml deleted file mode 100644 index 375a438..0000000 --- a/stacks/traefik/docker-compose.yaml +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# DOCKER COMPOSE - TRAEFIK -################################################################################ - -#################################### -# INCLUDED APPLICATIONS -#################################### - -include: - - traefik/docker-compose.yaml # Traefik (Reverse Proxy) - - socket-proxy/docker-compose.yaml # Socket-Proxy (Docker.Sock) - - oauth/docker-compose.yaml # OAuth (Google OAuth for Admin) - - duckdns/docker-compose.yaml # DuckDNS (Dynamic DNS Monitoring) diff --git a/stacks/traefik/duckdns/docker-compose.yaml b/stacks/traefik/duckdns.yaml similarity index 100% rename from stacks/traefik/duckdns/docker-compose.yaml rename to stacks/traefik/duckdns.yaml diff --git a/stacks/traefik/oauth/docker-compose.yaml b/stacks/traefik/oauth.yaml similarity index 100% rename from stacks/traefik/oauth/docker-compose.yaml rename to stacks/traefik/oauth.yaml diff --git a/stacks/traefik/socket-proxy/docker-compose.yaml b/stacks/traefik/socket-proxy.yaml similarity index 100% rename from stacks/traefik/socket-proxy/docker-compose.yaml rename to stacks/traefik/socket-proxy.yaml diff --git a/stacks/traefik/traefik/docker-compose.yaml b/stacks/traefik/traefik/docker-compose.yaml index 00d946a..f1a43f7 100644 --- a/stacks/traefik/traefik/docker-compose.yaml +++ b/stacks/traefik/traefik/docker-compose.yaml @@ -77,6 +77,7 @@ services: - --entryPoints.websecure.http.tls=true - --entryPoints.websecure.http.tls.options=tls-opts@file # CERTIFICATE RESOLVERS + - --certificatesResolvers.dns-cloudflare.acme.caServer=${LETS_ENCRYPT_ENV:-https://acme-v02.api.letsencrypt.org/directory} - --certificatesResolvers.dns-cloudflare.acme.email=${CLOUDFLARE_EMAIL} - --certificatesResolvers.dns-cloudflare.acme.storage=/acme.json - --certificatesResolvers.dns-cloudflare.acme.dnsChallenge.provider=cloudflare