From 47c754515a2c4eca8d8e90c75231a3a26e46f0c4 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sun, 5 Jun 2016 19:23:48 +0200 Subject: [PATCH] Update public server config. --- bin/hubbabubba.sh | 3 +++ jessie_postinstall.sh | 16 +++++++++++++++- systemfiles/nginx.conf | 24 ++++++++++++++++++++++++ systemfiles/plomlombot.service | 2 +- 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100755 bin/hubbabubba.sh diff --git a/bin/hubbabubba.sh b/bin/hubbabubba.sh new file mode 100755 index 0000000..50cc0f6 --- /dev/null +++ b/bin/hubbabubba.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd ~/plomlombot-irc +./run.sh -r 604800 -n hubbabubba "#freakazoid" diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh index 277ab39..419805f 100755 --- a/jessie_postinstall.sh +++ b/jessie_postinstall.sh @@ -225,7 +225,6 @@ if [ "$1" = "server" ]; then 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 @@ -252,6 +251,21 @@ if [ "$1" = "server" ]; then 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/lifelog' + ln -s /home/plom/lifelog/ /var/www/html/lifelog + su - plom -c 'git init --bare /home/plom/lifelog.git' + su - plom -c 'touch /home/plom/lifelog.git/hooks/post-update' + su - plom -c 'chmod a+x /home/plom/lifelog.git/hooks/post-update' + su - plom -c 'echo "#!/bin/sh" > /home/plom/lifelog.git/hooks/post-update' + su - plom -c 'echo "GIT_WORK_TREE=/home/plom/lifelog git checkout -f" >> /home/plom/lifelog.git/hooks/post-update' fi elif [ "$1" = "thinkpad" ]; then diff --git a/systemfiles/nginx.conf b/systemfiles/nginx.conf index 0c1efe3..4bb06e5 100644 --- a/systemfiles/nginx.conf +++ b/systemfiles/nginx.conf @@ -15,6 +15,9 @@ http { text/plain txt; text/plain sh; application/xhtml+xml xhtml; + application/pdf pdf; + image/jpeg jpg jpeg; + image/png png; } default_type application/octet_stream; charset utf-8; @@ -36,6 +39,17 @@ http { ssl_certificate /etc/letsencrypt/live/dump.plomlompom.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/dump.plomlompom.com/privkey.pem; root /var/www/html/; + location /lifelog/ { + autoindex on; + } + location /dump/ { + autoindex on; + } + location /geheim/ { + auth_basic "geheim geheim"; + auth_basic_user_file /var/www/password_geheim; + autoindex on; + } location /irclogs/zrolaps/ { auth_basic "#zrolaps logs"; auth_basic_user_file /var/www/password_irclogs_zrolaps; @@ -46,6 +60,16 @@ http { auth_basic_user_file /var/www/password_irclogs_nodrama_de; autoindex on; } + location /irclogs/freakazoid/ { + auth_basic "#freakazoid logs"; + auth_basic_user_file /var/www/password_irclogs_freakazoid; + autoindex on; + } + location /lesekreis/ { + auth_basic "Quellen Lesekreis"; + auth_basic_user_file /var/www/password_lesekreis; + autoindex on; + } } # htwtxt diff --git a/systemfiles/plomlombot.service b/systemfiles/plomlombot.service index 8c464a2..8e62c0d 100644 --- a/systemfiles/plomlombot.service +++ b/systemfiles/plomlombot.service @@ -6,7 +6,7 @@ Description=plomlombot screen [Service] Type=forking User=plom -ExecStart=/bin/sh -c 'LC_ALL=en_US.UTF8 screen -d -m ~/config/bin/plomlombot.sh && screen -d -m ~/config/bin/broiler_in.sh' +ExecStart=/bin/sh -c 'LC_ALL=en_US.UTF8 screen -d -m ~/config/bin/plomlombot.sh && screen -d -m ~/config/bin/broiler_in.sh && screen -d -m ~/config/bin/hubbabubba.sh' [Install] WantedBy=multi-user.target -- 2.30.2