From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 10 Dec 2018 01:20:56 +0000 (+0100)
Subject: Fix problems with web server setup.
X-Git-Url: https://plomlompom.com/repos/calendar?a=commitdiff_plain;h=feea0cfa0ce3d3e2ad9058b5cad932fd11019d3a;p=config

Fix problems with web server setup.
---

diff --git a/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service b/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
index 1ee35e8..0286c60 100644
--- a/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
+++ b/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service
@@ -4,7 +4,7 @@ Description=plomlombot screen
 [Service]
 Type=forking
 User=plom
-ExecStart=/bin/sh -c 'screen -d -m ~/start.sh plomlombob "#plomlompomtest"'
+ExecStart=/bin/sh -c 'screen -d -m ~/start_plomlombot.sh plomlombob "#plomlompomtest"'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/all_new_2018/setup_plomlombot.sh b/all_new_2018/setup_plomlombot.sh
index 9304394..cf8a679 100755
--- a/all_new_2018/setup_plomlombot.sh
+++ b/all_new_2018/setup_plomlombot.sh
@@ -5,7 +5,10 @@ config_tree_prefix="${HOME}/config/all_new_2018//"
 cp "${config_tree_prefix}"/user_scripts/start_plomlombot.sh /home/plom/
 chown plom:plom /home/plom/start_plomlombot.sh
 apt -y install screen python3-venv
+su plom -c "cd && git clone http://github.com/plomlompom/plomlombot-irc"
 systemctl enable /etc/systemd/system/plomlombot.service
-service start plomlombot
+service plomlombot start
 mkdir -p /var/www/html/irclogs
-ln /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/789a38c5af11bb71833d89cd74387fcb/logs /var/www/html/irclogs/plomlompomtest
+plomlompomtest_dir=/home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/789a38c5af11bb71833d89cd74387fcb/logs
+mkdir -p "${plomlompomtest_dir}"
+ln "${plomlompomtest_dir}" /var/www/html/irclogs/plomlompomtest
diff --git a/all_new_2018/setup_web.sh b/all_new_2018/setup_web.sh
index 8cd1401..517e0af 100755
--- a/all_new_2018/setup_web.sh
+++ b/all_new_2018/setup_web.sh
@@ -8,4 +8,5 @@ apt -y -o Dpkg::Options::=--force-confold install nginx gitweb fcgiwrap
 cd /var/
 rm -rf www
 git clone plom@core.plomlompom.com:repos/website www
+su plom -c 'cd /var/ && mkdir public_repos'
 iptables-restore /etc/iptables/rules.v4