From c10c4de276e734a01b731bce70575918c0486f2b Mon Sep 17 00:00:00 2001 From: Christian Heller <c.heller@plomlompom.de> Date: Thu, 26 Jan 2017 04:02:36 +0100 Subject: [PATCH] Extend data about url catcher stuff. --- notes | 31 +++++++++++++++++++++++++++++++ systemfiles/nginx.conf | 5 +++++ 2 files changed, 36 insertions(+) diff --git a/notes b/notes index bdc1902..1dcf1b4 100644 --- a/notes +++ b/notes @@ -21,3 +21,34 @@ n_updates=$(printf "$status" | grep -vE '^\?\?' | wc -l) if [ "$n_updates" -gt 0 ]; then git commit -a -m 'Update metadata' fi + + +furthermore, the url_catcher virtualenv run.sh script needs this (to compile uwsgi): + +apt-get install python3.4-dev + + +also, these: + +# /etc/systemd/system/url_catcher.service + +[Unit] +Description=URL catcher + +[Service] +Type=forking +User=plom +ExecStart=/bin/sh -c 'LC_ALL=en_US.UTF8 screen -d -m ~/url_catcher.sh' + +[Install] +WantedBy=multi-user.target + + + +and url_catcher.sh: + +#!/bin/sh + +cd ~ +cd url-catcher +./run.sh diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf index 07d6bde..3def78d 100644 --- a/systemfiles/nginx.conf +++ b/systemfiles/nginx.conf @@ -39,6 +39,7 @@ http { ssl_certificate_key /etc/letsencrypt/live/dump.plomlompom.com/privkey.pem; root /var/www/html/; location /zettel/ { + # rewrite non-suffixed filenames to .html ones rewrite ^(/zettel/(.*/)*[^./]+)$ $1.html; autoindex on; } @@ -70,6 +71,10 @@ http { auth_basic_user_file /var/www/password_lesekreis; autoindex on; } + location /uwsgi/ { + include uwsgi_params; + uwsgi_pass 127.0.0.1:3031; + } } # htwtxt -- 2.30.2