diff options
| author | Pietro Ferrari <pietro@riseup.net> | 2008-11-11 18:26:57 +0000 |
|---|---|---|
| committer | Pietro Ferrari <pietro@riseup.net> | 2008-11-12 01:06:16 +0000 |
| commit | 0f35e2058fddc5aee3c41057ddec1844d2a80c4c (patch) | |
| tree | a37634fb943bac8449741e5dace001dadb18dcef /files | |
| parent | 0fdfc7d93be57eac136d2101f78d0d95d53e27af (diff) | |
| download | puppet-virtual-0f35e2058fddc5aee3c41057ddec1844d2a80c4c.tar.gz puppet-virtual-0f35e2058fddc5aee3c41057ddec1844d2a80c4c.tar.bz2 | |
move vserver related files to a vserver directory.
dont't install puppet on a newly created vserver.
fix identation of vserver.pp
Diffstat (limited to 'files')
| -rw-r--r--[-rwxr-xr-x] | files/vserver/build_vserver (renamed from files/build_vserver) | 12 | ||||
| -rwxr-xr-x | files/vserver/create_openvpn_interface (renamed from files/create_openvpn_interface) | 0 | ||||
| -rwxr-xr-x | files/vserver/destroy_openvpn_interface (renamed from files/destroy_openvpn_interface) | 0 |
3 files changed, 7 insertions, 5 deletions
diff --git a/files/build_vserver b/files/vserver/build_vserver index 16f6528..0f0cea7 100755..100644 --- a/files/build_vserver +++ b/files/vserver/build_vserver @@ -20,15 +20,17 @@ cp /etc/apt/{preferences,sources.list} $TARGET/etc/apt/ # 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/ +#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 +#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 "Please sign now: puppetca --sign $NAME" >&2 + +echo "VServer $NAME created" diff --git a/files/create_openvpn_interface b/files/vserver/create_openvpn_interface index 87d9144..87d9144 100755 --- a/files/create_openvpn_interface +++ b/files/vserver/create_openvpn_interface diff --git a/files/destroy_openvpn_interface b/files/vserver/destroy_openvpn_interface index aa89ed4..aa89ed4 100755 --- a/files/destroy_openvpn_interface +++ b/files/vserver/destroy_openvpn_interface |