X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;ds=sidebyside;f=jessie_postinstall.sh;h=06d95f2275dd967673676a91e9ad5dbc6f1fe8c5;hb=a6ee79ea22470391a56463aa6f077cd690429574;hp=29449cf5d8a5f6568df1e79a037453b1e06db1c7;hpb=a7d95cbeaac7b2a83c5c39f66429b699daca62b4;p=config
diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 29449cf..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" ]; 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" ]; 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
@@ -214,6 +216,16 @@ if [ "$1" = "server" ]; then
# Send instructions mail.
config/bin/simplemail.sh config/mails/server_postinstall_finished
+
+ 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'
+ 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