aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-06 13:48:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-06 13:48:57 -0300
commit1556252c2a083bf53bc2a75e4a3295d8f1a50210 (patch)
tree168087d3c1d971b3fe2eeee47ed68fcf3840b55d /Makefile
parent403734c898eac9299a6c986159c8d88c1e1bd510 (diff)
downloadpuppet-bootstrap-1556252c2a083bf53bc2a75e4a3295d8f1a50210.tar.gz
puppet-bootstrap-1556252c2a083bf53bc2a75e4a3295d8f1a50210.tar.bz2
Makefile update
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dc9f551..1ccf197 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ CWD = $(shell pwd)
REPO = git://git.sarava.org/puppet-bootstrap.git
PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules
-all: clean remote modules
+all: clean remote modules config
deps:
bin/dependencies
@@ -35,11 +35,13 @@ subtrees:
remote:
git remote add bootstrap $(REPO)
-puppet.conf:
+hiera/boostrap.yaml:
$(EDITOR) hiera/bootstrap.yaml
+
+puppet.conf:
$(PUPPET) manifests/bootstrap/configurator.pp
-config: puppet.conf
+config: hiera/boostrap.yaml puppet.conf
@true
apply: