aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-10-26 19:49:55 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-10-26 19:49:55 -0200
commitd03a934148419227317b3988d71fdb820f4c3c2b (patch)
tree950a6654726b21bb1e0b2e477747dae5c4890826
parent66bd115fbfddc3bd0ab61ea6f71d602485ac6be3 (diff)
downloadpuppet-bootstrap-d03a934148419227317b3988d71fdb820f4c3c2b.tar.gz
puppet-bootstrap-d03a934148419227317b3988d71fdb820f4c3c2b.tar.bz2
Deploy: cleanup
-rw-r--r--TODO.md6
-rwxr-xr-xbin/deploy5
2 files changed, 6 insertions, 5 deletions
diff --git a/TODO.md b/TODO.md
index 250a343..f231417 100644
--- 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 0b036d8..5d3361b 100755
--- 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