From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 29 Sep 2011 19:06:32 +0000 (-0300)
Subject: Misc fixes and TODO update
X-Git-Tag: 0.1~237
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7ccbfd28c539ebeab293d6703d687d09978fcfb8;p=hydra.git

Misc fixes and TODO update
---

diff --git a/share/hydractl/backup-restore-site b/share/hydractl/backup-restore-site
index a408a11..04c0b10 100755
--- 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 14effa8..3ce9a8b 100755
--- 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 dc96894..bbc743d 100755
--- a/share/hydractl/requirements
+++ b/share/hydractl/requirements
@@ -1,2 +1,4 @@
 #!/bin/bash
-# TODO: get all needed requirements
+#
+# TODO: Get all needed requirements
+#