diff options
| author | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
|---|---|---|
| committer | root <root@miefda901.localdomain> | 2011-05-25 22:31:16 +0200 |
| commit | dfd4c81e8f460ed917a0fcfc8b0008a069a54f3e (patch) | |
| tree | 30fbb56a3c4890772780a571b9e8e6f3c0b0d563 | |
| parent | 73bb9a720134ddc53446aa83b778b588466de31d (diff) | |
| parent | 97a9aa1a5840957e655037d9bc68421727dfab21 (diff) | |
Merge branch 'master' of github.com:miefda/retiolum
Conflicts:
Lassulus
| -rwxr-xr-x | .scripts/tinc_multicast/retiolum | 2 | ||||
| -rw-r--r-- | Lassulus | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.scripts/tinc_multicast/retiolum b/.scripts/tinc_multicast/retiolum index f506a1b0..1d6b775f 100755 --- a/.scripts/tinc_multicast/retiolum +++ b/.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) @@ -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 |