From 22f3b8ed47870ca653f44c1347ede0a152ffb457 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 May 2011 22:05:02 +0200 Subject: replaced whole retiolum module with enterprise install script. does the right thing by calling the bootstrap file from retiolum --- modules/retiolum/Makefile | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 modules/retiolum/Makefile (limited to 'modules/retiolum/Makefile') diff --git a/modules/retiolum/Makefile b/modules/retiolum/Makefile deleted file mode 100644 index 9bda5dfc..00000000 --- a/modules/retiolum/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -all: - mkdir -p /etc/tinc/retiolum - git clone git://github.com/miefda/retiolum.git /etc/tinc/retiolum/hosts - echo cd /etc/tinc/retiolum/hosts/.scripts - echo "choose the right build script from here" -update: - cd /etc/tinc/retiolum/hosts - git pull origin master -- cgit v1.2.3 From 49f8b4c8689af96949228d16f9147218449632ca Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 13:12:14 +0200 Subject: replaced install script with Makefile makefile contains 2 targets, install: curls the bootstrap script from github and executes it update: tries to git pull the hosts folder created by install, will obviously not work if the folder does not exist --- modules/retiolum/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 modules/retiolum/Makefile (limited to 'modules/retiolum/Makefile') diff --git a/modules/retiolum/Makefile b/modules/retiolum/Makefile new file mode 100644 index 00000000..150255ae --- /dev/null +++ b/modules/retiolum/Makefile @@ -0,0 +1,8 @@ +.phony: update install all + +all: select-target + +update: + git pull /etc/tinc/retiolum/hosts +install: + curl -k https://github.com/miefda/retiolum/raw/master/.scripts/tinc_setup/bootstrap.sh | sh -- cgit v1.2.3 From c3892545bba91ec932f5fc826d3a6bf05dcf2e39 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 May 2011 22:31:34 +0200 Subject: modules/retiolum: use github --- modules/retiolum/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/retiolum/Makefile') diff --git a/modules/retiolum/Makefile b/modules/retiolum/Makefile index 150255ae..76b833f8 100644 --- a/modules/retiolum/Makefile +++ b/modules/retiolum/Makefile @@ -2,7 +2,11 @@ all: select-target -update: - git pull /etc/tinc/retiolum/hosts +/etc/tinc/retiolum/hosts: + cd $(dir $@) && git clone https://github.com/krebscode/hosts + +update: /etc/tinc/retiolum/hosts + cd $< && git pull + install: curl -k https://github.com/miefda/retiolum/raw/master/.scripts/tinc_setup/bootstrap.sh | sh -- cgit v1.2.3 From 5cbbac4c4ade45524085983625206e2be91b8e3f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 May 2011 23:19:49 +0200 Subject: retiolum: make it so stub --- modules/retiolum/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/retiolum/Makefile') diff --git a/modules/retiolum/Makefile b/modules/retiolum/Makefile index 76b833f8..c1ebfe37 100644 --- a/modules/retiolum/Makefile +++ b/modules/retiolum/Makefile @@ -1,7 +1,10 @@ -.phony: update install all +.phony: update it all so install all: select-target +it: so +so: it + /etc/tinc/retiolum/hosts: cd $(dir $@) && git clone https://github.com/krebscode/hosts -- cgit v1.2.3