Deploy: cleanup

diff --git a/TODO.md b/TODO.md
index 250a343842d1071455d56f6440e0deaafd1afc0a..f2314178e65dd8086e8c9ddb213ab6204d2aaea7 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -45,7 +45,11 @@ Medium priority
 - backup:
   - support for $dombr and $dobios on backupninja::sys for servers and physical machines.
   - sync-backups support for rsyncing from kvms / snapshots.
-- nodo: use prompt.sh from bash-prompt as a submodule.
+- nodo:
+  - cleanup and refactor.
+  - uniform variable names.
+  - easy way to toggle management of subsystems.
+  - use prompt.sh from bash-prompt as a submodule.
 - common: autoload.
 - general:
   - rollback of commits about charset.

diff --git a/bin/deploy b/bin/deploy
index 0b036d8be0a52951d15a56b631ccbd957d67c822..5d3361b3513f4c36dbeeb51a0a6b4d2f70a2105d 100755 (executable)
--- a/bin/deploy
+++ b/bin/deploy
@@ -8,9 +8,6 @@ DIRNAME="`dirname $0`"
 BASEDIR="$DIRNAME/.."
 DEPLOY_DEPENDENCIES="puppet ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders"
 
-# Load dependencies
-source $DIRNAME/dependencies
-
 # Determine hostname
 if [ ! -z "$1" ]; then
   FQDN="$1"
@@ -33,7 +30,7 @@ for package in $DEPLOY_DEPENDENCIES; do
   provision_package $package
 done
 
-# Parameters that needed dependencies installed
+# Parameters that needs dependencies installed
 DIST="`facter lsbdistcodename`"
 
 # Apply patches