run additionals only

install.sh

@@ -69,7 +69,9 @@ ask_envs() {
                 fi;
                 echo "Invalid email address.";
 	done
+}
 
+discover_services() {
 	echo "Would you like to discover services? (Y/n)";
 	read -r ANSWER;
 	if [ "$ANSWER" == "n" ] || [ "$ANSWER" == "N" ]; then
@@ -96,7 +98,6 @@ ask_envs() {
 		fi
 		DISCOVERY_CONFIG_DIR=$(dirname $DISCOVERY_CONFIG_FILE)
 	fi
-
 }
 
 check_dirs_and_files() {
@@ -344,105 +345,110 @@ if [ "$USER" != "root" ] ; then
 	fi;
 fi;
 
-echo "Would you like to install/update docker? (y/N)";
+# first install
-read -r ANSWER;
+if [ ! -f "/etc/user/config/system.json" ]; then
-if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then
+
+	echo "Would you like to install/update docker? (y/N)";
+	read -r ANSWER;
+	if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then
 		#install_docker_deb;
 		# install docker using apt-get
 		install_docker_apt
 
 		echo "Wait..."
 		sleep 5
-fi
+	fi
 
-check_running;
+	check_running;
 
-check_dirs_and_files;
+	check_dirs_and_files;
 
-ask_envs;
+	ask_envs;
 	
-$SUDO_CMD docker pull registry.format.hu/installer-tool
+	discover_services;
 
-# Validating previously created vaiables
+	$SUDO_CMD docker pull registry.format.hu/installer-tool
 
-if [ "$SMARTHOST_PROXY" != "" ]; then
+	# Validating previously created vaiables
+
+	if [ "$SMARTHOST_PROXY" != "" ]; then
 		VAR_SMARTHOST_PROXY="--env SMARTHOST_PROXY=$SMARTHOST_PROXY";
-fi
+	fi
 
-if [ "$LOCAL_PROXY" != "" ]; then
+	if [ "$LOCAL_PROXY" != "" ]; then
 		VAR_LOCAL_PROXY="--env LOCAL_PROXY=$LOCAL_PROXY";
-fi
+	fi
 
-if [ "$VPN_PROXY" != "" ]; then
+	if [ "$VPN_PROXY" != "" ]; then
 		VAR_VPN_PROXY="--env VPN_PROXY=$VPN_PROXY";
-fi
+	fi
 
-if [ "$DOMAIN" != "" ]; then
+	if [ "$DOMAIN" != "" ]; then
 		VAR_DOMAIN="--env DOMAIN=$DOMAIN";
-fi
+	fi
 
-if [ "$CRON" != "" ]; then
+	if [ "$CRON" != "" ]; then
 		VAR_CRON="--env CRON=$CRON";
-fi
+	fi
 
-if [ "$DISCOVERY" != "" ]; then
+	if [ "$DISCOVERY" != "" ]; then
 		VAR_DISCOVERY="--env DISCOVERY=$DISCOVERY";
-fi
+	fi
 
-if [ "$DISCOVERY_DIR" != "" ]; then
+	if [ "$DISCOVERY_DIR" != "" ]; then
 		VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR";
 		VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";
-fi
+	fi
 
-if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
+	if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
 		VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE";
 		VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/";
-fi
+	fi
 
 
-# Run installer tool
+	# Run installer tool
 
-$SUDO_CMD docker run \
+	$SUDO_CMD docker run \
-$VAR_SMARTHOST_PROXY \
+	$VAR_SMARTHOST_PROXY \
-$VAR_LOCAL_PROXY \
+	$VAR_LOCAL_PROXY \
-$VAR_VPN_PROXY \
+	$VAR_VPN_PROXY \
-$VAR_DOMAIN \
+	$VAR_DOMAIN \
-$VAR_CRON \
+	$VAR_CRON \
-$VAR_DISCOVERY \
+	$VAR_DISCOVERY \
-$VAR_DISCOVERY_DIR \
+	$VAR_DISCOVERY_DIR \
-$VAR_DISCOVERY_DIRECTORY \
+	$VAR_DISCOVERY_DIRECTORY \
-$VAR_DISCOVERY_CONFIG_FILE \
+	$VAR_DISCOVERY_CONFIG_FILE \
-$VAR_DISCOVERY_CONFIG_DIRECTORY \
+	$VAR_DISCOVERY_CONFIG_DIRECTORY \
---volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
+	--volume $HOME/.ssh/installer:/root/.ssh/id_rsa \
---volume /etc/user/:/etc/user/ \
+	--volume /etc/user/:/etc/user/ \
---volume /etc/system/:/etc/system/ \
+	--volume /etc/system/:/etc/system/ \
---env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL registry.format.hu/installer-tool
+	--env LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL registry.format.hu/installer-tool
 
 
-# test - alias doesn't work inside a function
+	# test - alias doesn't work inside a function
-shopt -s expand_aliases
+	shopt -s expand_aliases
-source $HOME/.bash_aliases
+	source $HOME/.bash_aliases
 
-INIT_SERVICE_PATH=/etc/user/config/services
+	INIT_SERVICE_PATH=/etc/user/config/services
 
-service-debian core-dns start
+	service-debian core-dns start
-echo "$INIT_SERVICE_PATH/core-dns.json" >> $PWD/.init_services
+	echo "$INIT_SERVICE_PATH/core-dns.json" >> $PWD/.init_services
 
-if [ "$CRON" == "yes" ]; then
+	if [ "$CRON" == "yes" ]; then
 		service-debian cron start
 		echo "$INIT_SERVICE_PATH/cron.json" >> $PWD/.init_services
-fi
+	fi
 
-if [ "$VPN_PROXY" == "yes" ]; then
+	if [ "$VPN_PROXY" == "yes" ]; then
 		service-debian vpn-proxy start
 		echo "$INIT_SERVICE_PATH/vpn-proxy.json" >> $PWD/.init_services
 		echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >> $PWD/.init_services 
 		echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >> $PWD/.init_services
 		echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >> $PWD/.init_services
 
-fi
+	fi
 
-if [ "$SMARTHOST_PROXY" == "yes" ]; then
+	if [ "$SMARTHOST_PROXY" == "yes" ]; then
 		service-debian smarthost-proxy start
 		service-debian smarthost-proxy-scheduler start
 		service-debian local-proxy start
@@ -464,8 +470,9 @@ if [ "$SMARTHOST_PROXY" == "yes" ]; then
 			echo "$INIT_SERVICE_PATH/firewall-local-backend.json" >> $PWD/.init_services
 			echo "$INIT_SERVICE_PATH/domain-local-backend.json" >> $PWD/.init_services
 		fi
-fi
+	fi
 
+fi;
 
 # install additionals - run installer-tool again but additional_install.sh instead of deploy.sh
 echo "Would you like to install additional applications? (Y/n)";
@@ -523,6 +530,8 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ] || [ "$ANSWER" == "" ]; then
 			echo "$INIT_SERVICE_PATH/$ADDITIONAL_SERVICE.json" >> $PWD/.init_services
 		done
 	fi
+
+	discover_services;
 fi
 
 if [ "$DISCOVERY" == "yes" ] ; then