Improve post-wiki setup.

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index efe7bb29b627d2d3d0169ed2c2202aef692ef879..6a5af271e128cfc53fa444e411a19c9d6d5351ee 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -266,7 +266,7 @@ if [ "$1" = "server" ]; then
         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'
-        apt-get -y isntall python3-docutils
+        apt-get -y install pandoc
     fi
 
 elif [ "$1" = "thinkpad" ]; then

diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf
index 4bb06e5fd7902ea731b6b136af38d2c19dd27708..b9f1005591263b51a0bc4ac6d6cca1df58c25e7c 100644 (file)
--- a/systemfiles/nginx.conf
+++ b/systemfiles/nginx.conf
@@ -12,8 +12,7 @@ http {
             text/html                             html htm shtml;
             text/css                              css;
             text/xml                              xml;
-            text/plain                            txt;
-            text/plain                            sh;
+            text/plain                            txt sh rst;
             application/xhtml+xml                 xhtml;
             application/pdf                       pdf;
             image/jpeg                            jpg jpeg;
@@ -39,6 +38,7 @@ 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/ {
                         autoindex on;
                 }

diff --git a/systemfiles/post-update b/systemfiles/post-update
index 325d94fb203c991ab32fa4739ddfc5b1f64a0c56..51742fb57d95e716c25370596a12cbb10135fbc2 100755 (executable)
--- a/systemfiles/post-update
+++ b/systemfiles/post-update
@@ -1,4 +1,4 @@
 #!/bin/sh
 LIFELOGDIR=/home/plom/lifelog
 GIT_WORK_TREE=$LIFELOGDIR git checkout -f
-find $LIFELOGDIR -name "*.rst" -exec sh -c 'rst2html $0 > ${0%.rst}.html' {} \;
+find $LIFELOGDIR -name "*.rst" -type f -exec sh -c 'pandoc -s -f rst --mathml -t html5 $0 > ${0%.rst}.html' {} \;