From 1d6d8c874e12c47572c25424aaef64e3ec14197a Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 18 Apr 2020 20:08:17 +0200 Subject: [PATCH] Fix. --- buster/apt-mark/dumpsite | 1 - .../etc_files/website/etc/nginx/sites-available/website.nginx | 2 +- buster/setup_scripts/setup_website.sh | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buster/apt-mark/dumpsite b/buster/apt-mark/dumpsite index 63ba08e..a87852a 100644 --- a/buster/apt-mark/dumpsite +++ b/buster/apt-mark/dumpsite @@ -1,4 +1,3 @@ -pwgen wget # for blog and zettel pandoc diff --git a/buster/etc_files/website/etc/nginx/sites-available/website.nginx b/buster/etc_files/website/etc/nginx/sites-available/website.nginx index 2da877b..cbad304 100644 --- a/buster/etc_files/website/etc/nginx/sites-available/website.nginx +++ b/buster/etc_files/website/etc/nginx/sites-available/website.nginx @@ -32,7 +32,7 @@ server { } # login-protected IRC logs - location ~ /irclogs/([^/]+)/ { + location ~ ^/irclogs/([^/]+)/ { auth_basic "$1 logs"; auth_basic_user_file /var/www/irclogs_pw/$1; autoindex on; diff --git a/buster/setup_scripts/setup_website.sh b/buster/setup_scripts/setup_website.sh index f781905..9394a94 100755 --- a/buster/setup_scripts/setup_website.sh +++ b/buster/setup_scripts/setup_website.sh @@ -9,7 +9,7 @@ if [ ! "$4" = "copy" ] && [ ! "$4" = "new" ] && [ ! "$4" = "upgrade" ]; then echo "Need init state to be either 'copy' or 'new' or 'upgrade'" false fi -if [ ! "$4" = "new" ] and [ "$#" -ne 5 ]; then +if [ ! "$4" = "new" ] && [ "$#" -ne 5 ]; then echo "With init state != 'new' need fifth argument old server IP." false fi @@ -71,7 +71,7 @@ if [ "${init_state}" = "upgrade" ]; then # This assumes the old core.plomlompom.com filesystem hierarchy. su -lc "cd /var/repos && git clone --mirror ${old_server}:repos/website" plom elif [ "${init_state}" = "new" ]; then - su -lc "cd /var/repos && git init --bare website" plom + su -lc "cd /var/repos && git init --bare website.git" plom fi # TODO: find out whether this can be part of cloned repo …? cp "${config_tree_prefix}/other_files/website_hook_post-receive" /var/repos/website.git/hooks/post-receive -- 2.30.2