From cbe21c6d6d2d3748ad347faddeaa222bf12d066b Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 13 May 2022 08:57:41 +0100 Subject: Disable MeetBot The #cip folks were our only users, and they don't want it anymore. Leave around the channel logging capabilities, as the message from them wasn't clear. This is a revert (with some conflicts) of: commit e1c06e0761c37b282d0d43fb087d67471ee6b122. commit 9e10f0dc9ecc2699d682ed9a9365c6092da18847. --- baserock_webserver/instance-irclogs-config.yml | 30 ---------------------- .../irclogs/irclogs-generation.service | 3 --- baserock_webserver/irclogs/meetingLocalConfig.py | 17 ------------ baserock_webserver/irclogs/supybot-baserock.conf | 21 +-------------- 4 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 baserock_webserver/irclogs/meetingLocalConfig.py diff --git a/baserock_webserver/instance-irclogs-config.yml b/baserock_webserver/instance-irclogs-config.yml index f050d5ff..6efb14cf 100644 --- a/baserock_webserver/instance-irclogs-config.yml +++ b/baserock_webserver/instance-irclogs-config.yml @@ -11,36 +11,6 @@ become: yes become_user: root - - name: Check for MeetBot install - stat: - path: /usr/local/lib/python2.7/dist-packages/supybot/plugins/MeetBot - register: meetbot - - - name: Install MeetBot - block: - - git: - repo: 'https://opendev.org/opendev/meetbot.git' - dest: /tmp/meetbot - version: 01e051648c2759c03f2a907552af8e4410abcde9 - - command: mv /tmp/meetbot/ircmeeting /tmp/meetbot/MeetBot/ - args: - creates: /tmp/meetbot/Meetbot/ircmeeting - - synchronize: - src: /tmp/meetbot/MeetBot - dest: /usr/local/lib/python2.7/dist-packages/supybot/plugins - delegate_to: "{{ inventory_hostname }}" - become: yes - become_user: root - when: not meetbot.stat.exists - - - name: MeetBot configuration - copy: - src: irclogs/meetingLocalConfig.py - dest: /usr/local/lib/python2.7/dist-packages/supybot/plugins/MeetBot/ircmeeting/meetingLocalConfig.py - become: yes - become_user: root - - - name: Install Supybot from pip pip: name: irclog2html diff --git a/baserock_webserver/irclogs/irclogs-generation.service b/baserock_webserver/irclogs/irclogs-generation.service index 12f0dc40..2209a6db 100644 --- a/baserock_webserver/irclogs/irclogs-generation.service +++ b/baserock_webserver/irclogs/irclogs-generation.service @@ -23,8 +23,5 @@ ExecStart=/bin/sh -c "/usr/bin/rsync -a /home/supybot/logs/ChannelLogger/gimp/\# 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/" - - [Install] WantedBy=multi-user.target diff --git a/baserock_webserver/irclogs/meetingLocalConfig.py b/baserock_webserver/irclogs/meetingLocalConfig.py deleted file mode 100644 index a4a2b534..00000000 --- a/baserock_webserver/irclogs/meetingLocalConfig.py +++ /dev/null @@ -1,17 +0,0 @@ -# Richard Darst, July 2009 -# -# Minimal meetingLocalConfig.py -# -# This file is released into the public domain, or released under the -# supybot license in areas where releasing into the public domain is -# not possible. -# - -class Config(object): - # These are "required": - logFileDir = '/home/supybot/meetings/' - logUrlPrefix = 'https://irclogs.baserock.org/meetings/' - - # These, you might want to change: - #MeetBotInfoURL = 'http://wiki.debian.org/MeetBot' - filenamePattern = '%(channel)s/%%Y/%%m/%(channel)s.%%F-%%H.%%M' diff --git a/baserock_webserver/irclogs/supybot-baserock.conf b/baserock_webserver/irclogs/supybot-baserock.conf index 7ca7b5b4..33ec2fb3 100644 --- a/baserock_webserver/irclogs/supybot-baserock.conf +++ b/baserock_webserver/irclogs/supybot-baserock.conf @@ -745,7 +745,7 @@ supybot.directories.log: /home/supybot/logs # # Default value: ### -supybot.plugins: MeetBot Admin ChannelLogger Misc User Owner Config Channel +supybot.plugins: Admin ChannelLogger Misc User Owner Config Channel ### # Determines whether this plugin is loaded by default. @@ -907,25 +907,6 @@ supybot.plugins.Config: True ### supybot.plugins.Config.public: True -### -# Determines whether this plugin is loaded by default. -### -supybot.plugins.MeetBot: True - -### -# Determines whether this plugin is publicly visible. -# -# Default value: True -### -supybot.plugins.MeetBot.public: True - -### -# Enable configuration via the supybot config mechanism. -# -# Default value: False -### -supybot.plugins.MeetBot.enableSupybotBasedConfig: False - ### # Determines whether this plugin is loaded by default. ### -- cgit v1.2.1