Improve nginx and IRC logs integration.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 1fd90859c79145612079e7eb484240ff20d38d51..821b4b3f76bf7057f2194f978f24e92151030821 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' \
@@ -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,18 +216,31 @@ if [ "$1" = "server" ]; then
 
         # Send instructions mail.
         config/bin/simplemail.sh config/mails/server_postinstall_finished
+
     elif [ "$2" = "public" ]; then
-        apt-get -y install sudo
-        adduser plom sudo
-        su plom -c '~/config/setup_go.sh '\
-            'https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz'
-        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'
-        deluser plom sudo
-        apt-get -y --purge autoremove sudo
+
+        # 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'
+        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
+        mkdir /var/www/irclogs_zrolaps/
+        touch /var/www/password_irclogs_zrolaps
     fi
 
 elif [ "$1" = "thinkpad" ]; then