From f53d77dae6a7d12e58e2577507e2e1cb02bc295b Mon Sep 17 00:00:00 2001 From: Gyurix Date: Wed, 28 Aug 2024 12:05:46 +0200 Subject: [PATCH] secret dir change --- scripts/scheduler/entrypoint.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 8b8197a..1c430f3 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -129,7 +129,7 @@ deploy_additionals(){ DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)"; # copy json files into service directory - cp -rv $DIR/$NAME-secret.json $SECRET_DIR/$NAME.json + cp -rv $DIR/$NAME-secret.json $SECRET_DIR/$NAME/$NAME.json cp -rv $DIR/service-$NAME.json $SERVICE_DIR/service-$NAME.json; cp -rv $DIR/domain-$NAME.json $SERVICE_DIR/domain-$NAME.json; @@ -139,13 +139,13 @@ deploy_additionals(){ # TODO - for key # replace variables in secret and domain files - sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" $SECRET_DIR/$NAME.json; - sed -i "s/USERNAME/$NEXTCLOUD_USERNAME/g" $SECRET_DIR/$NAME.json; - sed -i "s/USER_PASSWORD/$NEXTCLOUD_PASSWORD/g" $SECRET_DIR/$NAME.json; - sed -i "s/DB_MYSQL/$DB_MYSQL/g" $SECRET_DIR/$NAME.json; - sed -i "s/DB_USER/$DB_USER/g" $SECRET_DIR/$NAME.json; - sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" $SECRET_DIR/$NAME.json; - sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" $SECRET_DIR/$NAME.json; + sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/USERNAME/$NEXTCLOUD_USERNAME/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/USER_PASSWORD/$NEXTCLOUD_PASSWORD/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/DB_MYSQL/$DB_MYSQL/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/DB_USER/$DB_USER/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" $SECRET_DIR/$NAME/$NAME.json; + sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" $SECRET_DIR/$NAME/$NAME.json; sed -i "s/DOMAIN_NAME/$NEXTCLOUD_DOMAIN/g" $SERVICE_DIR/domain-$NAME.json