Misc fixes and TODO update

diff --git a/share/hydractl/backup-restore-site b/share/hydractl/backup-restore-site
index a408a1176cc808e8f874dd2d74c067e9ee661500..04c0b10ea817579ca5ffac25668c51f30e0134d8 100755 (executable)
--- a/share/hydractl/backup-restore-site
+++ b/share/hydractl/backup-restore-site
@@ -3,6 +3,7 @@
 # Restore a website from backup
 #
 # TODO: moin
+# TODO: support restoration from /var/sites/backups
 
 # Load.
 source $APP_BASE/lib/hydra/functions || exit 1

diff --git a/share/hydractl/init b/share/hydractl/init
index 14effa842b40fd4015c9ea6931a8888c5646dffa..3ce9a8b3873c280c6b0d5412b260d558ec0723ab 100755 (executable)
--- a/share/hydractl/init
+++ b/share/hydractl/init
@@ -3,7 +3,7 @@
 # Bootstrap a new hydra using the current host as a starting point.
 #
 
-hydractl install_puppet
+hydractl puppet-install
 
 mkdir -p /etc/puppet/modules
 git clone git://git.sarava.org/puppet-bootstrap /etc/puppet/modules/bootstrap
@@ -11,5 +11,5 @@ git clone git://git.sarava.org/puppet-bootstrap /etc/puppet/modules/bootstrap
 echo "Editing /etc/puppet/modules/bootstrap/manifests/site.pp to suit your needs..."
 $EDITOR /etc/puppet/modules/bootstrap/manifests/site.pp
 
-puppetd --no-daemonize --debug --verbose --onetime /etc/puppet/modules/bootstrap/manifests/init.pp
-puppetd --no-daemonize --debug --verbose
+puppet agent --no-daemonize --debug --verbose --onetime /etc/puppet/modules/bootstrap/manifests/init.pp
+puppet agent --no-daemonize --debug --verbose

diff --git a/share/hydractl/requirements b/share/hydractl/requirements
index dc96894a2f17f936dc7bad4549ea497cf42eb25f..bbc743d4ca04455c17bba803516efbacab27dcf3 100755 (executable)
--- a/share/hydractl/requirements
+++ b/share/hydractl/requirements
@@ -1,2 +1,4 @@
 #!/bin/bash
-# TODO: get all needed requirements
+#
+# TODO: Get all needed requirements
+#