diff options
| author | tv <tv@also> | 2011-08-09 13:08:33 +0200 |
|---|---|---|
| committer | tv <tv@also> | 2011-08-09 13:08:43 +0200 |
| commit | ed35d14330dfc98ef69d5b0331ae911602994b65 (patch) | |
| tree | 3c185c7ad84860c09167230075ab15b8dd667851 /retiolum/Makefile | |
| parent | 84674bbb50e5737262b8624de1f81a1931f3994f (diff) | |
| parent | 1fa3eb0e4e3acbe560e2091e47de3a245155baf2 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/Makefile')
| -rw-r--r-- | retiolum/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile index 0d99ee70..85020c9f 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -1,6 +1,7 @@ .phony: update it all so install -all: select-target +all: + cat Makefile it: so so: it @@ -8,8 +9,20 @@ so: it /etc/tinc/retiolum/hosts: cd $(dir $@) && git clone https://github.com/krebscode/hosts +#TODO conflicting update: /etc/tinc/retiolum/hosts cd $< && git pull -install: +install: scripts/tinc_setup/install.sh + +autohosts: + @echo creating Magic + bin/update_tinc_hosts "create magic" || true + @echo adding hosts + bin/update_tinc_hosts restart + +arch-install: update install arch-autostart autohosts + +arch-autostart: + make -C scripts/autostart arch |