From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 8 Feb 2016 00:40:23 +0000 (+0100)
Subject: Differentiate postinstall activities for personal and public server.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/pick_tasks?a=commitdiff_plain;h=dad86c04f52b51859c70b3cb06fdded832feb7b6;p=config

Differentiate postinstall activities for personal and public server.
---

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 8a66d6f..29449cf 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -183,33 +183,38 @@ if [ "$1" = "server" ]; then
     su plom -c 'mkdir -p /home/plom/mail/new_inbox/{cur,new,tmp}'
     sed -i 's/^delete = true$/delete = false/g' \
         /home/plom/config/dotfiles/user/server/personal/minimal/getmail/getmailrc
-    DEBIAN_FRONTEND=noninteractive apt-get -y install getmail4 procmail mutt \
-        postfix maildrop
+    DEBIAN_FRONTEND=noninteractive apt-get -y install mutt postfix maildrop
     cp config/systemfiles/main.cf /etc/postfix/main.cf
     sed -i 's/HOSTNAME/'$hostname.com'/g' /etc/postfix/main.cf
     cp config/systemfiles/aliases /etc/aliases
     newaliases
     service postfix restart
+    if [ "$2" = "personal" ]; then
+    apt-get -y install getmail4 procmail
+    fi
 
     # Set up regular system update reminder.
     apt-get -y install cron
     su plom -c "echo '0 18 * * 0 ~/config/bin/simplemail.sh '\
         '~/config/mails/update_reminder' | crontab -"
 
-    # Set up screen/weechat/OTR/bitlbee. Make bitlbee listen only locally.
-    apt-get -y install screen weechat-plugins python-potr bitlbee
-    sed -i 's/^# DaemonInterface/DaemonInterface = 127.0.0.1 '\
+    if [ "$2" = "personal" ]; then
+        # Set up screen/weechat/OTR/bitlbee. Make bitlbee listen only locally.
+        apt-get -y install screen weechat-plugins python-potr bitlbee
+        sed -i 's/^# DaemonInterface/DaemonInterface = 127.0.0.1 '\
 '# DaemonInterface/' /etc/bitlbee/bitlbee.conf
-    sedtest=`grep -E '^DaemonInterface = 127.0.0.1 #' \
-        /etc/bitlbee/bitlbee.conf | wc -l | cut -d ' ' -f 1`
-    if [ 0 -eq $sedtest ]; then
-        false
+        sedtest=`grep -E '^DaemonInterface = 127.0.0.1 #' \
+            /etc/bitlbee/bitlbee.conf | wc -l | cut -d ' ' -f 1`
+        if [ 0 -eq $sedtest ]; then
+            false
+        fi
+        cp config/systemfiles/weechat.service \
+            /etc/systemd/system/weechat.service
+        systemctl enable /etc/systemd/system/weechat.service
+
+        # Send instructions mail.
+        config/bin/simplemail.sh config/mails/server_postinstall_finished
     fi
-    cp config/systemfiles/weechat.service  /etc/systemd/system/weechat.service
-    systemctl enable /etc/systemd/system/weechat.service
-
-    # Send instructions mail.
-    config/bin/simplemail.sh config/mails/server_postinstall_finished
 
 elif [ "$1" = "thinkpad" ]; then
     # Set up networking (wifi!).