From 64b8d70fbf9c903ddc4862c1d324df3739a78fcb Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 25 Mar 2016 12:35:21 -0300 Subject: Deploy dependencies, TODO update --- TODO.md | 8 +------- bin/dependencies | 5 +++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/TODO.md b/TODO.md index 9edae9f..bcf1a52 100644 --- 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 78f6ed4..c6f09ab 100755 --- 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" -- cgit v1.2.3