From 914eddd89cbd33383c5b84bfdd063e670b848c09 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Sep 2012 18:32:22 +0200 Subject: cleaned deploy.sh --- deploy.sh | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/deploy.sh b/deploy.sh index e6a6c7ea..6aab1119 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,36 +2,20 @@ # # missing: header, licence, usage +PUPPET_ENV='--confdir=puppet' -install_packages () -{ - apt-get install lsb-release git - - # we need puppet from backports - dist="`lsb_release -cs`" - - # enable backports for puppet + facter - [ -f /etc/apt/sources.list.d/$dist-backports.list ] || echo "deb http://backports.debian.org/debian-backports/ $dist-backports main contrib non-free">/etc/apt/sources.list.d/$dist-backports.list - - # enable debian wheezy for ruby-hiera-puppet - if [ "$dist" != "wheezy" ] - then - cat > /etc/apt/preferences.d/wheezy <