X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=jessie_postinstall.sh;h=9063f77743cd13428ab83f4c699ca9eeae1714f9;hb=c3d46f44ac8cc5a9473e304fdc38fa019d577618;hp=1fd90859c79145612079e7eb484240ff20d38d51;hpb=b49984e7700c2cb597c18d57e7cd8be4cfedabc3;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 1fd9085..9063f77 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -85,7 +85,7 @@ echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
     >> /etc/apt/sources.list
 echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
     >> /etc/apt/sources.list
-if [ "$1" = "thinkpad" ]; then
+if [ "$1" = "thinkpad" || "$2" = "public" ]; then
     echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
 ' non-free' >> /etc/apt/sources.list
     echo 'deb http://ftp.debian.org/debian/ testing main contrib non-free' \
@@ -214,18 +214,14 @@ if [ "$1" = "server" ]; then
 
         # Send instructions mail.
         config/bin/simplemail.sh config/mails/server_postinstall_finished
+
     elif [ "$2" = "public" ]; then
-        apt-get -y install sudo
-        adduser plom sudo
-        su plom -c '~/config/setup_go.sh '\
-            'https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz'
+        # Set up twtxt environment.
+        apt-get -y -t jessie-backports install golang
         su plom -c 'git clone '\
             'https://github.com/plomlompom/htwtxt $GOPATH/src/htwtxt'
         su plom -c 'go get htwtxt'
         su plom -c 'mkdir ~/htwtxt'
-        su plom -c 'cp -R $GOPATH/src/htwtxt/templates ~/htwtxt'
-        deluser plom sudo
-        apt-get -y --purge autoremove sudo
     fi
 
 elif [ "$1" = "thinkpad" ]; then