diff options
| author | root <root@monitoring.shack> | 2012-09-13 23:39:58 +0000 |
|---|---|---|
| committer | root <root@monitoring.shack> | 2012-09-13 23:39:58 +0000 |
| commit | db849a18e1659ff28433384d2cdca2989a6d5df0 (patch) | |
| tree | d600fb3f3e5f0a54b6254c85ee8a3b836ef3d90d /retiolum/Makefile | |
| parent | d5d39fc3d56b021b642ee6e1d5625524ebbc4d99 (diff) | |
| parent | 88d4bdc29eb9ce5f62099f2be1488ae927aa09d5 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/Makefile')
| -rw-r--r-- | retiolum/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile index cd0a543c..a8ae0973 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -5,25 +5,27 @@ EXES := update_tinc_hosts fillxx update-retiolum-hosts all: update links links: - for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done + for x in $(EXES); do ln -snf ../retiolum/bin/$$x ../bin; done install: upgrade - ../punani/bin/punani tinc python + ../punani/bin/punani install tinc python scripts/tinc_setup/install.sh - cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up - scripts/autostart/create-startup.sh + sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ - sudo bin/restart-tincd; \ + sudo bin/restart-tincd || :; \ fi update: hosts - bin/update_tinc_hosts "create magic" || true + bin/update_tinc_hosts "create magic" || :; bin/update_tinc_hosts restart sudo pkill -HUP tincd || :; +startup: + scripts/autostart/create-startup.sh + hosts: - bin/update-retiolum-hosts || true + bin/update-retiolum-hosts || :; |