From 0f35e2058fddc5aee3c41057ddec1844d2a80c4c Mon Sep 17 00:00:00 2001 From: Pietro Ferrari Date: Tue, 11 Nov 2008 18:26:57 +0000 Subject: move vserver related files to a vserver directory. dont't install puppet on a newly created vserver. fix identation of vserver.pp --- files/build_vserver | 34 ------------------------------- files/create_openvpn_interface | 10 --------- files/destroy_openvpn_interface | 9 --------- files/vserver/build_vserver | 36 +++++++++++++++++++++++++++++++++ files/vserver/create_openvpn_interface | 10 +++++++++ files/vserver/destroy_openvpn_interface | 9 +++++++++ 6 files changed, 55 insertions(+), 53 deletions(-) delete mode 100755 files/build_vserver delete mode 100755 files/create_openvpn_interface delete mode 100755 files/destroy_openvpn_interface create mode 100644 files/vserver/build_vserver create mode 100755 files/vserver/create_openvpn_interface create mode 100755 files/vserver/destroy_openvpn_interface (limited to 'files') diff --git a/files/build_vserver b/files/build_vserver deleted file mode 100755 index 16f6528..0000000 --- a/files/build_vserver +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -NAME=$1 -CONTEXT=$2 -RELEASE = $3 -DEBOOTSTRAP_MIRROR = $4 -# create basic vserver -vserver $NAME build -m debootstrap -- -d $RELEASE -m $DEBOOTSTRAP_MIRROR - -# default settings -echo $NAME >/etc/vservers/$NAME/uts/nodename -echo $CONTEXT >/etc/vservers/$NAME/context - -# copy in some some defaults -TARGET=/etc/vservers/$NAME/vdir/ - -cp /etc/apt/{preferences,sources.list} $TARGET/etc/apt/ - -# this is needed so puppet can find the puppetmaster and creates the right -# certificate -grep -v $NAME /etc/hosts > $TARGET/etc/hosts -echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts -mkdir -p $TARGET/var/lib/puppet/modules/dbp -cp /var/lib/puppet/modules/dbp/puppet_current.deb $TARGET/var/lib/puppet/modules/dbp/ - -# Setup is complete, now do the post-install stuff -vserver $NAME start -vserver $NAME exec dselect update -# install a few packages needed for facter -vserver $NAME exec apt-get -y install lsb-release iproute -vserver $NAME exec dpkg --install var/lib/puppet/modules/dbp/puppet_current.deb -vserver $NAME exec apt-get -fy install - -echo "Please sign now: puppetca --sign $NAME" >&2 diff --git a/files/create_openvpn_interface b/files/create_openvpn_interface deleted file mode 100755 index 87d9144..0000000 --- a/files/create_openvpn_interface +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -DEV="$1" -SUBNET="$2" - -openvpn --mktun --dev "$DEV" -ip link set dev "$DEV" txqueuelen 100 -ifconfig "$DEV" "$SUBNET".1 pointopoint "$SUBNET".2 mtu 1500 -route add -net "$SUBNET".0 netmask 255.255.255.0 gw "$SUBNET".2 - diff --git a/files/destroy_openvpn_interface b/files/destroy_openvpn_interface deleted file mode 100755 index aa89ed4..0000000 --- a/files/destroy_openvpn_interface +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -DEV="$1" -SUBNET="$2" - -route del -net "$SUBNET".0 netmask 255.255.255.0 gw "$SUBNET".2 -ifconfig "$DEV" down -openvpn --rmtun --dev "$DEV" - diff --git a/files/vserver/build_vserver b/files/vserver/build_vserver new file mode 100644 index 0000000..0f0cea7 --- /dev/null +++ b/files/vserver/build_vserver @@ -0,0 +1,36 @@ +#!/bin/bash + +NAME=$1 +CONTEXT=$2 +RELEASE = $3 +DEBOOTSTRAP_MIRROR = $4 +# create basic vserver +vserver $NAME build -m debootstrap -- -d $RELEASE -m $DEBOOTSTRAP_MIRROR + +# default settings +echo $NAME >/etc/vservers/$NAME/uts/nodename +echo $CONTEXT >/etc/vservers/$NAME/context + +# copy in some some defaults +TARGET=/etc/vservers/$NAME/vdir/ + +cp /etc/apt/{preferences,sources.list} $TARGET/etc/apt/ + +# this is needed so puppet can find the puppetmaster and creates the right +# certificate +grep -v $NAME /etc/hosts > $TARGET/etc/hosts +echo "127.0.0.1 $NAME" >> $TARGET/etc/hosts +#mkdir -p $TARGET/var/lib/puppet/modules/dbp +#cp /var/lib/puppet/modules/dbp/puppet_current.deb $TARGET/var/lib/puppet/modules/dbp/ + +# Setup is complete, now do the post-install stuff +vserver $NAME start +vserver $NAME exec dselect update +# install a few packages needed for facter +vserver $NAME exec apt-get -y install lsb-release iproute +#vserver $NAME exec dpkg --install var/lib/puppet/modules/dbp/puppet_current.deb +#vserver $NAME exec apt-get -fy install + +#echo "Please sign now: puppetca --sign $NAME" >&2 + +echo "VServer $NAME created" diff --git a/files/vserver/create_openvpn_interface b/files/vserver/create_openvpn_interface new file mode 100755 index 0000000..87d9144 --- /dev/null +++ b/files/vserver/create_openvpn_interface @@ -0,0 +1,10 @@ +#!/bin/bash + +DEV="$1" +SUBNET="$2" + +openvpn --mktun --dev "$DEV" +ip link set dev "$DEV" txqueuelen 100 +ifconfig "$DEV" "$SUBNET".1 pointopoint "$SUBNET".2 mtu 1500 +route add -net "$SUBNET".0 netmask 255.255.255.0 gw "$SUBNET".2 + diff --git a/files/vserver/destroy_openvpn_interface b/files/vserver/destroy_openvpn_interface new file mode 100755 index 0000000..aa89ed4 --- /dev/null +++ b/files/vserver/destroy_openvpn_interface @@ -0,0 +1,9 @@ +#!/bin/bash + +DEV="$1" +SUBNET="$2" + +route del -net "$SUBNET".0 netmask 255.255.255.0 gw "$SUBNET".2 +ifconfig "$DEV" down +openvpn --rmtun --dev "$DEV" + -- cgit v1.2.3