- read apache authentication from .env

emotional-cities · Aug 9, 2023 · 2f0a578 · 2f0a578
1 parent a1048e4
commit 2f0a578
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apache-httpd/httpd-ssl.conf b/apache-httpd/httpd-ssl.conf
@@ -576,7 +576,7 @@ SSLRandomSeed connect builtin
         Allow from all
         Authtype Basic
         Authname "Password Required"
-        AuthUserFile /etc/apache2/.htpasswd
+        AuthUserFile /usr/local/apache2/.htpasswd
         Require valid-user
     </Location>
 

diff --git a/apache-httpd/httpd.conf b/apache-httpd/httpd.conf
@@ -554,7 +554,7 @@ SSLRandomSeed connect builtin
     Allow from all
     Authtype Basic
     Authname "Password Required"
-    AuthUserFile /etc/apache2/.htpasswd
+    AuthUserFile /usr/local/apache2/.htpasswd
     Require valid-user
 </Location>
 

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -42,10 +42,10 @@ services:
       - frost
     volumes:
       - ./apache-httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf
-      - ./apache-httpd/.htpasswd:/etc/apache2/.htpasswd
     ports:
       - "80:80"
       - "443:443"
+    command: sh -c "/usr/local/apache2/bin/htpasswd -b -c /usr/local/apache2/.htpasswd $FROST_USER $FROST_PASSWORD && httpd-foreground"
     container_name: apache-httpd
 
   pygeoapi:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -194,10 +194,10 @@ services:
       - "/etc/letsencrypt/archive/oldskool.byteroad.net/fullchain3.pem:/usr/local/apache2/conf/oldskool/fullchain1.pem"
       - "/etc/letsencrypt/archive/oldskool.byteroad.net/privkey3.pem:/usr/local/apache2/conf/oldskool/privkey1.pem"
       - ./apache-httpd/httpd-ssl.conf:/usr/local/apache2/conf/httpd.conf
-      - ./apache-httpd/.htpasswd:/etc/apache2/.htpasswd
     ports:
       - "80:80"
       - "443:443"
+    command: sh -c "/usr/local/apache2/bin/htpasswd -b -c /usr/local/apache2/.htpasswd $FROST_USER $FROST_PASSWORD && httpd-foreground"
     container_name: apache-httpd
 
   frost: