[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-16-gfcd2394
Andreas B. Mundt
andi at debian.org
Sun Jul 22 11:32:25 UTC 2012
The following commit has been merged in the master branch:
commit 6053e60a63f67cf019127b6f14f4592448fa2816
Author: Andreas B. Mundt <andi at debian.org>
Date: Sat Jul 21 14:11:32 2012 +0200
Various fixes for wheezy mainserver installation.
* debconf/DNS_SERVER: bind9 default for run-resolvconf changed.
* fai.conf and nfsroot.conf: upstream changes.
* use exim4 on the mainserver, not nullmailer.
* minor fixes and additions.
diff --git a/fai/config/debconf/DNS_SERVER b/fai/config/debconf/DNS_SERVER
new file mode 100644
index 0000000..9b6dae8
--- /dev/null
+++ b/fai/config/debconf/DNS_SERVER
@@ -0,0 +1,2 @@
+# Should resolv.conf settings be overridden?
+bind9 bind9/run-resolvconf boolean true
diff --git a/fai/config/files/etc/fai/fai.conf/CLIENT_A b/fai/config/files/etc/fai/fai.conf/CLIENT_A
deleted file mode 100644
index 95c0e54..0000000
--- a/fai/config/files/etc/fai/fai.conf/CLIENT_A
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-
-# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
-
-# how to access the fai config space
-# If undefined here, make-fai-nfsroot/fai-setup will use default value
-# nfs://<install server>/$FAI_CONFIGDIR
-# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
-# git, git+http, hg+http, tarball via http
-FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config
-
-# LOGUSER: an account on the install server which saves all log-files
-# and which can change the kernel that is booted via network.
-# Configure .rhosts for this account and PAM, so that root can log in
-# from all install clients without password. This account should have
-# write permissions for /srv/tftp/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
-# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
-# Define it, to enable it, eg. LOGUSER=fai
-LOGUSER=
-
-# set protocol type for saving logs. Values: ssh, rsh, ftp
-FAI_LOGPROTO=ssh
-
-# Access to Debian mirror via NFS mounted directory
-# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
-#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
-
-
-# The following variables are read only for almost every user.
-# Do not change them unless you know what you are doing!
-
-# mount point where the mirror will be mounted
-MNTPOINT=/media/mirror
-
-# the local configuration directory on the install client
-FAI=/var/lib/fai/config
diff --git a/fai/config/files/etc/fai/fai.conf/SERVER_A b/fai/config/files/etc/fai/fai.conf/SERVER_A
deleted file mode 100644
index 95c0e54..0000000
--- a/fai/config/files/etc/fai/fai.conf/SERVER_A
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id$
-
-# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
-
-# how to access the fai config space
-# If undefined here, make-fai-nfsroot/fai-setup will use default value
-# nfs://<install server>/$FAI_CONFIGDIR
-# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
-# git, git+http, hg+http, tarball via http
-FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config
-
-# LOGUSER: an account on the install server which saves all log-files
-# and which can change the kernel that is booted via network.
-# Configure .rhosts for this account and PAM, so that root can log in
-# from all install clients without password. This account should have
-# write permissions for /srv/tftp/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
-# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
-# Define it, to enable it, eg. LOGUSER=fai
-LOGUSER=
-
-# set protocol type for saving logs. Values: ssh, rsh, ftp
-FAI_LOGPROTO=ssh
-
-# Access to Debian mirror via NFS mounted directory
-# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
-#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
-
-
-# The following variables are read only for almost every user.
-# Do not change them unless you know what you are doing!
-
-# mount point where the mirror will be mounted
-MNTPOINT=/media/mirror
-
-# the local configuration directory on the install client
-FAI=/var/lib/fai/config
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
similarity index 73%
copy from fai/config/files/etc/fai/nfsroot.conf/FAISERVER
copy to fai/config/files/etc/fai/nfsroot.conf/SERVER_A
index d03d009..e46a35e 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
@@ -10,5 +10,4 @@ FAI_DEBOOTSTRAP_OPTS="--exclude=info"
# Configuration space
FAI_CONFIGDIR=/srv/fai/config
-NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
-FAI_DEBOOTSTRAP="wheezy http://faiserver:9999/debian"
+FAI_DEBOOTSTRAP="wheezy http://aptcache:3142/http.debian.net/debian"
diff --git a/fai/config/files/etc/rc.local/FAISERVER b/fai/config/files/etc/rc.local/FAISERVER
index b0840c1..e2af5b8 100755
--- a/fai/config/files/etc/rc.local/FAISERVER
+++ b/fai/config/files/etc/rc.local/FAISERVER
@@ -21,17 +21,17 @@ exit 0
echo "Creating the nfsroot for FAI."
. /etc/fai/fai.conf
-. /etc/fai/make-fai-nfsroot.conf
+. /etc/fai/nfsroot.conf
if [ ! -d "$FAI_CONFIGDIR/class" ] ; then
mkdir -p $FAI_CONFIGDIR
cp -a /usr/share/doc/fai-doc/examples/simple/* $FAI_CONFIGDIR
fi
-URL=`echo $FAI_DEBOOTSTRAP | awk '{print $2}'`
+URL="http.debian.net"
## Check if package repository is accessible:
if wget --quiet --output-document=/tmp/fai-setup $URL ; then
- fai-setup -e -v
+ fai-setup -e -v -l
## Create pxelinux boot configuration for workstationXX.
## The seq range is sed from the corresponding variable
## when fcopy'd:
diff --git a/fai/config/package_config/SERVER_A b/fai/config/package_config/SERVER_A
index 170da0d..e90d4cc 100644
--- a/fai/config/package_config/SERVER_A
+++ b/fai/config/package_config/SERVER_A
@@ -1,8 +1,9 @@
## Here are all default packages for the given setup that do not fit
## another class.
-PACKAGES aptitude
+PACKAGES aptitude
sudo-ldap
screen
+exim4 nullmailer-
-PACKAGES aptitude KERBEROS_KDC
+PACKAGES aptitude KERBEROS_KDC
krb5-kdc-ldap
diff --git a/fai/config/scripts/DEBIAN/30-interface b/fai/config/scripts/DEBIAN/30-interface
index 461a658..4562baa 100755
--- a/fai/config/scripts/DEBIAN/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -28,7 +28,7 @@ fi
# here fcopy is mostly used, when installing a client for running in a
# different subnet than during the installation
-fcopy -i /etc/resolv.conf
-fcopy -iM /etc/network/interfaces /etc/networks
+fcopy -iU /etc/resolv.conf
+fcopy -iUM /etc/network/interfaces /etc/networks
exit $error
diff --git a/fai/config/scripts/DNS_SERVER/10-zones b/fai/config/scripts/DNS_SERVER/10-zones
index ab8947c..ebbf8f7 100755
--- a/fai/config/scripts/DNS_SERVER/10-zones
+++ b/fai/config/scripts/DNS_SERVER/10-zones
@@ -43,6 +43,7 @@ ltsp CNAME mainserver.intern.
domain CNAME mainserver.intern.
ldap CNAME mainserver.intern.
kerberos CNAME mainserver.intern.
+mail CNAME mainserver.intern.
postoffice CNAME mainserver.intern.
syslog CNAME mainserver.intern.
faiserver CNAME mainserver.intern.
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list