From a39d455555f66c4059208360f0ebf514390af31f Mon Sep 17 00:00:00 2001
From: breadcat
Date: Sun, 4 Sep 2022 00:24:39 +0100
Subject: Revert earlier split commit

I'm not using docker on my NAS now, probably for the best in the long run
---
 server.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'server.sh')

diff --git a/server.sh b/server.sh
index 4843fda..e202ee8 100644
--- a/server.sh
+++ b/server.sh
@@ -108,11 +108,7 @@ function docker_build {
 	fi
 	# start containers
 	echo Starting docker containers
-	case $HOSTNAME in
-	"$name_vps") docker-compose -f docker-compose-vps.yml up -d --remove-orphans ;;
-	"$name_nas") docker-compose -f docker-compose-nas.yml up -d --remove-orphans ;;
-	*) echo "I'm unsure of which host you're running this on. Exiting" && rm "$directory_script/.env" && exit 0 ;;
-	esac
+	docker-compose up -d --remove-orphans
 	# rewrite htpasswd
 	printf "%s%s" "$(password_manager user 'htpasswd')" "$(htpasswd -bnBC 10 "" "$(password_manager pass 'htpasswd')")" >"$(find_directory config)/traefik/htpasswd"
 	# delete temporary env file
@@ -510,8 +506,6 @@ function main {
 	backup_prefix="backup-"
 	domain="$(awk -F'"' '/domain/ {print $2}' "$(find_directory traefik)/traefik.toml")"
 	directory_script="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-	name_vps="finland"
-	name_nas="lilnas"
 	case "$1" in
 	backup) backup_docker ;;
 	bookmarks) grep -P "\t\t\t\<li\>" "$(find_directory startpage)/index.html" | sort -t\> -k3 >"$(find_directory startpage)/bookmarks.txt" ;;
-- 
cgit v1.2.3