[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.7-11-g693c2f3

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit acfc6f57f0f10bd76b1b3c6fc8745b762d663ebc
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Jan 24 22:00:50 2013 +0100

    Create certificate and enable SSL for the apache web server.
    
    Force the use of SSL for GOsa in gosa.conf.

diff --git a/fai/config/files/etc/gosa/gosa.conf/GOSA b/fai/config/files/etc/gosa/gosa.conf/GOSA
index ce8ede9..4c39e71 100644
--- a/fai/config/files/etc/gosa/gosa.conf/GOSA
+++ b/fai/config/files/etc/gosa/gosa.conf/GOSA
@@ -383,7 +383,7 @@
 	userRDN="ou=people"
 	groupRDN="ou=groups"
 	warnSSL="true"
-	forceSSL="false"
+	forceSSL="true"
 	forceGlobals="true"
 	ignoreLdapProperties="false"
 	rfc2307bis="false"
diff --git a/fai/config/package_config/SERVER_A b/fai/config/package_config/SERVER_A
index d672f47..ba3f60b 100644
--- a/fai/config/package_config/SERVER_A
+++ b/fai/config/package_config/SERVER_A
@@ -1,6 +1,7 @@
 ## Here are all default packages for the given setup that do not fit
 ## another class.
 PACKAGES aptitude
+ssl-cert
 sudo-ldap
 screen
 exim4 nullmailer-
diff --git a/fai/config/scripts/SERVER_A/50-apache b/fai/config/scripts/SERVER_A/50-apache
new file mode 100755
index 0000000..b976261
--- /dev/null
+++ b/fai/config/scripts/SERVER_A/50-apache
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+## Switch apache userdir module on:
+$ROOTCMD a2enmod userdir
+
+## Create certificate and enable ssl:
+$ROOTCMD make-ssl-cert generate-default-snakeoil
+$ROOTCMD a2enmod ssl
+$ROOTCMD a2ensite default-ssl
diff --git a/fai/config/scripts/SERVER_A/50-userdir b/fai/config/scripts/SERVER_A/50-userdir
deleted file mode 100755
index c2685c1..0000000
--- a/fai/config/scripts/SERVER_A/50-userdir
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-## Switch apache userdir module on:
-$ROOTCMD a2enmod userdir

-- 
Debian-LAN development and packaging