summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml (renamed from docker-compose-vps.yml)0
-rw-r--r--server.sh8
2 files changed, 1 insertions, 7 deletions
diff --git a/docker-compose-vps.yml b/docker-compose.yml
index fd91317..fd91317 100644
--- a/docker-compose-vps.yml
+++ b/docker-compose.yml
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" ;;