From ce8d530592f195aed875e123ecb2b668dee14891 Mon Sep 17 00:00:00 2001 From: Aykhan Shahsuvarov Date: Thu, 27 Feb 2025 02:19:50 +0400 Subject: [PATCH] added 'Caddyfile.private' --- README.md | 1 + caddy/.gitignore | 3 ++- caddy/Caddyfile | 2 ++ caddy/Caddyfile.private.example | 1 + caddy/docker-compose.yml | 1 + main.sh | 5 +++-- 6 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 caddy/Caddyfile.private.example diff --git a/README.md b/README.md index 130ce78..8d3c4f1 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Edit the generated `.env` files to fill in the required fields: - `./vaultwarden/.env` - `./wg_easy/.env` - `./caddy/.env` +- `./caddy/Caddyfile.private` ### 4. Start Services Launch all services with the following command: diff --git a/caddy/.gitignore b/caddy/.gitignore index 323cf71..bbdc2d7 100644 --- a/caddy/.gitignore +++ b/caddy/.gitignore @@ -1,2 +1,3 @@ /ssl/* -!.gitkeep \ No newline at end of file +!.gitkeep +Caddyfile.private \ No newline at end of file diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 4b64f9b..3daa909 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -194,3 +194,5 @@ } } } + +import Caddyfile.private diff --git a/caddy/Caddyfile.private.example b/caddy/Caddyfile.private.example new file mode 100644 index 0000000..d8e9f6e --- /dev/null +++ b/caddy/Caddyfile.private.example @@ -0,0 +1 @@ +# Private Caddy config \ No newline at end of file diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index 63ba43d..4e9a9d7 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -11,6 +11,7 @@ services: - "443:443/udp" volumes: - ./Caddyfile:/etc/caddy/Caddyfile + - ./Caddyfile.private:/etc/caddy/Caddyfile.private - ./ssl:/etc/ssl/custom/ env_file: - ./.env diff --git a/main.sh b/main.sh index 1f4b069..c41d2ee 100755 --- a/main.sh +++ b/main.sh @@ -55,13 +55,14 @@ check_docker_compose() { generate_env_files() { cp --update=none ./gitea/.env.example ./gitea/.env - # cp --update=none ./memos/.env.example ./memos/.env cp --update=none ./searxng/.env.example ./searxng/.env cp --update=none ./sftpgo/.env.example ./sftpgo/.env - # cp --update=none ./slash/.env.example ./slash/.env cp --update=none ./vaultwarden/.env.example ./vaultwarden/.env cp --update=none ./wg_easy/.env.example ./wg_easy/.env cp --update=none ./caddy/.env.example ./caddy/.env + cp --update=none ./caddy/Caddyfile.private.example ./caddy/Caddyfile.private + # cp --update=none ./memos/.env.example ./memos/.env + # cp --update=none ./slash/.env.example ./slash/.env print_success ".env files generated." }