Minor changes & fixes

data/include/functions/menu_functions.sh

@@ -650,7 +650,7 @@ remove_nginx_conf() {
 disconnect_from_dockerbunker_network() {
 	for container in ${add_to_network[@]};do
 		[[ $container && $(docker ps -q --filter name=^/${container}$) ]] \
-			&&  docker network disconnect ${NETWORK} $container >/dev/null
+			&&  docker network disconnect --force ${NETWORK} $container >/dev/null
 	done
 }
 
@@ -722,6 +722,8 @@ stop_all() {
 
 destroy_all() {
 	# destroy_service() is calling restart_nginx, we don't want this happening after each service is destroyed
+	[[ -z ${CONF_DIR} || -z ${ENV_DIR} || -z ${SERVICES_DIR} ]] \
+		&& echo "Something went wrong. Exiting."
 	export prevent_nginx_restart=1
 	export destroy_all=1
 	all_services=( "${INSTALLED_SERVICES[@]}" "${CONFIGURED_SERVICES[@]}" )
@@ -757,9 +759,7 @@ if [[ "$i" == ${all_services[-1]} ]];then \
 			&& rm -r "${CONF_DIR}"/nginx/ssl/$cert_dir
 	done
 	
-	[[ -d "${ENV_DIR}"/static ]] \
-		&& [[ $(ls -A "${ENV_DIR}"/static) ]] \
-		&& rm "${ENV_DIR}"/static/*
+	rm -rf "${ENV_DIR}"/*
 }
 
 add_ssl_menuentry() {

data/include/functions/setup_functions.sh

@@ -139,7 +139,7 @@ initial_setup_routine() {
 	setup_nginx
 
 	for container in "${containers[@]}";do
-		[[ ( $(docker inspect $container 2> /dev/null) &&  $? == 0 ) ]] && docker rm $container
+		[[ ( $(docker inspect $container 2> /dev/null) &&  $? == 0 ) ]] && docker rm -f $container
 	done
 
 	docker_pull
@@ -280,6 +280,8 @@ post_setup_routine() {
 
 	if [[ $SSL_CHOICE == "le" ]] && [[ ! -d "${CONF_DIR}"/nginx/ssl/letsencrypt/${SERVICE_DOMAIN[0]} ]];then
 		letsencrypt issue
+	else
+		restart_nginx
 	fi
 }
 

dockerbunker.sh

@@ -72,13 +72,13 @@ count=$((${#AVAILABLE_SERVICES[@]}+1))
 	&& count=$(($count+2))
 
 [[ -d "${CONF_DIR}"/nginx/ssl/letsencrypt/live ]] \
+	&& [[ ${#INSTALLED_SERVICES[@]} > 0 ]] \
 	&& [[ $(ls -A "${CONF_DIR}"/nginx/ssl/letsencrypt/live) ]] \
 	&& AVAILABLE_SERVICES+=( "$renewcerts" ) && cound=$(($count+1))
 
 [[ ${#INSTALLED_SERVICES[@]} > 0 \
 	|| ${#STATIC_SITES[@]} > 0 \
-	|| ${#CONFIGURED_SERVICES[@]} > 0 \
-	|| -f "${BASE_DIR}"/data/env/dockerbunker.env ]] \
+	|| ${#CONFIGURED_SERVICES[@]} > 0 ]] \
 	&& AVAILABLE_SERVICES+=( "$destroyall" ) \
 	&&  count=$(($count+1))