]> gitweb.fluxo.info Git - puppet-bootstrap.git/commitdiff
Makefile update
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 6 Mar 2014 16:48:57 +0000 (13:48 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 6 Mar 2014 16:48:57 +0000 (13:48 -0300)
Makefile

index dc9f551fc79bcc0ffffabee797b9624fcea377f7..1ccf197d9307ed7ede3a75d4b8a1066efbaa72b6 100644 (file)
--- 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: