From: Silvio Rhatto Date: Thu, 6 Mar 2014 16:48:57 +0000 (-0300) Subject: Makefile update X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1556252c2a083bf53bc2a75e4a3295d8f1a50210;p=puppet-bootstrap.git Makefile update --- 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: