Deploy dependencies, TODO update

diff --git a/TODO.md b/TODO.md
index 9edae9f30992b30526c42aa79ba4f73986cd7529..bcf1a5230c09421f4b8fa09e4e3011cbbc842db2 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -8,13 +8,7 @@ High priority
 - virtual: migrate to kvm-manager, purge util-vserver.
 - switch from syslog-ng to rsyslog with anonimization.
 - nodo: journald: volatile logs only.
-- puppet:
-  - gpg integration:
-    - https://github.com/compete/hiera_yamlgpg
-    - https://github.com/sihil/hiera-eyaml-gpg
-  - key deployment
-    - add a monkeysphere auth subkey to every openpgp key used for backups.
-    - make backupninja wrap around monkeysphere: http://web.monkeysphere.info/doc/user-ssh-advanced/
+- puppet: key deployment.
 - sshd:
   - https://stribika.github.io/2015/01/04/secure-secure-shell.html
   - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774711#60

diff --git a/bin/dependencies b/bin/dependencies
index 78f6ed4d17f41c089c2c316755505b81cc6c61a0..c6f09ab6ef0e47359f28e5b0555f34a9acc436b9 100755 (executable)
--- a/bin/dependencies
+++ b/bin/dependencies
@@ -8,6 +8,11 @@ BASENAME="`basename $0`"
 DEPLOY_DEPENDENCIES="puppet-common"
 DEVELOP_DEPENDENCIES="git mr whois"
 
+# Additional wheezy dependencies
+if [ "`head -c 1 /etc/debian_version`" != '7' ]; then
+  DEPLOY_DEPENDENCIES="$DEPLOY_DEPENDENCIES ruby-hiera-puppet"
+fi
+
 # Set sudo config
 if [ "`whoami`" != 'root' ]; then
   SUDO="sudo"