summaryrefslogtreecommitdiffstats
path: root/retiolum/hosts
diff options
context:
space:
mode:
authorroot <root@miefda901.localdomain>2011-05-25 22:31:16 +0200
committerroot <root@miefda901.localdomain>2011-05-25 22:31:16 +0200
commiteabfe4c7b78e18d5aaa9e74bc148f00df25774ae (patch)
tree5faa370c23575036604ec4f2b17e4a42953e93a4 /retiolum/hosts
parentdba9117eaecc50177cd93195fd5a1b480105aa34 (diff)
parent59a5152b93fbe7f3b438a6310805a83d7d412bea (diff)
Merge branch 'master' of github.com:miefda/retiolum
Conflicts: Lassulus
Diffstat (limited to 'retiolum/hosts')
-rwxr-xr-xretiolum/hosts/.scripts/tinc_multicast/retiolum2
-rw-r--r--retiolum/hosts/Lassulus1
2 files changed, 1 insertions, 2 deletions
diff --git a/retiolum/hosts/.scripts/tinc_multicast/retiolum b/retiolum/hosts/.scripts/tinc_multicast/retiolum
index f506a1b0..1d6b775f 100755
--- a/retiolum/hosts/.scripts/tinc_multicast/retiolum
+++ b/retiolum/hosts/.scripts/tinc_multicast/retiolum
@@ -20,7 +20,7 @@ case "$1" in
stop)
stat_busy "Stopping retiolum Daemon"
kill `cat /var/lock/retiolum.retiolum`
- rm_daemon tincd
+ rm_daemon retiolum
stat_done
;;
restart)
diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus
index 557a535a..48a702bd 100644
--- a/retiolum/hosts/Lassulus
+++ b/retiolum/hosts/Lassulus
@@ -1,5 +1,4 @@
Address = 10.42.3.253
-Address = 10.9.9.71
Subnet = 10.7.7.11
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE