From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 11 Sep 2016 08:07:07 +0000 (+0200)
Subject: s/lifelog/zettel/g
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/day?a=commitdiff_plain;h=d21b4dc9cb8bee7d96187d7d594016ae2003f1e7;p=config

s/lifelog/zettel/g
---

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index cd3d00c..a536eee 100755
--- 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 b9f1005..ffbe96b 100644
--- 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/ {