From 3065aef6aea024baa7e8e2a6968205e63d30aad8 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 Aug 2012 11:57:05 -0400 Subject: add basic puppetmaster-less deploy script --- deploy.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 deploy.sh (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 00000000..21cb6b73 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +puppet --modulepath=$PWD/modules $PWD/manifests/site.pp $@ -- cgit v1.2.3 From e1de953a7dda5a03fccb6bbbe6b60f321ad7e010 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 6 Sep 2012 10:57:03 +0200 Subject: deploy.sh working --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 deploy.sh (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 index 21cb6b73..c8f89b90 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,3 @@ #!/bin/sh -puppet --modulepath=$PWD/modules $PWD/manifests/site.pp $@ +puppet apply --modulepath=$PWD/puppet/modules $PWD/puppet/manifests/site.pp $@ -- cgit v1.2.3 From 653efcee3f3427817e63a8432df99c1e932e3261 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 6 Sep 2012 11:46:46 +0200 Subject: install puppet+facter from backports --- deploy.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index c8f89b90..4da972b5 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,15 @@ #!/bin/sh +# +# missing: header, licence, usage + + +apt-get install lsb-release git + +# we need puppet from backports +dist="`lsb_release -cs`" +[ -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 + +apt-get update +apt-get install -t $dist-backports facter puppet puppet apply --modulepath=$PWD/puppet/modules $PWD/puppet/manifests/site.pp $@ -- cgit v1.2.3 From 54270961d928e5398f1b7d7a4947bbe14c94d746 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 6 Sep 2012 11:56:26 +0200 Subject: batch mode for apt-get install --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 4da972b5..441a1128 100755 --- a/deploy.sh +++ b/deploy.sh @@ -10,6 +10,6 @@ dist="`lsb_release -cs`" [ -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 apt-get update -apt-get install -t $dist-backports facter puppet +apt-get install -y -t $dist-backports facter puppet puppet apply --modulepath=$PWD/puppet/modules $PWD/puppet/manifests/site.pp $@ -- cgit v1.2.3 From 45c8d3fb727e00ac2a9de3a9fc83f4500b981d55 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 6 Sep 2012 14:23:17 +0200 Subject: install ruby-hiera-puppet --- deploy.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 441a1128..fd109c13 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,9 +7,19 @@ 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 testing for ruby-hiera-puppet +cat > /etc/apt/preferences.d/wheezy < Date: Fri, 7 Sep 2012 12:58:48 +0200 Subject: working on deploy.sh --- deploy.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index fd109c13..e6a6c7ea 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,25 +1,37 @@ -#!/bin/sh +#!/bin/sh -x # # missing: header, licence, usage -apt-get install lsb-release git +install_packages () +{ + apt-get install lsb-release git -# we need puppet from backports -dist="`lsb_release -cs`" + # 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 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 testing for ruby-hiera-puppet -cat > /etc/apt/preferences.d/wheezy < /etc/apt/preferences.d/wheezy < Date: Mon, 24 Sep 2012 18:32:22 +0200 Subject: cleaned deploy.sh --- deploy.sh | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'deploy.sh') 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 < Date: Mon, 24 Sep 2012 18:41:16 +0200 Subject: handle submodules --- deploy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'deploy.sh') diff --git a/deploy.sh b/deploy.sh index 6aab1119..0db6cf91 100755 --- a/deploy.sh +++ b/deploy.sh @@ -6,16 +6,18 @@ PUPPET_ENV='--confdir=puppet' install_prerequisites () { apt-get update - apt-get install puppet + apt-get install puppet git # lsb is needed for a first puppet run puppet apply $PUPPET_ENV --execute 'include lsb' + git submodule init + git submodule update } # main # commented for testing purposes -#install_prerequisites +install_prerequisites puppet apply $PUPPET_ENV puppet/manifests/site.pp $@ -- cgit v1.2.3