[debian-lan-devel] [debian-lan] 04/04: Make conversion more robust. Allow arbitrary hostnames.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch jessie
in repository debian-lan.

commit 148de0a812aac6c691f07e5ca41b67012b420aa2
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Apr 4 12:12:51 2015 +0200

    Make conversion more robust.  Allow arbitrary hostnames.
    
    Remove packages that might already be installed before replacing them
    with their conflicting sibling.
    Add commands to the README which replace 'mainserver' by an arbitrary
    hostname.
    
    (cherry picked from commit e0dcea3d088071c55eec55212e5864a586f97f8c)
---
 debian/README.Debian                  | 17 ++++++++++++++++-
 fai/config/package_config/MAIL_SERVER |  1 +
 fai/config/package_config/SERVER_A    |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 7cff104..fa94fa4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -62,6 +62,21 @@ Then convert the installation with the following commands:
 Adapt the config space to your needs if necessary and run FAI with the
 variable CONVERT set to true:
 
+   export SUDO_FORCE_REMOVE=yes  # to switch from sudo to sudo-ldap
    export CONVERT=true ; fai -vN -s file:///srv/fai/config/ softupdate
 
- -- Andreas B. Mundt <andi at debian.org>  Wed, 30 Jan 2013 18:50:03 +0100
+
+Further Notes
+-------------
+
+If you prefer not to use the hostname 'mainserver' but $HOSTNAME, use
+the following commands to replace it in the fai config space:
+
+   cd /srv/fai/config/
+   for FILE in $(grep -rl mainserver *) ; \
+       do sed -i "s/mainserver/$HOSTNAME/g" $FILE ; done
+
+   mv files/etc/hosts/mainserver files/etc/hosts/$HOSTNAME
+   cd -
+
+ -- Andreas B. Mundt <andi at debian.org>  Tue, 31 Mar 2015 22:50:03 +0200
diff --git a/fai/config/package_config/MAIL_SERVER b/fai/config/package_config/MAIL_SERVER
index fe1140e..308db86 100644
--- a/fai/config/package_config/MAIL_SERVER
+++ b/fai/config/package_config/MAIL_SERVER
@@ -1,4 +1,5 @@
 PACKAGES aptitude
+exim4-daemon-light-
 exim4-daemon-heavy
 dovecot-imapd
 dovecot-gssapi
diff --git a/fai/config/package_config/SERVER_A b/fai/config/package_config/SERVER_A
index 20afa68..647fab5 100644
--- a/fai/config/package_config/SERVER_A
+++ b/fai/config/package_config/SERVER_A
@@ -2,6 +2,7 @@
 ## another class.
 PACKAGES aptitude
 ssl-cert
+sudo-
 sudo-ldap
 screen
 exim4 nullmailer-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git