summaryrefslogtreecommitdiffstats
path: root/retiolum/Makefile
diff options
context:
space:
mode:
authorChinaman <root@chinaman>2011-09-06 19:47:58 +0200
committerChinaman <root@chinaman>2011-09-06 19:47:58 +0200
commit108f3616e3f4958752d881192ef29e5fc4c2b045 (patch)
tree3c67478c852265219b72e6e1b05467d7065b7ba8 /retiolum/Makefile
parentb2d65500160bcdf7abb2bf985f7da582b810e25c (diff)
parentc3bc5a6d16868c121aca780f3109155797b51d76 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/Makefile')
-rw-r--r--retiolum/Makefile31
1 files changed, 22 insertions, 9 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 0d99ee70..c80a6faa 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -1,15 +1,28 @@
-.phony: update it all so install
+.PHONY: update all install hosts
-all: select-target
+EXES := update_tinc_hosts fillxx update-retiolum-hosts
-it: so
-so: it
+all: update links
-/etc/tinc/retiolum/hosts:
- cd $(dir $@) && git clone https://github.com/krebscode/hosts
+links:
+ for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done
-update: /etc/tinc/retiolum/hosts
- cd $< && git pull
+hosts:
+ bin/update-retiolum-hosts || true
-install:
+install: update
+ @#punani -Ei tinc python
+ @# will not run automatically
scripts/tinc_setup/install.sh
+ scripts/autostart/create-startup.sh
+
+update: hosts
+ @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 || true