From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 26 Dec 2022 16:44:40 +0000 (+0100)
Subject: Improve microblog.pub setup.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-favicon.png?a=commitdiff_plain;h=82fa5b67b20dfff3fa3cdeaa2a08e911c4472fbb;p=config

Improve microblog.pub setup.
---

diff --git a/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service b/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service
new file mode 100644
index 0000000..7a64014
--- /dev/null
+++ b/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=microblog.pub
+
+[Service]
+Type=simple
+User=plom
+WorkingDirectory=/home/plom/testing.microblog.pub/
+ExecStart=/bin/sh -c 'poetry run supervisord -c misc/supervisord.conf -n'
+Environment=VENV_DIR=REPLACE_venv_dir_ECALPER
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bullseye/setup_scripts/setup_microblogpub.sh b/bullseye/setup_scripts/setup_microblogpub.sh
index 8066430..2c057af 100755
--- a/bullseye/setup_scripts/setup_microblogpub.sh
+++ b/bullseye/setup_scripts/setup_microblogpub.sh
@@ -26,19 +26,25 @@ python_version=3.11.1
 python_dirname="Python-${python_version}"
 su -lc "wget https://www.python.org/ftp/python/${python_version}/${python_dirname}.tgz" plom
 su -lc "tar -xvf ${python_dirname}.tgz" plom
-# su -lc "cd /home/plom/${python_dirname} && ./configure --enable-optimizations && make && make test"
 su -lc "cd /home/plom/${python_dirname} && ./configure --enable-optimizations && make"
 cd /home/plom/${python_dirname}/
 make altinstall
 cd
-# TODO delete python build dir
+rm -rf /home/plom/${python_dirname}
+
+# Configure/install Poetry and microblog.pub.
 su -lc "curl -sSL https://install.python-poetry.org | python3.11" - plom
 su -lc "git clone https://git.sr.ht/~tsileo/microblog.pub testing.microblog.pub" - plom
 su -lc "poetry config installer.parallel false" - plom
 su -lc "cd testing.microblog.pub && poetry install" - plom
-su -lc "cd testing.microblog.pub && poetry run inv configuration-wizard" - plom
-su -lc "cd testing.microblog.pub && poetry run inv migrate-db" - plom
-# VENV_DIR=/home/ubuntu/.cache/pypoetry/virtualenvs/microblogpub-chx-y1oE-py3.10 poetry run supervisord -c misc/supervisord.conf -n
+su -lPc "cd testing.microblog.pub && poetry run inv configuration-wizard" - plom
+su -lPc "cd testing.microblog.pub && poetry run inv migrate-db" - plom
+
+# Set up microblog.pub daemon service.
+venv_dir=$( su -lPc "cd testing.microblog.pub && poetry env info" - plom | grep 'Path' | head -1 | awk '{print $2}')
+sed -i "s/REPLACE_venv_dir_ECALPER/${venv_dir}/g" /etc/systemd/system/microblogpub.service
+systemctl enable microblogpub.service
+service microblogpub start
 
 # Prepare and start NGINX config.
 sed -i "s/REPLACE_fqdn_ECALPER/${domain}/g" /etc/nginx/sites-available/microblogpub.nginx