commented redis related lines

This commit is contained in:
gyurix
2024-11-27 12:09:22 +01:00
parent 8192815ac4
commit 6c3ef4aef5
2 changed files with 381 additions and 346 deletions

View File

@@ -555,7 +555,8 @@ execute_task() {
if [ "$TASK_NAME" == "install" ]; then
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "INSTALL_STATUS": "0" }' | jq -r . | base64 -w0) # install has started
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
#redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
#if [ "$INSTALL_STATUS" == "2" ]; then
# force install?
@@ -796,7 +797,8 @@ execute_task() {
debug "JSON_TARGET: $JSON_TARGET"
if [ "$JSON_TARGET" != "" ]; then
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
#redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
fi
}
@@ -938,37 +940,75 @@ if [[ "$WS" == "" && "$RS" == "" ]]; then
fi
# poll redis infinitely for scheduler jobs
check_redis_availability $REDIS_SERVER $REDIS_PORT $CURL_RETRIES $CURL_SLEEP_SHORT
echo $(date)" Scheduler initialized, starting listening for events"
#check_redis_availability $REDIS_SERVER $REDIS_PORT $CURL_RETRIES $CURL_SLEEP_SHORT
#echo $(date)" Scheduler initialized, starting listening for events"
# STARTING SCHEDULER PROCESSES
while true; do
# Initial parameters
DATE=$(date +%F-%H-%M-%S)
TASKS=""
# Set env variables
DIR=$SHARED/input
# GET DEPLOYMENT IDs FROM generate key
TASKS=$(redis-cli -h $REDIS_SERVER -p $REDIS_PORT SMEMBERS web_in)
if [[ "$TASKS" != "0" && "$TASKS" != "" ]]; then
# Triggers by certificate or domain config changes
# PROCESSING TASK
for TASK in $(echo $TASKS); do
unset IFS
### READ TASKS FROM REDIS
B64_JSON=$(redis-cli -h $REDIS_SERVER -p $REDIS_PORT GET $TASK)
JSON_TARGET=$(echo $B64_JSON | base64 -d | jq -rc .'STATUS="0"' | base64 -w0)
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
execute_task "$TASK" "$B64_JSON"
# MOVE TASK from web_in into web_out
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SREM web_in $TASK
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SADD web_out $TASK
echo $JSON_TARGET | base64 -d > $SHARED/output/$TASK.json
done
inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DIR |
while read dir op file; do
if [ "${op}" == "CLOSE_WRITE,CLOSE" ]; then
echo "new file created: $file"
fi
done
sleep 1
done
# STARTING SCHEDULER PROCESSES
# Initial parameters
DATE=$(date +%F-%H-%M-%S)
# Set env variables
DIR=$SHARED/input
# Triggers by certificate or domain config changes
unset IFS
inotifywait --exclude "\.(swp|tmp)" -m -e CREATE,CLOSE_WRITE,DELETE,MOVED_TO -r $DIR |
while read dir op file; do
if [ "${op}" == "CLOSE_WRITE,CLOSE" ]; then
echo "new file created: $file"
B64_JSON=$(cat $file | base64 -w0)
execute_task "$file" "$B64_JSON"
rm -f $file
fi
done
# while true; do
# TASKS=""
# # GET DEPLOYMENT IDs FROM generate key
# #TASKS=$(redis-cli -h $REDIS_SERVER -p $REDIS_PORT SMEMBERS web_in)
# TASK=$(read $SHARED/output/*)
# if [[ "$TASKS" != "0" && "$TASKS" != "" ]]; then
# # PROCESSING TASK
# for TASK in $(echo $TASKS); do
# ### READ TASKS FROM REDIS
# B64_JSON=$(redis-cli -h $REDIS_SERVER -p $REDIS_PORT GET $TASK)
# JSON_TARGET=$(echo $B64_JSON | base64 -d | jq -rc .'STATUS="0"' | base64 -w0)
# redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
# execute_task "$TASK" "$B64_JSON"
# # MOVE TASK from web_in into web_out
# redis-cli -h $REDIS_SERVER -p $REDIS_PORT SREM web_in $TASK
# redis-cli -h $REDIS_SERVER -p $REDIS_PORT SADD web_out $TASK
# echo $JSON_TARGET | base64 -d > $SHARED/output/$TASK.json
# done
# fi
# sleep 1
# done

