[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.9-15-gbaed7a3
Andreas B. Mundt
andi at debian.org
Sat May 4 07:01:40 UTC 2013
The following commit has been merged in the master branch:
commit baed7a39b7b1114b296812404fba443e8cdd5221
Author: Andreas B. Mundt <andi at debian.org>
Date: Fri May 3 15:28:35 2013 +0200
Silence messages and improved home page. Add alias to certificate.
Make the information about the creation of pxe boot configurations
minimal to keep important messages on the screen.
Add link on how to change the password to the Debian-LAN home page,
which is the default in iceweasel now.
Add 'print.intern' to the 'subjectAltName' for certificates.
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index dcb78a6..5975c63 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -18,8 +18,8 @@ DLROOT="/opt/live"
check_network () {
## Check if package repository is accessible:
if ! wget --quiet --output-document=/tmp/fai-setup $URL ; then
- echo "Error accessing '$URL', check network and internet access."
- exit 1
+ echo "Error accessing '$URL', check network and internet access."
+ exit 1
fi
}
@@ -31,18 +31,21 @@ setup_nfsroot () {
## Create pxelinux boot configuration for workstationXX.
## The seq range is sed from the corresponding variable
## when fcopy'd:
+ echo -n "Creating pxelinux boot configurations: "
NUM=0
for i in `seq WS_RANGE` ; do
- NUMSTR=`printf "%02d" $NUM`
- fai-chboot -IFvu $FAI_CONFIG_SRC workstation$NUMSTR 2>&1 | tee -a /var/log/fai/fai-chboot.log
- NUM=$(($NUM+1))
+ NUMSTR=`printf "%02d" $NUM`
+ fai-chboot -IFvu $FAI_CONFIG_SRC workstation$NUMSTR &>> /var/log/fai/fai-chboot.log
+ echo -n "."
+ NUM=$(($NUM+1))
done
+ echo -e " Done.\nCreated $NUM workstation configurations."
if [ -d $DLROOT ] ; then
- fai-chboot -vc diskless.tmpl default
+ fai-chboot -vc diskless.tmpl default &>> /var/log/fai/fai-chboot.log
else
## create default configuration (sysinfo):
- fai-chboot -Svu $FAI_CONFIG_SRC default
+ fai-chboot -Svu $FAI_CONFIG_SRC default &>> /var/log/fai/fai-chboot.log
fi
}
@@ -55,11 +58,11 @@ setup_diskless () {
TEMPLATE=$TFTPROOT/pxelinux.cfg/diskless.tmpl
if [ ! -e $TEMPLATE ]; then
- KERNEL=`basename $(ls $TFTPROOT/vmlinuz*)`
- INITRD=`basename $(ls $TFTPROOT/initrd.img*)`
+ KERNEL=`basename $(ls $TFTPROOT/vmlinuz*)`
+ INITRD=`basename $(ls $TFTPROOT/initrd.img*)`
- echo "Creating template with $KERNEL and $INITRD."
- cat > $TEMPLATE <<EOF
+ echo "Creating template with $KERNEL and $INITRD."
+ cat > $TEMPLATE <<EOF
# template for diskless
default fai-generated
@@ -68,21 +71,24 @@ kernel $KERNEL
append initrd=$INITRD ip=dhcp root=/dev/nfs nfsroot=/opt boot=live
EOF
else
- echo "The template $TEMPLATE exists already!"
+ echo "The template $TEMPLATE exists already!"
fi
## Create pxelinux boot configuration for disklessXX.
## The seq range is sed from the corresponding variable
## when fcopy'd:
+ echo -n "Creating pxelinux boot configurations: "
NUM=0
for i in `seq DL_RANGE` ; do
- NUMSTR=`printf "%02d" $NUM`
- fai-chboot -vc diskless.tmpl diskless$NUMSTR 2>&1 | tee -a /var/log/fai/fai-chboot.log
- NUM=$(($NUM+1))
+ NUMSTR=`printf "%02d" $NUM`
+ fai-chboot -vc diskless.tmpl diskless$NUMSTR &>> /var/log/fai/fai-chboot.log
+ echo -n "."
+ NUM=$(($NUM+1))
done
+ echo -e " Done.\nCreated $NUM diskless machine configurations."
## Boot unknown machines as diskless:
- fai-chboot -vc diskless.tmpl default
+ fai-chboot -vc diskless.tmpl default &>> /var/log/fai/fai-chboot.log
}
@@ -92,8 +98,8 @@ setup_PXEinstaller () {
cp -ru $INSTALLER $TFTPROOT
if [ -d $TFTPROOT/debian-installer/i386 ] ; then
- ## add installer menu
- cat >> $TFTPROOT/pxelinux.cfg/default <<EOF
+ ## add installer menu
+ cat >> $TFTPROOT/pxelinux.cfg/default <<EOF
menu label Debian-LAN/FAI live system
menu title Boot menu
@@ -141,11 +147,11 @@ If unanswered, this script will exit after $TIMEOUT seconds.
EOF
read -e -t $TIMEOUT -n 1 -p "Install the nfsroot for FAI now? [y|N]: " inp
if [ "$inp" = "y" ] ; then
- check_network
- setup_nfsroot
- setup_PXEinstaller
+ check_network
+ setup_nfsroot
+ setup_PXEinstaller
else
- exit 0
+ exit 0
fi
fi
@@ -166,10 +172,10 @@ If unanswered, this script will exit after $TIMEOUT seconds.
EOF
read -e -t $TIMEOUT -n 1 -p "Install the chroot for diskless clients now? [y|N]: " inp
if [ "$inp" = "y" ] ; then
- check_network
- setup_diskless
- setup_PXEinstaller
+ check_network
+ setup_diskless
+ setup_PXEinstaller
else
- exit 0
+ exit 0
fi
fi
diff --git a/fai/config/files/var/www/index.html/GOSA b/fai/config/files/var/www/index.html/GOSA
index 32ef835..0a5f452 100644
--- a/fai/config/files/var/www/index.html/GOSA
+++ b/fai/config/files/var/www/index.html/GOSA
@@ -1,7 +1,12 @@
<html><body>
<h1>Debian-LAN</h1>
<p>This is the starting web page for the Debian-LAN mainserver.</p>
-<p>Available services:</p>
+
+<p>Consider <a href="https://www.intern/gosa/password.php">changing
+ your password</a> after the first login.</p>
+
+<hr/>
+<h2>Available services:</h2>
<ul>
<li><a href="https://www.intern/gosa">GOsa System Administration</a></li>
<li><a href="https://print.intern:631">CUPS Print-Server Administration</a></li>
diff --git a/fai/config/scripts/CLIENT_A/20-misc b/fai/config/scripts/CLIENT_A/20-misc
index d529265..7cd7aa5 100755
--- a/fai/config/scripts/CLIENT_A/20-misc
+++ b/fai/config/scripts/CLIENT_A/20-misc
@@ -25,3 +25,6 @@ fi
## Allow SSO in iceweasel:
ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.negotiate-auth.delegation-uris", "intern");'
ainsl /etc/iceweasel/pref/iceweasel.js 'pref("network.negotiate-auth.trusted-uris", "intern");'
+
+## Default Homepage:
+ainsl /etc/iceweasel/pref/iceweasel.js 'pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://www.intern");'
diff --git a/fai/config/scripts/SERVER_A/50-apache b/fai/config/scripts/SERVER_A/50-apache
index 8bdc158..2cec19f 100755
--- a/fai/config/scripts/SERVER_A/50-apache
+++ b/fai/config/scripts/SERVER_A/50-apache
@@ -21,7 +21,7 @@ if [ "$FAI_ACTION" != "install" ] && [ "$CONVERT" != "true" ] ; then
fi
sed -e s#@HostName@#"$HostName"# $TEMPLATE > ${target}/$CONF
-echo "subjectAltName=DNS:$HostName,DNS:www.intern,DNS:syslog.intern" >> ${target}/$CONF
+echo "subjectAltName=DNS:$HostName,DNS:www.intern,DNS:syslog.intern,DNS:print.intern" >> ${target}/$CONF
$ROOTCMD openssl req -config $CONF -new -x509 -days 7000 -nodes -out $CERT -keyout $KEY
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list