X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=jessie_postinstall.sh;h=000f8e41b2a1ef37402ccad3d095b6bdb1d47303;hb=46c2911ac60e09492b90b1aaa5be456a2aff6b44;hp=9063f77743cd13428ab83f4c699ca9eeae1714f9;hpb=c3d46f44ac8cc5a9473e304fdc38fa019d577618;p=config
diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 9063f77..000f8e4 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
@@ -216,12 +218,28 @@ if [ "$1" = "server" ]; then
config/bin/simplemail.sh config/mails/server_postinstall_finished
elif [ "$2" = "public" ]; then
- # Set up twtxt environment.
+
+ # Set up htwtxt environment.
+ apt-get -y install screen nginx
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'
+ cp config/systemfiles/htwtxt_restart_reminder.service \
+ /etc/systemd/system/htwtxt_restart_reminder.service
+ systemctl enable /etc/systemd/system/htwtxt_restart_reminder.service
+ cp config/systemfiles/nginx.conf /etc/nginx/nginx.conf
+
+ # Set up plomlombot.
+ apt-get -y install python3 python3-venv python3-pip
+ su - plom -c 'cd && git clone http://github.com/plomlompom/plomlombot-irc'
+ su - plom -c 'mkdir -p ~/plomlombot_db'
+ cp config/systemfiles/plomlombot.service \
+ /etc/systemd/system/plomlombot.service
+ systemctl enable /etc/systemd/system/plomlombot.service
fi
elif [ "$1" = "thinkpad" ]; then