From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 11 Dec 2016 23:52:11 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=commitdiff_plain;h=0b249bce6bfeddf4f49a3fc12eac9a723744c553;hp=9dee35acb05c7113b70cb300fdd404e2772d4853;p=config

Merge branch 'master' of github.com/plomlompom/config
---

diff --git a/bin/plomlombot.sh b/bin/plomlombot.sh
index 01d0a7b..1153d2d 100755
--- 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 0d1379b..9ad293a 100755
--- 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 ffbe96b..07d6bde 100644
--- 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/ {