X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/ledger2?a=blobdiff_plain;f=jessie_postinstall.sh;h=06d95f2275dd967673676a91e9ad5dbc6f1fe8c5;hb=a6ee79ea22470391a56463aa6f077cd690429574;hp=9063f77743cd13428ab83f4c699ca9eeae1714f9;hpb=c3d46f44ac8cc5a9473e304fdc38fa019d577618;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 9063f77..06d95f2 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" || "$2" = "public" ]; 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' \
@@ -97,7 +97,9 @@ if [ "$1" = "thinkpad" || "$2" = "public" ]; then
     echo 'APT::Default-Release "stable";' \
         >> /etc/apt/apt.conf.d/99defaultrelease
 fi
-dhclient eth0
+if [ "$1" = "thinkpad" ]; then
+    dhclient eth0
+fi
 apt-get update
 apt-get -y dist-upgrade
 
@@ -218,10 +220,12 @@ if [ "$1" = "server" ]; then
     elif [ "$2" = "public" ]; then
         # 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 'git clone '\
+'https://github.com/plomlompom/htwtxt $GOPATH/src/htwtxt'
+        su - plom -c 'go get htwtxt'
+        path=`su - plom -c 'echo $GOPATH/bin/htwtxt'`
+        setcap 'cap_net_bind_service=+ep' $path
+        su - plom -c 'mkdir ~/htwtxt'
     fi
 
 elif [ "$1" = "thinkpad" ]; then