Fix.

diff --git a/buster/apt-mark/dumpsite b/buster/apt-mark/dumpsite
index 63ba08e2426b352f06213d9168c1f2f0ee8ae693..a87852a1712c96abac5b994e4fecb58fcdf928a8 100644 (file)
--- 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 2da877b268df37d512f4df1aa89bea23badc6e49..cbad304d8e8060c0c69c2e4ee169b32e92757057 100644 (file)
--- 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 f781905cc6ce4ea10770c7bde7cf55a66d26ea91..9394a94820b1c77342d3e1b7da9ebd8ba6c87b4f 100755 (executable)
--- 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