From 9cdd0fc00ad9ed5129f5b213b4b3296899000b5a Mon Sep 17 00:00:00 2001
From: root <root@kremium>
Date: Tue, 18 Oct 2011 23:18:36 +0200
Subject: //retiolum: kremu -> kremium

---
 retiolum/hosts/kremium | 10 ++++++++++
 retiolum/hosts/kremu   | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 retiolum/hosts/kremium
 delete mode 100644 retiolum/hosts/kremu

diff --git a/retiolum/hosts/kremium b/retiolum/hosts/kremium
new file mode 100644
index 00000000..06df489f
--- /dev/null
+++ b/retiolum/hosts/kremium
@@ -0,0 +1,10 @@
+Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128
+Subnet = 10.7.7.192
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh
+XsJYkSHVcXqHAorP1QAvk5fIiSEEoSwoChyecqpNOREOnN8+N8RVrs0QIwL0mwa0
+9H4HDcpt8O8J0mpM8z8pb7vhDk261oMchG52TVYX4cuEgpEiyJtij27UIfOeVY8g
+8kuJQG+9X7WNGMOt2Y8A7pXFf/+8qdwpOq5C0SIRPR5WplBeeF3BepzmUeq24XOE
+cdF/ggYeU8hSYzr3DFX7g9u/gOjBQrhApopx6LR9TkpkrFfVcgLw3NaOzI2vQzqa
+7m8v62D+/3vun3ZB/1OfQpIMfm77DC8AEQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/kremu b/retiolum/hosts/kremu
deleted file mode 100644
index 06df489f..00000000
--- a/retiolum/hosts/kremu
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128
-Subnet = 10.7.7.192
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh
-XsJYkSHVcXqHAorP1QAvk5fIiSEEoSwoChyecqpNOREOnN8+N8RVrs0QIwL0mwa0
-9H4HDcpt8O8J0mpM8z8pb7vhDk261oMchG52TVYX4cuEgpEiyJtij27UIfOeVY8g
-8kuJQG+9X7WNGMOt2Y8A7pXFf/+8qdwpOq5C0SIRPR5WplBeeF3BepzmUeq24XOE
-cdF/ggYeU8hSYzr3DFX7g9u/gOjBQrhApopx6LR9TkpkrFfVcgLw3NaOzI2vQzqa
-7m8v62D+/3vun3ZB/1OfQpIMfm77DC8AEQIDAQAB
------END RSA PUBLIC KEY-----
-- 
cgit v1.2.3


From e47af39129fdca0f8268759a3bcfaa70fdd0ca90 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 19 Oct 2011 10:30:40 +0200
Subject: retiolum/Makefile: reload tinc correctly

---
 retiolum/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retiolum/Makefile b/retiolum/Makefile
index 83c4ac12..effdbfb8 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -22,7 +22,8 @@ update: hosts
 	@echo adding hosts 
 	bin/update_tinc_hosts restart
 	@echo reloading tincd
-	pkill -HUP tincd || true
+	sudo pkill -HUP tincd || true
+	sudo pkill -ALRM tincd || true
 
 arch-install: update install arch-autostart autohosts
 
-- 
cgit v1.2.3


From 6dee2fbae4b6ec96853bf2f6cef9aeb72db13b25 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Thu, 20 Oct 2011 14:38:59 +0200
Subject: util/bin/magic: add usage

---
 util/bin/magic | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/util/bin/magic b/util/bin/magic
index d3e86120..cb9cee6e 100755
--- a/util/bin/magic
+++ b/util/bin/magic
@@ -35,13 +35,33 @@ destroy() {
     echo "$cache" | sed "/^$bs$/,/^$es$/d" >$3
   fi
 }
+help() {
+cat <<EOF
+Usage: $0 DELIMITER_NAME FUNCTION FILE
+$0 creates,updates or destroys magic inside a file.
+It can be used to reliably add or remove custom lines.
+For example add own lines in /etc/rc.local to auto-load 
+scripts.
 
+FUNCTION:
+  create -- creates new magic in file, takes stdin as content in magic
+  update -- updates already existing magic with text from stdin
+  destroy -- destroys magic boundary
+  retrieve -- retrieve the content of magic and writes to stdout
+  
+Not yet implemented is the handling of magic not starting with the 
+shell comment symbol "#".
+
+EOF
+
+}
 case $2 in
   (create) create "$@" ;;
   (retrieve) retrieve "$@" ;;
   (update) update "$@" ;;
   (destroy) destroy "$@" ;;
   (*)
+    help >&2
     echo 'Error 1: You are made of stupid!' >&2
     exit 23
 esac
-- 
cgit v1.2.3