safebox/installer-tool
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.format.hu/format/installer-tool

Browse Source
This commit is contained in:
Gyorgy Berenyi
2023-06-21 14:11:21 +00:00
parent ed52f6a5ee 1c76151432
commit 6832adea9b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
additional_install.sh
View File

@@ -50,13 +50,17 @@ if [[ "$BITWARDEN" == "yes" ]]; then
DB_USER="$(echo $RANDOM | md5sum | head -c 8)"; DB_USER="$(echo $RANDOM | md5sum | head -c 8)";
DB_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)"; DB_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)"; DB_ROOT_PASSWORD="$(echo $RANDOM | md5sum | head -c 10)";
BITWARDEN_DOMAIN="https://$BITWARDEN_DOMAIN";
echo "Your admin token is: $ADMIN_TOKEN";
sed -i "s/DB_MYSQL/$DB_MYSQL/g" /tmp/bitwarden/bitwarden-secret.json; sed -i "s/DB_MYSQL/$DB_MYSQL/g" /tmp/bitwarden/bitwarden-secret.json;
sed -i "s/DB_USER/$DB_USER/g" /tmp/bitwarden/bitwarden-secret.json; sed -i "s/DB_USER/$DB_USER/g" /tmp/bitwarden/bitwarden-secret.json;
sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json; sed -i "s/DB_PASSWORD/$DB_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json; sed -i "s/DB_ROOT_PASSWORD/$DB_ROOT_PASSWORD/g" /tmp/bitwarden/bitwarden-secret.json;
sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json sed -i "s/DOMAIN_NAME/$BITWARDEN_DOMAIN/g" /tmp/bitwarden/bitwarden-secret.json
sed -i "s/ADMINTOKEN/$BITWARDEN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json sed -i "s/ADMINTOKEN/$ADMIN_TOKEN/g" /tmp/bitwarden/bitwarden-secret.json
if [ "$SMTP_SERVER" == "1" ]; then if [ "$SMTP_SERVER" == "1" ]; then
SMTP_HOST="smtp.gmail.com"; SMTP_HOST="smtp.gmail.com";

4
install.sh
View File

@@ -549,7 +549,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ask_additionals; ask_additionals;
if [ "$NEXTCLOUD" != "" ]; then if [ "$NEXTCLOUD" == "yes" ]; then
VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD"; VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD";
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN"; VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME"; VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
@@ -570,7 +570,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
fi fi
fi fi
if [ "$BITWARDEN" != "" ]; then if [ "$BITWARDEN" == "yes" ]; then
VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN"; VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN"; VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SERVER=$SMTP_SERVER"; VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SERVER=$SMTP_SERVER";