From d0849f234815c4efa5da6b091f1403da468fcdb1 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 18 Aug 2021 12:29:50 +0200 Subject: baserock_webserver/instance-irclogs-config.yml: fix for ubuntu --- baserock_webserver/instance-irclogs-config.yml | 4 +++- baserock_webserver/irclogs/irclogs-generation.service | 12 ++++++------ baserock_webserver/irclogs/supybot.service | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/baserock_webserver/instance-irclogs-config.yml b/baserock_webserver/instance-irclogs-config.yml index 1a687397..f050d5ff 100644 --- a/baserock_webserver/instance-irclogs-config.yml +++ b/baserock_webserver/instance-irclogs-config.yml @@ -66,8 +66,10 @@ template: src: "irclogs/supybot-baserock.conf" dest: "/home/supybot/supybot-baserock.conf" + owner: supybot + group: supybot become: yes - become_user: supybot + become_user: root - name: install systemd units copy: diff --git a/baserock_webserver/irclogs/irclogs-generation.service b/baserock_webserver/irclogs/irclogs-generation.service index ca5bcb33..12f0dc40 100644 --- a/baserock_webserver/irclogs/irclogs-generation.service +++ b/baserock_webserver/irclogs/irclogs-generation.service @@ -5,22 +5,22 @@ Requires=supybot.service [Service] Type=oneshot User=supybot -ExecStart=/usr/bin/logs2html -t 'IRC logs for #baserock' -p 'IRC logs for #baserock for ' /home/supybot/logs/ChannelLogger/libera/#baserock/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #baserock' -p 'IRC logs for #baserock for ' /home/supybot/logs/ChannelLogger/libera/#baserock/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/libera/\#baserock/*html /home/supybot/logs/ChannelLogger/libera/\#baserock/*css /srv/irclogs.baserock.org/" -ExecStart=/usr/bin/logs2html -t 'IRC logs for #automotive' -p 'IRC logs for #automotive for ' /home/supybot/logs/ChannelLogger/freenode/#automotive/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #automotive' -p 'IRC logs for #automotive for ' /home/supybot/logs/ChannelLogger/freenode/#automotive/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/freenode/\#automotive/*html /home/supybot/logs/ChannelLogger/freenode/\#automotive/*css /srv/irclogs.baserock.org/automotive" -ExecStart=/usr/bin/logs2html -t 'IRC logs for #cip' -p 'IRC logs for #cip for ' /home/supybot/logs/ChannelLogger/libera/#cip/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #cip' -p 'IRC logs for #cip for ' /home/supybot/logs/ChannelLogger/libera/#cip/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/libera/\#cip/*html /home/supybot/logs/ChannelLogger/libera/\#cip/*css /srv/irclogs.baserock.org/cip" -ExecStart=/usr/bin/logs2html -t 'IRC logs for #trustable' -p 'IRC logs for #trustable for ' /home/supybot/logs/ChannelLogger/freenode/#trustable/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #trustable' -p 'IRC logs for #trustable for ' /home/supybot/logs/ChannelLogger/freenode/#trustable/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/freenode/\#trustable/*html /home/supybot/logs/ChannelLogger/freenode/\#trustable/*css /srv/irclogs.baserock.org/trustable" -ExecStart=/usr/bin/logs2html -t 'IRC logs for #buildstream' -p 'IRC logs for #buildstream for ' /home/supybot/logs/ChannelLogger/gimp/#buildstream/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #buildstream' -p 'IRC logs for #buildstream for ' /home/supybot/logs/ChannelLogger/gimp/#buildstream/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/gimp/\#buildstream/*html /home/supybot/logs/ChannelLogger/gimp/\#buildstream/*css /srv/irclogs.baserock.org/buildstream" -ExecStart=/usr/bin/logs2html -t 'IRC logs for #freedesktop-sdk' -p 'IRC logs for #freedesktop-sdk for ' /home/supybot/logs/ChannelLogger/freenode/#freedesktop-sdk/ +ExecStart=/usr/local/bin/logs2html -t 'IRC logs for #freedesktop-sdk' -p 'IRC logs for #freedesktop-sdk for ' /home/supybot/logs/ChannelLogger/freenode/#freedesktop-sdk/ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/freenode/\#freedesktop-sdk/*html /home/supybot/logs/ChannelLogger/freenode/\#freedesktop-sdk/*css /srv/irclogs.baserock.org/freedesktop-sdk" ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/meetings /srv/irclogs.baserock.org/" diff --git a/baserock_webserver/irclogs/supybot.service b/baserock_webserver/irclogs/supybot.service index 49720f70..c3df8a75 100644 --- a/baserock_webserver/irclogs/supybot.service +++ b/baserock_webserver/irclogs/supybot.service @@ -10,6 +10,6 @@ After=local-fs.target ConditionPathExists=/home/supybot/supybot-baserock.conf [Service] -ExecStart=/usr/bin/supybot /home/supybot/supybot-baserock.conf +ExecStart=/usr/local/bin/supybot /home/supybot/supybot-baserock.conf User=supybot Restart=always -- cgit v1.2.1