TODO update

diff --git a/TODO.md b/TODO.md
index b67d36673f746fd73eb21da463271a8f8c0add06..5d0a82e3a954e22222289f51a3ae01b7b2622c7b 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -28,17 +28,18 @@ Hydractl
     - support for cswap with passphrase.
   - deploy: PREFIX support.
   - puppet-setup-stored: configure storeconfigs database.
-  - backup-restore-user and backup-restore-users.
   - site backup, copy and restoration: call backup-restore-user
   - hydractl backup-restore-site {debian,wiki}.
   - wrapper to import/export monkeysphere keys into keyringer.
   - enhance mysql-repair.
+  - backup-restore-user and backup-restore-users.
   - backup-restore-SERVICE: stop/start service.
   - backup-copy action.
   - backup-restore-reprepro: rsync -av /var/backups/remote/$ORIG/restore/$DATE/var/reprepro/ /var/reprepro/.
   - backup-restore-site:
     - metastore integration for fine-grained permissions.
     - use metadata do detect drupal series.
+  - backup-restore-sites: support for other backup locations
 
 Puppet modules
 --------------
@@ -121,7 +122,7 @@ Puppet modules
   - `using unique option prefix myisam-recover instead of myisam-recover-options is deprecated (...) Please use the full name instead`.
 - nodo:
   - cleanup hidden `/.gem`.
-  - split prompt.sh in a separate bash-prompt repository and include it at `puppet-nodo` and `rhatto/apps.git`.
+  - use prompt.sh from bash-prompt as a submodule.
   - remove `import` statements from `init.pp`, which will need some refactoring in other modules to fix autoloading.
 - mail:
   - deploy https://git.autistici.org/ale/smtp-fp/tree/master

diff --git a/share/hydractl/backup-restore-sites b/share/hydractl/backup-restore-sites
index b051337bca76fe86e87767c93db132ad9e5c99d6..781cf171348967a4ce2f9ee4009791e4496db9dc 100755 (executable)
--- a/share/hydractl/backup-restore-sites
+++ b/share/hydractl/backup-restore-sites
@@ -31,13 +31,14 @@ fi
 
 # Determine sites to copy.
 if [ -z "$2" ]; then
+  # TODO: support for other backup locations.
   sites="`ls /var/sites`"
 else
   shift
   sites="$*"
 fi
 
-# Copy each site.
+# Restore each site.
 # TODO: support for other backup locations.
 for site in $sites; do
   hydractl backup-restore-site backups $SERVER $site