Skip to content

Commit cb32021

Browse files
committed
Fix: Basic Auth required variable name update
1 parent 3183366 commit cb32021

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

bin/container-entrypoint.d/entrypoint.d/41.basicauth.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
PROTECTED_URL_DEFAULT=""
3+
APACHE_PROTECTED_URL_DEFAULT=""
44

5-
export PROTECTED_URL=${PROTECTED_URL:-"${PROTECTED_URL_DEFAULT}"}
5+
export APACHE_PROTECTED_URL=${APACHE_PROTECTED_URL:-"${APACHE_PROTECTED_URL_DEFAULT}"}
66

77
HTPASSWD_USERNAME_DEFAULT="default"
88
HTPASSWD_PASSWORD_DEFAULT="password"

config/apache2/conf.d/elasticms.conf.gtpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106

107107
{{- end }}
108108

109-
{{- if ne .Env.PROTECTED_URL "" }}
110-
<Location {{ .Env.PROTECTED_URL }} >
109+
{{- if ne .Env.APACHE_PROTECTED_URL "" }}
110+
<Location {{ .Env.APACHE_PROTECTED_URL }} >
111111
AuthType Basic
112112
AuthName "Protected Area"
113113
AuthBasicProvider file

test/configs/skeleton/demo-preview-dev.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SERVER_NAME='demo-preview-dev'
33
SERVER_ALIASES='demo-preview-nocache-dev'
44
APACHE_CACHE_CONTROL='immutable, max-age=63072000, public'
55
APACHE_ENVIRONMENTS='[]'
6-
PROTECTED_URL=/protected-baseurl/
6+
APACHE_PROTECTED_URL=/protected-baseurl/
77
###< Apache ###
88

99
###> Symfony ###

test/configs/skeleton/zz-live.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SERVER_NAME='demo-live'
33
SERVER_ALIASES='*'
44
APACHE_CACHE_CONTROL='immutable, max-age=63072000, public'
55
APACHE_ENVIRONMENTS='[]'
6-
PROTECTED_URL=/protected-baseurl/
6+
APACHE_PROTECTED_URL=/protected-baseurl/
77
###< Apache ###
88

99
###> Symfony ###

0 commit comments

Comments
 (0)