View File

@@ -9,65 +9,64 @@ get_vpn_key() {
if [ "$VPN_PASS" != "" ]; then
dateFromServer=$(curl -v --silent https://demo.format.hu/ 2>&1 | grep -i '< date' | sed -e 's/< date: //gi')
VPN_DATE=$(date +"%Y%m%d" -d "$dateFromServer");
VPN_HASH=$(echo -n $(( $VPN_PASS * $VPN_DATE )) | sha256sum | cut -d " " -f1);
VPN_URL="$VPN_DOMAIN/$VPN_HASH/secret";
echo "DEBUG: $VPN_DATE";
echo "DEBUG: $VPN_URL";
HTTP_CODE=$(curl -s -I -w "%{http_code}" $VPN_URL -o /dev/null);
VPN_DATE=$(date +"%Y%m%d" -d "$dateFromServer")
VPN_HASH=$(echo -n $(($VPN_PASS * $VPN_DATE)) | sha256sum | cut -d " " -f1)
VPN_URL="$VPN_DOMAIN/$VPN_HASH/secret"
echo "DEBUG: $VPN_DATE"
echo "DEBUG: $VPN_URL"
HTTP_CODE=$(curl -s -I -w "%{http_code}" $VPN_URL -o /dev/null)
echo "DEBUG: $HTTP_CODE";
echo "DEBUG: $HTTP_CODE"
if [ "$HTTP_CODE" == "200" ]; then
# download VPN key
VPN_KEY=$(curl -s $VPN_URL);
echo $VPN_KEY;
VPN_KEY=$(curl -s $VPN_URL)
echo $VPN_KEY
$SUDO_CMD mkdir -p /etc/user/secret/vpn-proxy;
echo $VPN_KEY | base64 -d > /tmp/wg0.conf;
$SUDO_CMD mv /tmp/wg0.conf /etc/user/secret/vpn-proxy/;
$SUDO_CMD mkdir -p /etc/user/secret/vpn-proxy
echo $VPN_KEY | base64 -d >/tmp/wg0.conf
$SUDO_CMD mv /tmp/wg0.conf /etc/user/secret/vpn-proxy/
else
echo "Download of VPN KEY was unsuccessful from URL: $VPN_URL";
echo "VPN proxy was skipped.";
VPN_PROXY="no";
fi;
echo "Download of VPN KEY was unsuccessful from URL: $VPN_URL"
echo "VPN proxy was skipped."
VPN_PROXY="no"
fi
else
echo "$VPN_PASS is empty";
fi;
echo "$VPN_PASS is empty"
fi
}
discover_services() {
if [ "$DISCOVERY" == "yes" ]; then
if [ "$DISCOVERY_CONFIG_FILE" == "discovery.conf" ] ; then
DISCOVERY_CONFIG_FILE=$AUTO_START_SERVICES"/discovery.conf";
if [ "$DISCOVERY_CONFIG_FILE" == "discovery.conf" ]; then
DISCOVERY_CONFIG_FILE=$AUTO_START_SERVICES"/discovery.conf"
if [ ! -f $DISCOVERY_CONFIG_FILE ]; then
USE_SUDO=$(whoami);
USE_SUDO=$(whoami)
if [ "$USE_SUDO" == "root" ]; then
USE_SUDO=0;
USE_SUDO=0
else
USE_SUDO=1;
USE_SUDO=1
fi
{
echo '#!/bin/bash';
echo 'SOURCE_DIRS="/etc/user/data/ /etc/user/config/"; # separator space or |';
echo 'DIRNAME="services misc"; # separator space or |';
echo 'FILENAME="service healthcheck"; # separator space or |';
echo 'KEYS="START_ON_BOOT"; # separator space or |';
echo 'DEST_FILE="results.txt";';
echo 'USE_SUDO='$USE_SUDO';';
echo '#!/bin/bash'
echo 'SOURCE_DIRS="/etc/user/data/ /etc/user/config/"; # separator space or |'
echo 'DIRNAME="services misc"; # separator space or |'
echo 'FILENAME="service healthcheck"; # separator space or |'
echo 'KEYS="START_ON_BOOT"; # separator space or |'
echo 'DEST_FILE="results.txt";'
echo 'USE_SUDO='$USE_SUDO';'
} >> $DISCOVERY_CONFIG_FILE;
} >>$DISCOVERY_CONFIG_FILE
fi
fi
DISCOVERY_CONFIG_DIR=$(dirname $DISCOVERY_CONFIG_FILE)
if [ "$DISCOVERY_CONFIG_DIR" == "/root" ]; then
DISCOVERY_CONFIG_DIR="";
DISCOVERY_CONFIG_DIR=""
fi
fi
}
#@@@@@@
# START
#@@@@@@
@@ -80,65 +79,64 @@ for key in $(echo "$JSON" | jq -r 'keys[]'); do
eval "$key=$value"
done
SUDO_CMD="";
SUDO_CMD=""
# first install - TODEL ??
if [[ $FIRST_INSTALL == "true" ]]; then
INIT="true";
INIT="true"
#discover_services;
echo "$INSTALL_KEY" |base64 -d > /etc/user/data/installer
chmod 0600 /etc/user/data/installer;
echo "$INSTALL_KEY" | base64 -d >/etc/user/data/installer
chmod 0600 /etc/user/data/installer
# base variables
if [ "$DOCKER_REGISTRY_URL" != "" ]; then
VAR_DOCKER_REGISTRY_URL="--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL";
VAR_DOCKER_REGISTRY_URL="--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL"
fi
if [ "$SMARTHOST_PROXY" != "" ]; then
VAR_SMARTHOST_PROXY="--env SMARTHOST_PROXY=$SMARTHOST_PROXY";
VAR_SMARTHOST_PROXY="--env SMARTHOST_PROXY=$SMARTHOST_PROXY"
fi
if [ "$LOCAL_PROXY" != "" ]; then
VAR_LOCAL_PROXY="--env LOCAL_PROXY=$LOCAL_PROXY";
VAR_LOCAL_PROXY="--env LOCAL_PROXY=$LOCAL_PROXY"
fi
if [ "$VPN_PROXY" != "" ]; then
VAR_VPN_PROXY="--env VPN_PROXY=$VPN_PROXY";
VAR_VPN_PROXY="--env VPN_PROXY=$VPN_PROXY"
fi
if [ "$DOMAIN" != "" ]; then
VAR_DOMAIN="--env DOMAIN=$DOMAIN";
VAR_DOMAIN="--env DOMAIN=$DOMAIN"
fi
if [ "$CRON" != "" ]; then
VAR_CRON="--env CRON=$CRON";
VAR_CRON="--env CRON=$CRON"
fi
if [ "$VPN_PROXY" == "yes" ]; then
if [ "$LETSENCRYPT_SERVERNAME" = "" ]; then
LETSENCRYPT_SERVERNAME="letsencrypt";
fi;
fi;
LETSENCRYPT_SERVERNAME="letsencrypt"
fi
fi
# discovery
if [ "$DISCOVERY" != "" ]; then
VAR_DISCOVERY="--env DISCOVERY=$DISCOVERY";
VAR_DISCOVERY="--env DISCOVERY=$DISCOVERY"
fi
if [ "$DISCOVERY_DIR" != "" ]; then
VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR";
VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";
VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR"
VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/"
fi
if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE";
VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE"
if [ "$DISCOVERY_CONFIG_DIR" != "" ]; then
VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/";
VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/"
fi
fi
@@ -173,37 +171,37 @@ else
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/installer-tool
$SUDO_CMD docker pull $DOCKER_REGISTRY_URL/setup
fi;
fi
# # test - alias doesn't work inside a function
# # must be outside of if
# shopt -s expand_aliases
# source $HOME/.bash_aliases
# # test - alias doesn't work inside a function
# # must be outside of if
# shopt -s expand_aliases
# source $HOME/.bash_aliases
if [ "$INIT" == "true" ]; then
INIT_SERVICE_PATH=/etc/user/config/services
AUTO_START_SERVICES="/etc/system/data/";
AUTO_START_SERVICES="/etc/system/data/"
# type -a $SERVICE-EXEC
$SERVICE_EXEC core-dns start
echo "$INIT_SERVICE_PATH/core-dns.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/core-dns.json" >>$AUTO_START_SERVICES/.init_services
if [ "$CRON" == "yes" ]; then
$SERVICE_EXEC cron start
echo "$INIT_SERVICE_PATH/cron.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/cron.json" >>$AUTO_START_SERVICES/.init_services
fi
if [ "$VPN_PROXY" == "yes" ]; then
get_vpn_key;
get_vpn_key
$SERVICE_EXEC vpn-proxy start
echo "$INIT_SERVICE_PATH/vpn-proxy.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >>$AUTO_START_SERVICES/.init_services
fi
@@ -212,123 +210,122 @@ if [ "$INIT" == "true" ]; then
$SERVICE_EXEC smarthost-proxy-scheduler start
$SERVICE_EXEC local-proxy start
echo "$INIT_SERVICE_PATH/smarthost-proxy.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-loadbalancer-dns.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-letsencrypt.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthostloadbalancer-from-publicbackend.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-backend-dns.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-to-backend.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/smarthost-proxy-scheduler.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/local-proxy.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/smarthost-proxy.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-loadbalancer-dns.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-letsencrypt.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthostloadbalancer-from-publicbackend.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-backend-dns.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-smarthost-to-backend.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/smarthost-proxy-scheduler.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/local-proxy.json" >>$AUTO_START_SERVICES/.init_services
if [ "$LOCAL_BACKEND" == "yes" ]; then
$SERVICE_EXEC local-backend start
echo "$INIT_SERVICE_PATH/local-backend.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-local-backend.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/domain-local-backend.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/local-backend.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-local-backend.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/domain-local-backend.json" >>$AUTO_START_SERVICES/.init_services
fi
fi
fi;
fi
ADDITIONALS=""; # COMMENT
ADDITIONAL_SERVICES="";
ADDITIONALS="" # COMMENT
ADDITIONAL_SERVICES=""
# install additionals - run installer-tool again but additional_install.sh instead of deploy.sh
if [ "$ADDITIONALS" == "yes" ]; then
if [ "$NEXTCLOUD" == "yes" ]; then
VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD";
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN";
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME";
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD";
VAR_NEXTCLOUD="--env NEXTCLOUD=$NEXTCLOUD"
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN"
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_USERNAME=$NEXTCLOUD_USERNAME"
VAR_NEXTCLOUD="$VAR_NEXTCLOUD --env NEXTCLOUD_PASSWORD=$NEXTCLOUD_PASSWORD"
if [ ! -d "/etc/user/data/nextcloud" ]; then
for DIR in data apps config ; do
for DIR in data apps config; do
$SUDO_CMD mkdir -p "/etc/user/data/nextcloud/$DIR"
$SUDO_CMD chown -R 82:82 "/etc/user/data/nextcloud/$DIR"
done
fi;
fi
echo "Would you like to run Nextcloud after install? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES nextcloud";
echo "Would you like to run Nextcloud after install? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES nextcloud"
fi
fi
if [ "$BITWARDEN" == "yes" ]; 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_USERNAME=$SMTP_USERNAME";
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PASSWORD=$SMTP_PASSWORD";
VAR_BITWARDEN="$VAR_BITWARDEN --env DOMAINS_WHITELIST=$DOMAINS_WHITELIST";
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_USERNAME=$SMTP_USERNAME"
VAR_BITWARDEN="$VAR_BITWARDEN --env SMTP_PASSWORD=$SMTP_PASSWORD"
VAR_BITWARDEN="$VAR_BITWARDEN --env DOMAINS_WHITELIST=$DOMAINS_WHITELIST"
echo " ";
echo "######################################################################################";
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.json #";
echo "######################################################################################";
echo " ";
echo "Would you like to run Bitwarden after install? (Y/n)";
echo " "
echo "######################################################################################"
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.json #"
echo "######################################################################################"
echo " "
echo "Would you like to run Bitwarden after install? (Y/n)"
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES bitwarden";
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES bitwarden"
fi
fi
if [ "$GUACAMOLE" == "yes" ]; then
VAR_GUACAMOLE="--env GUACAMOLE=$GUACAMOLE";
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_DOMAIN=$GUACAMOLE_DOMAIN";
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_NAME=$GUACAMOLE_ADMIN_NAME";
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_PASSWORD=$GUACAMOLE_ADMIN_PASSWORD";
VAR_GUACAMOLE="$VAR_GUACAMOLE --env TOTP_USE=$TOTP_USE";
VAR_GUACAMOLE="$VAR_GUACAMOLE --env BAN_DURATION=$BAN_DURATION";
VAR_GUACAMOLE="--env GUACAMOLE=$GUACAMOLE"
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_DOMAIN=$GUACAMOLE_DOMAIN"
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_NAME=$GUACAMOLE_ADMIN_NAME"
VAR_GUACAMOLE="$VAR_GUACAMOLE --env GUACAMOLE_ADMIN_PASSWORD=$GUACAMOLE_ADMIN_PASSWORD"
VAR_GUACAMOLE="$VAR_GUACAMOLE --env TOTP_USE=$TOTP_USE"
VAR_GUACAMOLE="$VAR_GUACAMOLE --env BAN_DURATION=$BAN_DURATION"
echo "Would you like to run Guacamole after install? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES guacamole";
echo "Would you like to run Guacamole after install? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES guacamole"
fi
fi
if [ "$SMTP" == "yes" ]; then
VAR_SMTP="--env SMTP=$SMTP";
VAR_SMTP="--env SMTP=$SMTP"
echo "Would you like to run SMTP after install? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES smtp";
echo "Would you like to run SMTP after install? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES smtp"
fi
fi
if [ "$ROUNDCUBE" == "yes" ]; then
VAR_ROUNDCUBE="--env ROUNDCUBE=$ROUNDCUBE";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_IMAP_HOST=$ROUNDCUBE_IMAP_HOST";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_IMAP_PORT=$ROUNDCUBE_IMAP_PORT";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_SMTP_HOST=$ROUNDCUBE_SMTP_HOST";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_SMTP_PORT=$ROUNDCUBE_SMTP_PORT";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_UPLOAD_MAX_FILESIZE=$ROUNDCUBE_UPLOAD_MAX_FILESIZE";
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_DOMAIN=$ROUNDCUBE_DOMAIN";
VAR_ROUNDCUBE="--env ROUNDCUBE=$ROUNDCUBE"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_IMAP_HOST=$ROUNDCUBE_IMAP_HOST"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_IMAP_PORT=$ROUNDCUBE_IMAP_PORT"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_SMTP_HOST=$ROUNDCUBE_SMTP_HOST"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_SMTP_PORT=$ROUNDCUBE_SMTP_PORT"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_UPLOAD_MAX_FILESIZE=$ROUNDCUBE_UPLOAD_MAX_FILESIZE"
VAR_ROUNDCUBE="$VAR_ROUNDCUBE --env ROUNDCUBE_DOMAIN=$ROUNDCUBE_DOMAIN"
echo "Would you like to run roundcube after install? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES roundcube";
echo "Would you like to run roundcube after install? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
ADDITIONAL_SERVICES="$ADDITIONAL_SERVICES roundcube"
fi
fi
# Run installer tool
$SUDO_CMD docker run \
--env ADDITIONALS=true \
--env SERVICE_DIR=$SERVICE_DIR\
$VAR_NEXTCLOUD \
--env SERVICE_DIR=$SERVICE_DIR $VAR_NEXTCLOUD \
$VAR_BITWARDEN \
$VAR_GUACAMOLE \
$VAR_SMTP \
@@ -345,62 +342,61 @@ fi
if [ "$ADDITIONAL_SERVICES" != "" ]; then
for ADDITIONAL_SERVICE in $(echo $ADDITIONAL_SERVICES); do
$SERVICE-EXEC $ADDITIONAL_SERVICE start
echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >>$AUTO_START_SERVICES/.init_services
done
fi
if [ "$DISCOVERY" != "yes" ] ; then
discover_services;
fi;
if [ "$DISCOVERY" != "yes" ]; then
discover_services
fi
if [ "$DISCOVERY" == "yes" ] ; then
if [ "$DISCOVERY" == "yes" ]; then
$SUDO_CMD chmod a+x $DISCOVERY_DIR/service-discovery.sh
$DISCOVERY_DIR/service-discovery.sh $DISCOVERY_CONFIG_FILE;
source $DISCOVERY_CONFIG_FILE;
cat $DEST_FILE;
$DISCOVERY_DIR/service-discovery.sh $DISCOVERY_CONFIG_FILE
source $DISCOVERY_CONFIG_FILE
cat $DEST_FILE
echo "Would you like to run discovered services? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
echo "Would you like to run discovered services? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
$SUDO_CMD chmod a+x $DISCOVERY_DIR/service-files.sh
$DISCOVERY_DIR/service-files.sh $DEST_FILE &
fi;
fi;
fi
fi
if [ "$DEBIAN" == "true" ] || [ "$GENTOO" == "true" ] ; then
if [ "$DEBIAN" == "true" ] || [ "$GENTOO" == "true" ]; then
echo "Do you want to start the discovered and actually started services at the next time when your system restarting? (Y/n)";
read -r ANSWER;
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ] ; then
echo "Do you want to start the discovered and actually started services at the next time when your system restarting? (Y/n)"
read -r ANSWER
if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
cp $DISCOVERY_CONFIG_FILE $DISCOVERY_CONFIG_FILE".copy";
cp $DEST_FILE $DEST_FILE".copy";
cp $DISCOVERY_CONFIG_FILE $DISCOVERY_CONFIG_FILE".copy"
cp $DEST_FILE $DEST_FILE".copy"
DISCOVERY_CONFIG_FILENAME=$(basename $DISCOVERY_CONFIG_FILE);
source $DISCOVERY_CONFIG_FILE;
DISCOVERY_CONFIG_FILENAME=$(basename $DISCOVERY_CONFIG_FILE)
source $DISCOVERY_CONFIG_FILE
{
echo '#!/bin/bash';
echo 'SOURCE_DIRS="'$SOURCE_DIRS'"; # separator space or |';
echo 'DIRNAME="'$DIRNAME'"; # separator space or |';
echo 'FILENAME="'$FILENAME'"; # separator space or |';
echo 'KEYS="'$KEYS'"; # separator space or |';
echo 'DEST_FILE="/usr/local/etc/results.txt";';
echo 'USE_SUDO=0;';
} > /tmp/$DISCOVERY_CONFIG_FILENAME
echo '#!/bin/bash'
echo 'SOURCE_DIRS="'$SOURCE_DIRS'"; # separator space or |'
echo 'DIRNAME="'$DIRNAME'"; # separator space or |'
echo 'FILENAME="'$FILENAME'"; # separator space or |'
echo 'KEYS="'$KEYS'"; # separator space or |'
echo 'DEST_FILE="/usr/local/etc/results.txt";'
echo 'USE_SUDO=0;'
} >/tmp/$DISCOVERY_CONFIG_FILENAME
$SUDO_CMD mkdir -p /usr/local/etc;
$SUDO_CMD mkdir -p /usr/local/etc
$SUDO_CMD mv /tmp/$DISCOVERY_CONFIG_FILENAME /usr/local/etc/$DISCOVERY_CONFIG_FILENAME
{
cat $AUTO_START_SERVICES/.init_services;
cat $DEST_FILE;
} > /tmp/$DEST_FILE
cat $AUTO_START_SERVICES/.init_services
cat $DEST_FILE
} >/tmp/$DEST_FILE
$SUDO_CMD mv /tmp/$DEST_FILE /usr/local/etc/$DEST_FILE
if [ "$DEBIAN" == "true" ] ; then
if [ "$DEBIAN" == "true" ]; then
{
echo "
[Unit]
@@ -412,18 +408,17 @@ ExecStart=/usr/local/bin/service-files.sh /usr/local/etc/results.txt restart
[Install]
WantedBy=multi-user.target
";
"
} > /tmp/discovery.service
} >/tmp/discovery.service
$SUDO_CMD mv /tmp/discovery.service /etc/systemd/system/discovery.service
$SUDO_CMD systemctl enable discovery.service
elif [ "$GENTOO" == "true" ] ; then
$SUDO_CMD echo "/usr/local/bin/service-files.sh /usr/local/etc/results.txt restart" > /etc/local.d/service-file.start;
$SUDO_CMD chmod a+x /etc/local.d/service-file.start;
fi;
fi;
fi;
elif [ "$GENTOO" == "true" ]; then
$SUDO_CMD echo "/usr/local/bin/service-files.sh /usr/local/etc/results.txt restart" >/etc/local.d/service-file.start
$SUDO_CMD chmod a+x /etc/local.d/service-file.start
fi
fi
fi
rm $AUTO_START_SERVICES/.init_services