--env
This commit is contained in:
@@ -58,11 +58,11 @@ if [[ "$BITWARDEN" == "yes" ]]; then
|
||||
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
|
||||
|
||||
if [ "$SMTP_SERVER" == "gmail" ]; then
|
||||
if [ "$SMTP_SERVER" == "1" ]; then
|
||||
SMTP_HOST="smtp.gmail.com";
|
||||
SMTP_PORT="587";
|
||||
SMTP_SECURITY="starttls";
|
||||
elif [ "$SMTP_SERVER" == "microsoft" ]; then
|
||||
elif [ "$SMTP_SERVER" == "2" ]; then
|
||||
SMTP_HOST="smtp-mail.outlook.com";
|
||||
SMTP_PORT="587";
|
||||
SMTP_SECURITY="starttls";
|
||||
|
19
install.sh
19
install.sh
@@ -325,14 +325,17 @@ ask_additionals() {
|
||||
fi;
|
||||
done
|
||||
|
||||
echo "Please choose an SMTP server (gmail/outlook/other): ";
|
||||
echo "Please choose an SMTP server (1/2/3): ";
|
||||
echo "1 - Gmail";
|
||||
echo "2 - Microsoft Outlook/Hotmail";
|
||||
echo "3 - Other";
|
||||
while read -r SMTP_SERVER; do
|
||||
if [ "$SMTP_SERVER" != "" ]; then
|
||||
break;
|
||||
fi;
|
||||
done
|
||||
|
||||
if [ "$SMTP_SERVER" == "other" ]; then
|
||||
if [ "$SMTP_SERVER" == "3" ]; then
|
||||
echo "Please add STMP HOST: ";
|
||||
while read -r SMTP_HOST; do
|
||||
if [ "$SMTP_HOST" != "" ]; then
|
||||
@@ -370,13 +373,13 @@ ask_additionals() {
|
||||
done
|
||||
|
||||
echo "Please add STMP PASSWORD: ";
|
||||
while read -r SMTP_PASSWORD; do
|
||||
while read -r -s SMTP_PASSWORD; do
|
||||
if [ "$SMTP_PASSWORD" != "" ]; then
|
||||
break;
|
||||
fi;
|
||||
done
|
||||
|
||||
echo "Please add Domains Whitelist: ";
|
||||
echo "Please add Domains Whitelist (list of domains): ";
|
||||
while read -r DOMAINS_WHITELIST; do
|
||||
if [ "$DOMAINS_WHITELIST" != "" ]; then
|
||||
break;
|
||||
@@ -570,6 +573,14 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
|
||||
if [ "$BITWARDEN" != "" ]; then
|
||||
VAR_BITWARDEN="--env BITWARDEN=$BITWARDEN";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env BITWARDEN_DOMAIN=$BITWARDEN_DOMAIN";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SERVER=$SMTP_SERVER";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_HOST=$SMTP_HOST";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PORT=$SMTP_PORT";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_SECURITY=$SMTP_SECURITY";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_FROM=$SMTP_FROM";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_USER=$SMTP_USER";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PASSWORD=$SMTP_PASSWORD";
|
||||
VAR_BITWARDEN="$VAR_BITWARDEN --env DOMAINS_WHITELIST=$DOMAINS_WHITELIST";
|
||||
|
||||
echo "You can access your bitwarden admin page here: https://$BITWARDEN_DOMAIN/admin";
|
||||
echo "You will find ADMIN TOKEN in this file: /etc/user/secret/bitwarden-secret.json";
|
||||
|
Reference in New Issue
Block a user