Merge branch 'master' of http://github.com/plomlompom/config

diff --git a/bin/plomlombot.sh b/bin/plomlombot.sh
index 01d0a7b494d6ac2406dd697ab8f62e5a7c3ff330..1153d2dfa179629d5973c7a30a912990fc92cf5b 100755 (executable)
--- a/bin/plomlombot.sh
+++ b/bin/plomlombot.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd ~/plomlombot-irc
-./run.sh -r 604800 "#zrolaps"
+./run.sh -r 604800 -n botlomplom "#zrolaps"

diff --git a/bin/zinskritik.sh b/bin/zinskritik.sh
index 0d1379b1c85bef44744199e09a7455fea8b9dc4a..9ad293aff6c888408a123fb1053114b59786b0ec 100755 (executable)
--- a/bin/zinskritik.sh
+++ b/bin/zinskritik.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd ~/plomlombot-irc
-./run.sh -r 604800 -n zinskritik "#freie-gesellschaft"
+./run.sh -r 604800 -n histomat "#freie-gesellschaft"

diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf
index ffbe96bfba486885c00cab55e7c04c59ea2c03f9..07d6bdebf7e80f38f8cb078185ff593ea9521cc4 100644 (file)
--- a/systemfiles/nginx.conf
+++ b/systemfiles/nginx.conf
@@ -12,7 +12,7 @@ http {
             text/html                             html htm shtml;
             text/css                              css;
             text/xml                              xml;
-            text/plain                            txt sh rst;
+            text/plain                            txt sh rst md;
             application/xhtml+xml                 xhtml;
             application/pdf                       pdf;
             image/jpeg                            jpg jpeg;
@@ -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 ^(/zettel/(.*/)*[^./]+)$ $1.html;
                 location /zettel/ {
+                        rewrite ^(/zettel/(.*/)*[^./]+)$ $1.html;
                         autoindex on;
                 }
                 location /dump/ {