X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=jessie_postinstall.sh;h=6a5af271e128cfc53fa444e411a19c9d6d5351ee;hb=db8049108e692334e52f48421435d387348dee4c;hp=654e7acc0aac513fff02c0a2ad76787be3ecf83d;hpb=1c2241ac775479aa624de08fded54dc2c9b44f87;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 654e7ac..6a5af27 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -26,7 +26,7 @@ if [ "$3" = "plomlompom.com" ]; then
 elif [ "$3" = "test.plomlompom.com" ]; then
     hostname="test.plomlompom"
 elif [ "$2" = "public" ]; then
-    hostname="twtxt.plomlompom"
+    hostname="htwtxt.plomlompom"
 elif [ "$2" = "X200s" ]; then
     hostname="X220s"
 elif [ "$2" = "T450s" ]; then
@@ -219,26 +219,54 @@ if [ "$1" = "server" ]; then
 
     elif [ "$2" = "public" ]; then
 
-        # Set up twtxt environment.
+        # Set up htwtxt and 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 '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
 
+        # Set up nginx and letsencrypt.
+        apt-get -y install nginx
+        cp config/systemfiles/nginx.conf /etc/nginx/nginx.conf
+        cd ~
+        git clone https://github.com/letsencrypt/letsencrypt
+        echo '0 18 * * 0 ~/config/bin/renew_certs.sh' | crontab -
+
         # Set up plomlombot.
-        apt-get -y python3 python3-venv python3-pip
+        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
+
+        # Set up plomlombot logging infrastructure.
+        mkdir -p /var/www/html/irclogs/
+        ln -s /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/3c0248e76a1de3a6ee5bf3421f7379b0/logs/ /var/www/html/irclogs/zrolaps
+        touch /var/www/password_irclogs_zrolaps
+        ln -s /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/657eea42f86866f2954d39f92a6c71ff/logs/ /var/www/html/irclogs/nodrama.de
+        touch /var/www/password_irclogs_nodrama_de
+        ln -s /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/a083c5d5efca3734294fa656692990b6/logs/ /var/www/html/irclogs/freakazoid
+        touch /var/www/password_irclogs_freakazoid
+
+        # Set up other web-served directories.
+        su - plom -c 'mkdir -p /home/plom/dump'
+        ln -s /home/plom/dump/ /var/www/html/dump
+        su - plom -c 'mkdir -p /home/plom/geheim'
+        ln -s /home/plom/geheim/ /var/www/html/geheim
+        su - plom -c 'mkdir -p /home/plom/lesekreis'
+        ln -s /home/plom/geheim/ /var/www/html/lesekreis
+        su - plom -c 'mkdir -p /home/plom/lifelog'
+        ln -s /home/plom/lifelog/ /var/www/html/lifelog
+        su - plom -c 'git init --bare /home/plom/lifelog.git'
+        su - plom -c 'cp ~/config/systemfiles/post-update ~/lifelog.git/hooks/'
+        su - plom -c 'chmod a+x /home/plom/lifelog.git/hooks/post-update'
+        apt-get -y install pandoc
     fi
 
 elif [ "$1" = "thinkpad" ]; then
@@ -297,4 +325,4 @@ passwd plom
 rm jessie_postinstall.sh
 
 # Finalize everything with a reboot.
-reboot
+echo "You may reboot now with the 'reboot' command unless there's more to do."