More HTTPS fixes
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
6450c80236
commit
83a3d82ea5
|
@ -26,3 +26,4 @@ REMOVE_BACKUP_VOLUME_AFTER_UPLOAD=1
|
||||||
# HTTPS storage
|
# HTTPS storage
|
||||||
#SECRET_HTTPS_PASSWORD_VERSION=v1
|
#SECRET_HTTPS_PASSWORD_VERSION=v1
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.https.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.https.yml"
|
||||||
|
#RESTIC_USER=<somebody>
|
||||||
|
|
|
@ -41,9 +41,10 @@ if [ -n "$s3_key_file" ] && [ -f "$s3_key_file" ] && [ -n "$AWS_ACCESS_KEY_ID" ]
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$https_password_file" ] && [ -f "$https_password_file" ]; then
|
if [ -n "$https_password_file" ] && [ -f "$https_password_file" ]; then
|
||||||
RESTIC_PASSWORD="$(cat "${https_password_file}")"
|
HTTPS_PASSWORD="$(cat "${https_password_file}")"
|
||||||
export RESTIC_PASSWORD
|
export HTTPS_PASSWORD
|
||||||
restic_repo="rest:$restic_host"
|
restic_user="${RESTIC_USER:?RESTIC_USER not set}"
|
||||||
|
restic_repo="rest:https://$restic_user:$HTTPS_PASSWORD@$restic_host"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$restic_repo" ]; then
|
if [ -z "$restic_repo" ]; then
|
||||||
|
|
|
@ -3,9 +3,8 @@ version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- SSH_KEY_FILE=/run/secrets/https_password
|
- HTTPS_PASSWORD_FILE=/run/secrets/https_password
|
||||||
- SSH_HOST_KEY
|
- RESTIC_USER
|
||||||
- SSH_HOST_KEY_DISABLE
|
|
||||||
secrets:
|
secrets:
|
||||||
- source: https_password
|
- source: https_password
|
||||||
mode: 0400
|
mode: 0400
|
||||||
|
|
Loading…
Reference in New Issue