From 585778d04ae79002ed69922134895cd46ccc51b9 Mon Sep 17 00:00:00 2001
From: Aiko Mastboom <git@aiko.sh>
Date: Sun, 6 Nov 2016 11:34:24 +0100
Subject: [PATCH] updates

---
 mywiki/tiddlers/Ad blocking.tid               | 13 +++++++++++++
 mywiki/tiddlers/ReCom Calenta.tid             | 16 ++++++++++++++++
 mywiki/tiddlers/use usb stick with docker.tid |  6 ++----
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 mywiki/tiddlers/Ad blocking.tid
 create mode 100644 mywiki/tiddlers/ReCom Calenta.tid

diff --git a/mywiki/tiddlers/Ad blocking.tid b/mywiki/tiddlers/Ad blocking.tid
new file mode 100644
index 0000000..8616c4a
--- /dev/null
+++ b/mywiki/tiddlers/Ad blocking.tid	
@@ -0,0 +1,13 @@
+created: 20161101113820494
+creator: user
+modified: 20161101113933747
+modifier: user
+tags: docker [[raspberry pi]]
+title: Ad blocking
+type: text/vnd.tiddlywiki
+
+; NETWORK-WIDE, HARDWARE AD BLOCKING
+: https://pi-hole.net
+
+; Running Pi-Hole Docker
+: https://hub.docker.com/r/diginc/pi-hole/
\ No newline at end of file
diff --git a/mywiki/tiddlers/ReCom Calenta.tid b/mywiki/tiddlers/ReCom Calenta.tid
new file mode 100644
index 0000000..d977564
--- /dev/null
+++ b/mywiki/tiddlers/ReCom Calenta.tid	
@@ -0,0 +1,16 @@
+created: 20161101113334491
+creator: user
+modified: 20161101113516238
+modifier: user
+tags: 
+title: ReCom Calenta
+type: text/vnd.tiddlywiki
+
+; Monitoring the Remeha Calenta
+: http://blog.hekkers.net/2010/10/03/monitoring-the-remeha-calenta/
+
+; Recom over ethernet
+: https://ijohan.nl/recom-via-ethernet/
+
+; Raspberry Pi Serial Console With MAX3232CPE
+: http://codeandlife.com/2012/07/01/raspberry-pi-serial-console-with-max3232cpe/
\ No newline at end of file
diff --git a/mywiki/tiddlers/use usb stick with docker.tid b/mywiki/tiddlers/use usb stick with docker.tid
index 8f9fe17..d05dd9b 100644
--- a/mywiki/tiddlers/use usb stick with docker.tid	
+++ b/mywiki/tiddlers/use usb stick with docker.tid	
@@ -1,6 +1,6 @@
 created: 20150511071117085
 creator: user
-modified: 20160906194802130
+modified: 20161106103317792
 modifier: user
 tags: 
 title: use usb stick with docker
@@ -34,9 +34,7 @@ $ cat /etc/default/docker
 #DOCKER="/usr/local/bin/docker"
 
 # Use DOCKER_OPTS to modify the daemon startup options.
-#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
-DOCKER_OPTS="--storage-driver=overlay -D --graph=/mnt/usb/docker --log-driver=syslog --log-opt syslog-address=udp://nas.aiko.sh:514 --log-opt syslog-format=rfc5424"
-#DOCKER_OPTS="--storage-driver=overlay -D"
+DOCKER_OPTS="--storage-driver=overlay -D --dns 192.168.22.22 --graph=/mnt/usb/docker --log-driver=syslog --log-opt syslog-address=udp://192.168.22.22:514 --log-opt syslog-format=rfc5424"
 
 # If you need Docker to use an HTTP proxy, it can also be specified here.
 export http_proxy="http://192.168.2.1:3128/"