X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=jessie_postinstall.sh;h=76a75f6cd266a8dfc39b7edbb1cb625bd0fd9cd4;hb=f8073e8d4fcdf26a45f989333a3f7a7114b1e131;hp=3797c7dedf51d07a57862dcfa649e576d266a12e;hpb=eb8f2617e9b4966ca9b41a62706c24f36a7df2e9;p=config
diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 3797c7d..76a75f6 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -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
@@ -217,11 +219,14 @@ if [ "$1" = "server" ]; then
elif [ "$2" = "public" ]; then
# Set up twtxt environment.
+ apt-get -y install screen
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 -p ~/htwtxt'
fi
elif [ "$1" = "thinkpad" ]; then