From 1eff4424656f4b54a36d26cc3ef207323637a2d9 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Fri, 15 Mar 2024 10:13:13 +0100
Subject: [PATCH] Move htpasswd from docker-compose.yml.sample to .env.yml
---
.env.sample | 2 ++
Readme.md | 3 +--
docker-compose.yml.sample => docker-compose.yml | 3 +--
3 files changed, 4 insertions(+), 4 deletions(-)
rename docker-compose.yml.sample => docker-compose.yml (94%)
diff --git a/.env.sample b/.env.sample
index e9284f6..f32e2ad 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1 +1,3 @@
HOST=traefik.FQDN
+#htpass in tetrix
+PASS=user:htpasswd with $ doubled
diff --git a/Readme.md b/Readme.md
index d9d20da..32cf455 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,8 +4,7 @@
```
cp .env.sample .env
-# Change FQDN
-cp docker-compose.yml.sample docker-compose.yml
+# Change FQDN and login/password with htpasswd
# Change auth in docker-compose
docker-compose up -d
```
diff --git a/docker-compose.yml.sample b/docker-compose.yml
similarity index 94%
rename from docker-compose.yml.sample
rename to docker-compose.yml
index d45a5fc..e05e328 100644
--- a/docker-compose.yml.sample
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
- "traefik.http.routers.traefikapi.tls.certresolver=myresolver"
- "traefik.http.routers.traefikapi.entrypoints=web,websecure"
- "traefik.http.routers.traefikapi.middlewares=hardening@docker,auth"
- - "traefik.http.middlewares.auth.basicauth.users=user:htpasswd with $ doubled"
+ - "traefik.http.middlewares.auth.basicauth.users=${PASS}"
- "traefik.http.middlewares.hardening.headers.sslredirect=true"
- "traefik.http.middlewares.hardening.headers.forceSTSHeader=true"
- "traefik.http.middlewares.hardening.headers.stsIncludeSubdomains=true"
@@ -43,4 +43,3 @@ services:
networks:
traefik:
external: true
-
--
GitLab