summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <github@syntax-fehler.de>2011-05-26 10:29:06 +0200
committerFelix Richter <github@syntax-fehler.de>2011-05-26 10:29:06 +0200
commit14c7f881101e9377ba840c8eeb7063fd0314e029 (patch)
tree6b69c1273c04a5a54d007d17349df23e7958223f
parentf7bc1f56d7824e73b324dbe9db5d209c12d97af1 (diff)
parent438c717ace233c7be76b5bea00a7fbfad1f5aeca (diff)
Merge branch 'master' of github.com:miefda/retiolum
-rw-r--r--retiolum/hosts/.pubkeys/5eruun9
-rw-r--r--retiolum/hosts/.pubkeys/Shepherd9
-rw-r--r--retiolum/hosts/.scripts/autostart/Makefile7
-rw-r--r--retiolum/hosts/.scripts/autostart/tinc92
-rwxr-xr-xretiolum/hosts/.scripts/tinc_multicast/retiolum34
-rw-r--r--retiolum/hosts/Lassulus1
-rw-r--r--retiolum/hosts/c2ft9
7 files changed, 151 insertions, 10 deletions
diff --git a/retiolum/hosts/.pubkeys/5eruun b/retiolum/hosts/.pubkeys/5eruun
deleted file mode 100644
index ce24501f..00000000
--- a/retiolum/hosts/.pubkeys/5eruun
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/YOSX4xEKitiVzIP0xFU
-KQvC01uKN+KCT2Y7H8MFzowB+GWdVvplRi8TukMF1EYlIZoSIrgPO/SoOFZNvxPa
-83I6PeN6W830qKpUt3xYMqyuL2ZJw1hvhsgPWbGXF2yA39mQas9Skf2SNnEJppFp
-N8mGw449PLhTFmGoR3x3354kgO40zts4qqvpMcyTOx+zQhnGBO4KQqftJU1klgCc
-YUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+jhys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZ
-HfXXgUtIbW5W03LLtkYcMIiaIafe+qivtAs3cZIEKZVp+1fdfypQok6nDPwC1jy8
-TwIDAQAB
------END PUBLIC KEY-----
diff --git a/retiolum/hosts/.pubkeys/Shepherd b/retiolum/hosts/.pubkeys/Shepherd
new file mode 100644
index 00000000..8939b894
--- /dev/null
+++ b/retiolum/hosts/.pubkeys/Shepherd
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsW0Pbgvl+hATKqQR6H4y
+Pg1kphMsxrXvh/CMQY8dXVVD2mDWBHaLY/yXCanDxyYRGu80SVwdIUWQIwjGD0Si
+ESRGqABl2qPsD1uIbbqI5SlSwzb8UrJk+oCszLxZrhD14HWTjAduQ5GcBNZ8Ht13
+3rR07s+XRAYcKJOMauod3yD3g3IfZw6L/MAQ8GSptSa+JPm5Kk1/QBZi8oH0aIse
+aVH9b6l8+P27LwxdwJG+S/82iKOUvszwqocqNbKJ0iySs3ZPZTDpKa/MPAN9H/m/
+OqM66w6IG4iwIttqix5mET+kM2TUaH29tApWA1ChYy61aKBykdcT+IbJHl/0unOU
+6QIDAQAB
+-----END PUBLIC KEY-----
diff --git a/retiolum/hosts/.scripts/autostart/Makefile b/retiolum/hosts/.scripts/autostart/Makefile
new file mode 100644
index 00000000..58bfc0c5
--- /dev/null
+++ b/retiolum/hosts/.scripts/autostart/Makefile
@@ -0,0 +1,7 @@
+INIT_FOLDER=/etc/rc.d
+.phony: all
+all:
+ #TODO change the tinc file before writing
+ cp tinc $(INIT_FOLDER)/tinc
+ echo "retiolum" > /etc/tinc/nets.boot
+ update-rc.d tinc defaults
diff --git a/retiolum/hosts/.scripts/autostart/tinc b/retiolum/hosts/.scripts/autostart/tinc
new file mode 100644
index 00000000..06d10403
--- /dev/null
+++ b/retiolum/hosts/.scripts/autostart/tinc
@@ -0,0 +1,92 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides: tinc
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs $network
+# Should-Start: $syslog $named
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Start tinc daemons
+# Description: Create a file $NETSFILE (/etc/tinc/nets.boot),
+# and put all the names of the networks in there.
+# These names must be valid directory names under
+# $TCONF (/etc/tinc). Lines starting with a # will be
+# ignored in this file.
+### END INIT INFO
+#
+# Based on Lubomir Bulej's Redhat init script.
+
+DAEMON="/usr/sbin/tincd"
+NAME="tinc"
+DESC="tinc daemons"
+TCONF="/etc/tinc"
+NETSFILE="$TCONF/nets.boot"
+NETS=""
+
+test -f $DAEMON || exit 0
+
+[ -r /etc/default/tinc ] && . /etc/default/tinc
+
+# foreach_net "what-to-say" action [arguments...]
+foreach_net() {
+ if [ ! -f $NETSFILE ] ; then
+ echo "Please create $NETSFILE."
+ exit 0
+ fi
+ echo -n "$1"
+ shift
+ egrep '^[ ]*[a-zA-Z0-9_-]+' $NETSFILE | while read net args; do
+ echo -n " $net"
+ "$@" $net $args
+ done
+ echo "."
+}
+
+start() {
+ $DAEMON $EXTRA -n "$@"
+}
+stop() {
+ $DAEMON -n $1 -k
+}
+reload() {
+ $DAEMON -n $1 -kHUP
+}
+restart() {
+ stop "$@"
+ sleep 0.5
+ i=0;
+ while [ -f /var/run/tinc.$1.pid ] ; do
+ if [ $i = '10' ] ; then
+ break
+ else
+ echo -n "."
+ sleep 0.5
+ i=$(($i+1))
+ fi
+ done
+ start "$@"
+}
+
+case "$1" in
+ start)
+ foreach_net "Starting $DESC:" start
+ ;;
+ stop)
+ foreach_net "Stopping $DESC:" stop
+ ;;
+ reload|force-reload)
+ foreach_net "Reloading $DESC configuration:" reload
+ ;;
+ restart)
+ foreach_net "Restarting $DESC:" restart
+ ;;
+ *)
+ echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/retiolum/hosts/.scripts/tinc_multicast/retiolum b/retiolum/hosts/.scripts/tinc_multicast/retiolum
new file mode 100755
index 00000000..1d6b775f
--- /dev/null
+++ b/retiolum/hosts/.scripts/tinc_multicast/retiolum
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+TINCNAME='retiolum'
+case "$1" in
+ start)
+ stat_busy "Starting retiolum Daemon"
+ success=0
+ /home/death/git/retiolum/.scripts/tinc_multicast/retiolum.py -n retiolum -T &
+ sleep 2
+ if [ $success -eq 0 ]; then
+ add_daemon retiolum
+ stat_done
+ else
+ stat_fail
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping retiolum Daemon"
+ kill `cat /var/lock/retiolum.retiolum`
+ rm_daemon retiolum
+ stat_done
+ ;;
+ restart)
+ $0 stop
+ sleep 4
+ $0 start
+ ;;
+ *)
+ echo "usage $0 {startĀ¦stopĀ¦restart}"
+esac
+exit 0
diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus
index 7e920411..61c2d62b 100644
--- a/retiolum/hosts/Lassulus
+++ b/retiolum/hosts/Lassulus
@@ -1,4 +1,3 @@
-Address = 10.9.9.71
Subnet = 10.7.7.11
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE
diff --git a/retiolum/hosts/c2ft b/retiolum/hosts/c2ft
new file mode 100644
index 00000000..d2f7d40e
--- /dev/null
+++ b/retiolum/hosts/c2ft
@@ -0,0 +1,9 @@
+Subnet = 10.7.7.24
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAqS+nvuQnAlhsGHgjKRz0nq2nj9HWwzrA96xnng6UCmkTpFyprM7b
+20vQ5wqcHFAbuZh1dOOb9G2qqsZYE6V1452YLZZLMsnxiJD8kSorHrF6kJid5JjH
+xyyqSvkXaHClQItVjo7rIn5P/Tl+BMt64KaPxpu/4GBVHkCE1apLtaVRnEq5t2DG
+htZuUqzhuLN4TQiSVC++7qY1UQotjLbAQpYxf67np5sKWMOqg5UA+ghuLeO9jpqL
+qKoh2TMzotGwlYBMXVA0jJtQu5Sq/IWKWAyk9zca2LT0W0ZZWYiTl+Ai5urbJgCV
+GvWeJCoBKteIKUHRVNK1RLDFl6/ITOu9XQIDAQAB
+-----END RSA PUBLIC KEY-----