Fix or.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 4527374eeb524d55e4b16bdc1294130cb92286cf..3797c7dedf51d07a57862dcfa649e576d266a12e 100755 (executable)
--- 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,17 +214,14 @@ if [ "$1" = "server" ]; then
 
         # Send instructions mail.
         config/bin/simplemail.sh config/mails/server_postinstall_finished
+
     elif [ "$2" = "public" ]; then
-        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'
-        cp config/systemfiles/htwtxt.service \
-            /etc/systemd/system/htwtxt.service
-        systemctl enable /etc/systemd/system/htwtxt.service
     fi
 
 elif [ "$1" = "thinkpad" ]; then