summaryrefslogtreecommitdiff
path: root/testing/scripts/build-guestimages
diff options
context:
space:
mode:
Diffstat (limited to 'testing/scripts/build-guestimages')
-rwxr-xr-xtesting/scripts/build-guestimages14
1 files changed, 11 insertions, 3 deletions
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 3e107c062..e2ec422b1 100755
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -60,17 +60,25 @@ do
then
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0
+ execute_chroot "a2enmod -q cgid" 0
execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0
execute_chroot "/etc/openssl/generate-crl" 0
- execute_chroot "update-rc.d apache2 defaults" 0
- execute_chroot "update-rc.d slapd defaults" 0
execute_chroot "rm -rf /var/lib/ldap/*" 0
execute_chroot "slapadd -l /etc/ldap/ldif.txt -f /etc/ldap/slapd.conf" 0
execute_chroot "chown -R openldap:openldap /var/lib/ldap" 0
execute_chroot "dnssec-signzone -K /etc/bind -o strongswan.org. /etc/bind/db.strongswan.org" 0
execute_chroot "dnssec-signzone -K /etc/bind -o org. /etc/bind/db.org" 0
execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 0
- execute_chroot "update-rc.d bind9 defaults" 0
+
+ for service in "apache2 slapd bind9"
+ do
+ if [ "$BASEIMGSUITE" == "wheezy" ]
+ then
+ execute_chroot "update-rc.d $service defaults" 0
+ else
+ execute_chroot "systemctl enable $service" 0
+ fi
+ done
fi
sync
execute "umount -l $LOOPDIR" 0