aboutsummaryrefslogtreecommitdiff
path: root/share/hydractl/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'share/hydractl/bootstrap')
-rwxr-xr-xshare/hydractl/bootstrap11
1 files changed, 6 insertions, 5 deletions
diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 6658e4e..c83a4b0 100755
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -21,14 +21,15 @@ STAGE="$1"
if [ "$STAGE" == "repository" ]; then
hydractl puppet-install
- mkdir -p /etc/puppet/modules
- git clone git://git.sarava.org/puppet-bootstrap /etc/puppet/modules/bootstrap
+ rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
+ chown -R puppet. /etc/puppet
- echo "Editing /etc/puppet/modules/bootstrap/manifests/config.pp to suit your needs..."
+ echo "Please edit /etc/puppet/manifests/config.pp to suit your needs..."
+ echo "Press any key to continue, Ctrl-C to abort..."
+ read option
$EDITOR /etc/puppet/modules/bootstrap/manifests/config.pp
fi
if [ -e "/etc/puppet/modules/bootstrap/manifests/$stage.pp" ]; then
- puppet agent --no-daemonize --debug --verbose --onetime /etc/puppet/modules/bootstrap/manifests/$stage.pp
- puppet agent --no-daemonize --debug --verbose
+ puppet apply /etc/puppet/modules/bootstrap/manifests/$stage.pp
fi