Replace hostname in postfix/main.cf with proper value on post-install.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 1b2978aec1c34ed181d2eec3259b68433f9ce9e1..98e8a8182b51b04ddecd2233df61b00628b3fbab 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -21,8 +21,8 @@ fi
 # Some important variables
 if [ "$2" = "plomlompom.com" ]; then
     hostname="plomlompom"
-elif [ "$2" = "test.plomlompom" ]; then
-    hostname="test.plomlompom.com"
+elif [ "$2" = "test.plomlompom.com" ]; then
+    hostname="test.plomlompom"
 elif [ "$2" = "X200s" ]; then
     hostname="X220s"
 elif [ "$2" = "T450s" ]; then
@@ -57,7 +57,7 @@ echo $hostname > /etc/hostname
 hostname $hostname
 if [ "$1" = "server" ]; then
     echo '127.0.0.1 localhost' > /etc/hosts
-    ip=`hostname -I`
+    ip=`hostname -I | cut -d " " -f 1`
     echo "$ip $2 $hostname" >> /etc/hosts
 
     # Call dhclient on startup.
@@ -155,6 +155,12 @@ rm -rf /home/plom/config
 su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
 su plom -c '/home/plom/config/bin/symlink.sh '$1' '$2
 
+# Allow user to sudo.
+if [ "$1" = "thinkpad" ]; then
+    apt-get -y install sudo
+    adduser plom sudo
+fi
+
 # Set up editor.
 mkdir -p .vimbackups
 su plom -c 'mkdir -p /home/plom/.vimbackups/'
@@ -176,6 +182,7 @@ if [ "$1" = "server" ]; then
     DEBIAN_FRONTEND=noninteractive apt-get -y install getmail4 procmail mutt \
         postfix maildrop
     cp config/systemfiles/main.cf /etc/postfix/main.cf
+    sed -i 's/HOSTNAME/'.$2.'/g' /etc/postfix/main.cf
     cp config/systemfiles/aliases /etc/aliases
     newaliases
     service postfix restart