simon/outline
0
0
Fork 0
forked from coop-cloud/outline
Code Pull Requests Activity

fix: get aws secret key right

Browse Source
This commit is contained in:
cellarspoon
2022-01-06 11:34:45 +01:00
parent cb4fe2e91b
commit b451550a61
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.sample
View File

@ -11,7 +11,7 @@ LETS_ENCRYPT_ENV=production
SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_PASSWORD_VERSION=v1
SECRET_SECRET_KEY_VERSION=v1 # length=32 SECRET_SECRET_KEY_VERSION=v1 # length=32
SECRET_UTILS_SECRET_VERSION=v1 # length=32 SECRET_UTILS_SECRET_VERSION=v1 # length=32
SECRET_AWS_SECRET_ACCESS_KEY=v1 SECRET_AWS_SECRET_KEY=v1
SECRET_OIDC_CLIENT_SECRET_VERSION=v1 SECRET_OIDC_CLIENT_SECRET_VERSION=v1
AWS_ACCESS_KEY_ID= AWS_ACCESS_KEY_ID=
@ -23,7 +23,6 @@ AWS_S3_FORCE_PATH_STYLE=true
AWS_S3_ACL=private AWS_S3_ACL=private
OIDC_CLIENT_ID= OIDC_CLIENT_ID=
OIDC_CLIENT_SECRET=
OIDC_AUTH_URI= OIDC_AUTH_URI=
OIDC_TOKEN_URI= OIDC_TOKEN_URI=
OIDC_USERINFO_URI= OIDC_USERINFO_URI=

6
compose.yml
View File

@ -27,7 +27,7 @@ services:
- AWS_S3_UPLOAD_BUCKET_NAME - AWS_S3_UPLOAD_BUCKET_NAME
- AWS_S3_UPLOAD_BUCKET_URL - AWS_S3_UPLOAD_BUCKET_URL
- AWS_S3_UPLOAD_MAX_SIZE - AWS_S3_UPLOAD_MAX_SIZE
- AWS_SECRET_ACCESS_KEY_FILE=/run/secrets/aws_secret_key - AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key
- DATABASE_PASSWORD_FILE=/run/secrets/db_password - DATABASE_PASSWORD_FILE=/run/secrets/db_password
- FORCE_HTTPS=true - FORCE_HTTPS=true
- OIDC_AUTH_URI - OIDC_AUTH_URI
@ -84,8 +84,8 @@ secrets:
utils_secret: utils_secret:
name: ${STACK_NAME}_utils_secret_${SECRET_UTILS_SECRET_VERSION} name: ${STACK_NAME}_utils_secret_${SECRET_UTILS_SECRET_VERSION}
external: true external: true
aws_access_key: aws_secret_key:
name: ${STACK_NAME}_aws_access_key_${SECRET_AWS_SECRET_ACCESS_KEY_VERSION} name: ${STACK_NAME}_aws_secret_key_${SECRET_AWS_SECRET_KEY_VERSION}
external: true external: true
oidc_client_secret: oidc_client_secret:
name: ${STACK_NAME}_oidc_client_secret_${SECRET_OIDC_CLIENT_SECRET_VERSION} name: ${STACK_NAME}_oidc_client_secret_${SECRET_OIDC_CLIENT_SECRET_VERSION}

2
entrypoint.sh.tmpl
View File

@ -24,7 +24,7 @@ file_env() {
unset "$fileVar" unset "$fileVar"
} }
file_env "AWS_SECRET_ACCESS_KEY" file_env "AWS_SECRET_KEY"
file_env "OIDC_CLIENT_SECRET" file_env "OIDC_CLIENT_SECRET"
file_env "UTILS_SECRET" file_env "UTILS_SECRET"
file_env "DATABASE_PASSWORD" file_env "DATABASE_PASSWORD"