s/lifelog/zettel/g

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index cd3d00c611b92b31ca4a226834ed307bf88ebe7b..a536eee24d8c215ff1c4b626eb402a0de8abd862 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -261,11 +261,11 @@ if [ "$1" = "server" ]; then
         ln -s /home/plom/geheim/ /var/www/html/geheim
         su - plom -c 'mkdir -p /home/plom/lesekreis'
         ln -s /home/plom/geheim/ /var/www/html/lesekreis
-        su - plom -c 'mkdir -p /home/plom/lifelog'
-        ln -s /home/plom/lifelog/ /var/www/html/lifelog
-        su - plom -c 'git init --bare /home/plom/lifelog.git'
-        su - plom -c 'cp ~/config/systemfiles/post-update ~/lifelog.git/hooks/'
-        su - plom -c 'chmod a+x /home/plom/lifelog.git/hooks/post-update'
+        su - plom -c 'mkdir -p /home/plom/zettel'
+        ln -s /home/plom/zettel/ /var/www/html/zettel
+        su - plom -c 'git init --bare /home/plom/zettel.git'
+        su - plom -c 'cp ~/config/systemfiles/post-update ~/zettel.git/hooks/'
+        su - plom -c 'chmod a+x /home/plom/zettel.git/hooks/post-update'
 
         # Install website generator tools
         apt-get -y install pandoc wget

diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf
index b9f1005591263b51a0bc4ac6d6cca1df58c25e7c..ffbe96bfba486885c00cab55e7c04c59ea2c03f9 100644 (file)
--- a/systemfiles/nginx.conf
+++ b/systemfiles/nginx.conf
@@ -38,8 +38,8 @@ http {
                 ssl_certificate /etc/letsencrypt/live/dump.plomlompom.com/fullchain.pem;
                 ssl_certificate_key /etc/letsencrypt/live/dump.plomlompom.com/privkey.pem;
                 root /var/www/html/;
-                rewrite ^(/lifelog/(.*/)*[^./]+)$ $1.html;
-                location /lifelog/ {
+                rewrite ^(/zettel/(.*/)*[^./]+)$ $1.html;
+                location /zettel/ {
                         autoindex on;
                 }
                 location /dump/ {