diff --git a/mixed/compose.yml b/mixed/compose.yml index 7c9614b..554f60e 100755 --- a/mixed/compose.yml +++ b/mixed/compose.yml @@ -1,4 +1,5 @@ services: + archivebox: container_name: archivebox image: archivebox/archivebox:dev @@ -34,17 +35,6 @@ services: volumes: - ${DOCKER_CONFIGS}/data:/data - authelia: - container_name: authelia - image: authelia/authelia - environment: - - TZ=${TZ} - ports: - - 9091:9091 - restart: always - volumes: - - ${DOCKER_CONFIGS}/authelia/config:/config - bazarr: container_name: bazarr image: lscr.io/linuxserver/bazarr:latest @@ -248,23 +238,6 @@ services: - ${DOCKER_CONFIGS}/mstream/config:/config - ${MEDIA_DIR}/Music:/music - nginxproxymanager: - container_name: nginxproxymanager - image: jc21/nginx-proxy-manager:2.9.22 - environment: - - X_FRAME_OPTIONS=sameorigin - - DB_SQLITE_FILE=/data/database.sqlite - ports: - - 443:443/tcp - - 80:80/tcp - - 81:81/tcp - restart: always - volumes: - - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data - - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt - - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro - - /etc/localtime:/etc/localtime:ro - nzbhydra: container_name: nzbhydra image: lscr.io/linuxserver/nzbhydra2:latest diff --git a/reverseproxy/.env b/reverseproxy/.env new file mode 100755 index 0000000..71a992d --- /dev/null +++ b/reverseproxy/.env @@ -0,0 +1,16 @@ +#GLOBAL SETTINGS +COMPOSE_HTTP_TIMEOUT=120 +COMPOSE_IGNORE_ORPHANS=1 +DOCKER_CONFIGS=. +DOCKERGID=999 +DOCKERHOSTNAME=DockerServer +DOCKERLOGGING_MAXFILE=10 +DOCKERLOGGING_MAXSIZE=200k +PGID=1000 +PUID=1000 +UMASK=000 +TZ=America/Chicago + +#DIRECTORY PATHS +MEDIA_DIR=/mnt/media +STORAGE_DIR=/mnt/storage diff --git a/mixed/authelia/add-to-protected-domains.conf b/reverseproxy/authelia/add-to-protected-domains.conf similarity index 100% rename from mixed/authelia/add-to-protected-domains.conf rename to reverseproxy/authelia/add-to-protected-domains.conf diff --git a/mixed/authelia/auth.domain.conf b/reverseproxy/authelia/auth.domain.conf similarity index 100% rename from mixed/authelia/auth.domain.conf rename to reverseproxy/authelia/auth.domain.conf diff --git a/mixed/authelia/config/configuration.yml b/reverseproxy/authelia/config/configuration.yml similarity index 100% rename from mixed/authelia/config/configuration.yml rename to reverseproxy/authelia/config/configuration.yml diff --git a/mixed/authelia/config/users_database.yml b/reverseproxy/authelia/config/users_database.yml similarity index 100% rename from mixed/authelia/config/users_database.yml rename to reverseproxy/authelia/config/users_database.yml diff --git a/reverseproxy/compose.yml b/reverseproxy/compose.yml new file mode 100644 index 0000000..0872ef7 --- /dev/null +++ b/reverseproxy/compose.yml @@ -0,0 +1,34 @@ +services: + + authelia: + container_name: authelia + image: authelia/authelia + environment: + - TZ=${TZ} + ports: + - 9091:9091 + restart: always + volumes: + - ${DOCKER_CONFIGS}/authelia/config:/config + + nginxproxymanager: + container_name: nginxproxymanager + image: jc21/nginx-proxy-manager:2.9.22 + environment: + - X_FRAME_OPTIONS=sameorigin + - DB_SQLITE_FILE=/data/database.sqlite + ports: + - 443:443/tcp + - 80:80/tcp + - 81:81/tcp + restart: always + volumes: + - ${DOCKER_CONFIGS}/nginxproxymanager/data:/data + - ${DOCKER_CONFIGS}/nginxproxymanager/letsencrypt:/etc/letsencrypt + - ${DOCKER_CONFIGS}/nginxproxymanager/snippets:/snippets:ro + - /etc/localtime:/etc/localtime:ro + +networks: + reverseproxy: + name: reverseproxy + external: true diff --git a/mixed/nginxproxymanager/snippets/authelia-authrequest.conf b/reverseproxy/nginxproxymanager/snippets/authelia-authrequest.conf similarity index 100% rename from mixed/nginxproxymanager/snippets/authelia-authrequest.conf rename to reverseproxy/nginxproxymanager/snippets/authelia-authrequest.conf diff --git a/mixed/nginxproxymanager/snippets/authelia-location.conf b/reverseproxy/nginxproxymanager/snippets/authelia-location.conf similarity index 100% rename from mixed/nginxproxymanager/snippets/authelia-location.conf rename to reverseproxy/nginxproxymanager/snippets/authelia-location.conf diff --git a/mixed/nginxproxymanager/snippets/authelia-proxy.conf b/reverseproxy/nginxproxymanager/snippets/authelia-proxy.conf similarity index 100% rename from mixed/nginxproxymanager/snippets/authelia-proxy.conf rename to reverseproxy/nginxproxymanager/snippets/authelia-proxy.conf