X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=jessie_postinstall.sh;h=0a6fcf74355b574ee9bbc5d6523015483cfc043d;hb=a6ea23c10570e9f82472212c4e566596fcb0b803;hp=08b34ab8367819c35cdecc8816c96583da5a9c5d;hpb=70a844d0728f2664069a55dcf38c33e5a41ed70f;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 08b34ab..0a6fcf7 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -6,23 +6,27 @@ if [ ! "$1" = "thinkpad" ] && [ ! "$1" = "server" ]; then
     echo "Need argument."
     false
 fi
-
 if [ "$1" = "thinkpad" ] && [ ! "$2" = "X200s" ] && [ ! "$2" = "T450s" ]; then
     echo "Need Thinkpad type."
     false
 fi
-
-if [ "$1" = "server" ] && [ ! "$2" = "plomlompom.com" ] && \
-        [ ! "$2" = "test.plomlompom.com" ]; then
-    echo "Need server type."
+if [ "$1" = "server" ] && [ ! "$2" = "personal" ] && [ ! "$2" = "public" ]; then
+    echo "Need server purpose."
+    false
+fi
+if [ "$2" = "personal" ] && [ ! "$3" = "test.plomlompom.com" ] && \
+    [ ! "$3" = "plomlompom.com" ]; then
+    echo "Need server domain"
     false
 fi
 
 # Some important variables
-if [ "$2" = "plomlompom.com" ]; then
+if [ "$3" = "plomlompom.com" ]; then
     hostname="plomlompom"
-elif [ "$2" = "test.plomlompom.com" ]; then
+elif [ "$3" = "test.plomlompom.com" ]; then
     hostname="test.plomlompom"
+elif [ "$2" = "public" ]; then
+    hostname="twtxt.plomlompom"
 elif [ "$2" = "X200s" ]; then
     hostname="X220s"
 elif [ "$2" = "T450s" ]; then
@@ -57,8 +61,8 @@ echo $hostname > /etc/hostname
 hostname $hostname
 if [ "$1" = "server" ]; then
     echo '127.0.0.1 localhost' > /etc/hosts
-    ip=`hostname -I`
-    echo "$ip $2 $hostname" >> /etc/hosts
+    ip=`hostname -I | cut -d " " -f 1`
+    echo "$ip $hostname.com $hostname" >> /etc/hosts
 
     # Call dhclient on startup.
     cat > /etc/systemd/system/dhclient.service << EOF
@@ -153,7 +157,13 @@ config/bin/symlink.sh
 useradd -m -s /bin/bash plom
 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
+su plom -c '/home/plom/config/bin/symlink.sh '$1' '$2' '$3
+
+# Allow user to sudo.
+if [ "$1" = "thinkpad" ]; then
+    apt-get -y install sudo
+    adduser plom sudo
+fi
 
 # Set up editor.
 mkdir -p .vimbackups
@@ -176,6 +186,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/'$hostname.com'/g' /etc/postfix/main.cf
     cp config/systemfiles/aliases /etc/aliases
     newaliases
     service postfix restart