From d575169b42f9c4a794844577e63a1892fce65636 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 26 May 2010 21:13:36 +0200 Subject: [PATCH] Document the cfengine role, add cfengine to debian/control:Suggests. Also fix some documentation bugs in roles/cfengine --- bin/xen-create-image | 4 ++++ debian/control | 2 +- roles/cfengine | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/xen-create-image b/bin/xen-create-image index e0caabb..b5890cd 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -603,6 +603,10 @@ Create a Xen configuration file in so that xm can start the new domain. Setup the new virtual images with commonly used packages for rebuilding Debian packages from their source. +=item cfengine +Install cfengine2 on the virtual image and copy the cfengine +configuration from Dom0. + =item gdm Install an X11 server, using VNC and GDM diff --git a/debian/control b/debian/control index 4f9bb97..0467ea3 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Package: xen-tools Architecture: all Depends: debootstrap | cdebootstrap, perl-modules, libtext-template-perl, libconfig-inifiles-perl, libfile-slurp-perl, ${misc:Depends} Recommends: xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, rinse, xen-shell, libexpect-perl -Suggests: reiserfsprogs, xfsprogs, xen-utils +Suggests: reiserfsprogs, xfsprogs, xen-utils, cfengine2 Description: Tools to manage Xen virtual servers This package contains tools to manage Debian based Xen virtual servers. . diff --git a/roles/cfengine b/roles/cfengine index 382ad4c..e071f53 100755 --- a/roles/cfengine +++ b/roles/cfengine @@ -26,14 +26,14 @@ logMessage Script $0 starting # -# Install ssh +# Install CFengine # installDebianPackage ${prefix} cfengine2 # -# Make sure sshd isn't running, this will cause our unmounting of the -# disk image to fail.. +# Make sure the CFengine server isn't running, this will cause our +# unmounting of the disk image to fail.. # chroot ${prefix} /etc/init.d/cfengine2 stop