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

diff --git a/dotfiles/user/thinkpad/minimal/pentadactylrc b/dotfiles/user/thinkpad/minimal/pentadactylrc
index dfd8d4f83c858a5c67f2af0c48ae2bce299cca3e..5f62966ae66a7b4f8619893e5ba66cba9b756b19 100644 (file)
--- a/dotfiles/user/thinkpad/minimal/pentadactylrc
+++ b/dotfiles/user/thinkpad/minimal/pentadactylrc
@@ -4,7 +4,7 @@ set! network.cookie.lifetimePolicy=2
 set! browser.formfill.enable=false
 set! browser.block.target_new_window=true
 set! browser.download.lastDir=~/downloads
-set! javascript.enabled=false
+"set! javascript.enabled=false
 "set! permissions.default.image=2
 set! general.useragent.override=foo
 set! signon.rememberSignons=false

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 6d12cef1815eb6bf1ab4d1055b2abfc2a904d04a..0b628e520d87425aea8106a8e060efea46042dc4 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -319,7 +319,7 @@ elif [ "$1" = "thinkpad" ]; then
     apt-get -y install x11-xserver-utils
 
     # Set up pentadactyl. 
-    apt-get -y install iceweasel
+    apt-get -y install iceweasel xul-ext-noscript
     apt-get -y -t jessie-backports install xul-ext-pentadactyl
     apt-get -y install vim-gtk
     su plom -c 'mkdir -p /home/plom/downloads/'

diff --git a/notes b/notes
new file mode 100644 (file)
index 0000000..1dcf1b4
--- /dev/null
+++ b/notes
@@ -0,0 +1,54 @@
+some stuff I need to incorporate later on:
+
+the blog post-update git hook:
+
+
+
+#!/bin/sh
+blog_dir=~/blog
+export GIT_DIR=$(pwd)
+export GIT_WORK_TREE="$blog_dir"
+git checkout -f
+cd "$GIT_WORK_TREE"
+redo
+git add metadata/author metadata/url metadata/title metadata/*.tmpl metadata/automatic_metadata captchas/linkable/*
+count=$(ls -1 metadata/*.automatic_metadata 2>/dev/null | wc -l)
+if [ "$count" != 0 ]; then
+  git add metadata/*.automatic_metadata
+fi
+status=$(git status -s)
+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 07d6bdebf7e80f38f8cb078185ff593ea9521cc4..3def78da74abf407fcd91de8a0b62c137931ecef 100644 (file)
--- 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