Skip to content

Commit

Permalink
remove ADMIN_EMAIL dummy values for dev and test
Browse files Browse the repository at this point in the history
  • Loading branch information
briskt committed Jun 12, 2024
1 parent b8943b3 commit b33f093
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
9 changes: 0 additions & 9 deletions actions-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ services:
MYSQL_USER: silauth
MYSQL_PASSWORD: silauth
PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
ADMIN_EMAIL: [email protected]
ADMIN_PASS: b
SECRET_SALT: abc123
IDP_NAME: x
Expand Down Expand Up @@ -67,7 +66,6 @@ services:
# Enable checking our test metadata
- ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "abc123"
SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "Hub"
Expand Down Expand Up @@ -106,7 +104,6 @@ services:
bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 &&
/data/run.sh"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "a"
SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "IDP 1"
Expand Down Expand Up @@ -145,7 +142,6 @@ services:
- ./development/UserPass.php:/data/vendor/simplesamlphp/simplesamlphp/modules/exampleauth/lib/Auth/Source/UserPass.php

environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "b"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "IDP 2"
Expand All @@ -167,7 +163,6 @@ services:
- ./development/idp3-local/metadata/saml20-sp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-sp-remote.php

environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "c"
SECRET_SALT: "h57fjem34fh*nsJFGNjweJ"
SECURE_COOKIE: "false"
Expand All @@ -190,7 +185,6 @@ services:
# Enable checking our test metadata
- ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "sp1"
SECRET_SALT: "not-secret-h57fjemb&dn^nsJFGNjweJz1"
SECURE_COOKIE: "false"
Expand All @@ -212,7 +206,6 @@ services:
- ./development/sp2-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php

environment:
ADMIN_EMAIL: [email protected]
ADMIN_PASS: sp2
SECRET_SALT: h57fjemb&dn^nsJFGNjweJz2
SECURE_COOKIE: "false"
Expand All @@ -234,7 +227,6 @@ services:
- ./development/sp3-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php

environment:
ADMIN_EMAIL: [email protected]
ADMIN_PASS: sp3
SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3
SECURE_COOKIE: "false"
Expand All @@ -255,7 +247,6 @@ services:
# Utilize custom metadata
- ./development/sp-local/metadata/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
environment:
ADMIN_EMAIL: [email protected]
ADMIN_PASS: sp1
IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED
SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw
Expand Down
9 changes: 0 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ services:
MYSQL_PASSWORD: silauth
COMPOSER_CACHE_DIR: /composer
PROFILE_URL_FOR_TESTS: http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
ADMIN_EMAIL: [email protected]
ADMIN_PASS: b
SECRET_SALT: abc123
IDP_NAME: x
Expand Down Expand Up @@ -120,7 +119,6 @@ services:
ports:
- "80:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "abc123"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "Hub"
Expand Down Expand Up @@ -169,7 +167,6 @@ services:
ports:
- "8085:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "a"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "IDP 1"
Expand Down Expand Up @@ -218,7 +215,6 @@ services:
ports:
- "8086:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "b"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJ"
IDP_NAME: "IDP 2"
Expand Down Expand Up @@ -251,7 +247,6 @@ services:
env_file:
- local.env
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "c"
SECRET_SALT: "h57fjem34fh*nsJFGNjweJ"
SECURE_COOKIE: "false"
Expand Down Expand Up @@ -284,7 +279,6 @@ services:
ports:
- "8081:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "sp1"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJz1"
SECURE_COOKIE: "false"
Expand Down Expand Up @@ -315,7 +309,6 @@ services:
ports:
- "8082:80"
environment:
ADMIN_EMAIL: "[email protected]"
ADMIN_PASS: "sp2"
SECRET_SALT: "h57fjemb&dn^nsJFGNjweJz2"
SECURE_COOKIE: "false"
Expand All @@ -340,7 +333,6 @@ services:
env_file:
- local.env
environment:
ADMIN_EMAIL: [email protected]
ADMIN_PASS: sp3
SECRET_SALT: h57fjemb&dn^nsJFGNjweJz3
SECURE_COOKIE: "false"
Expand All @@ -362,7 +354,6 @@ services:
ports:
- "8084:80"
environment:
ADMIN_EMAIL: [email protected]
ADMIN_PASS: sp1
IDP_NAME: THIS VARIABLE IS REQUIRED BUT PROBABLY NOT USED
SECRET_SALT: NOT-a-secret-k49fjfkw73hjf9t87wjiw
Expand Down
2 changes: 1 addition & 1 deletion local.env.dist
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# These are Required
ADMIN_EMAIL=
ADMIN_PASS=
IDP_NAME=
SECRET_SALT=

# These are Optional
ADMIN_EMAIL=
ADMIN_NAME=
ADMIN_PROTECT_INDEX_PAGE=
ANALYTICS_ID=
Expand Down

0 comments on commit b33f093

Please sign in to comment.