summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--retiolum/Makefile21
1 files changed, 9 insertions, 12 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index e0268c35..cd0a543c 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -7,26 +7,23 @@ all: update links
links:
for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done
-hosts:
- bin/update-retiolum-hosts || true
-install: update
- ../punani/bin/punani -Eih tinc /usr/bin/python /usr/bin/python2
+install: upgrade
+ ../punani/bin/punani tinc python
scripts/tinc_setup/install.sh
cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up
scripts/autostart/create-startup.sh
-update: hosts
- bin/update_tinc_hosts "create magic" || true
- bin/update_tinc_hosts restart
+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; \
- else \
- sudo pkill -HUP tincd || :; \
fi
-arch-install: update install arch-autostart autohosts
+update: hosts
+ bin/update_tinc_hosts "create magic" || true
+ bin/update_tinc_hosts restart
+ sudo pkill -HUP tincd || :;
-arch-autostart:
- make -C scripts/autostart arch || true
+hosts:
+ bin/update-retiolum-hosts || true