Move IRC bots to a subfolder and add COPYING

These files are adapted from Wikipedia page, so they are under CC BY-SA 3.0 Unported license. Update references to these files in puppet modules. Change-Id: Ic43be4154a155f1b3427aa26e12b221909e7ecbf
wikimedia · Sep 12, 2018 · 251a008 · 251a008
1 parent 80c3d5b
commit 251a008
Show file tree

Hide file tree

Showing 7 changed files with 362 additions and 5 deletions.
diff --git a/irc-relay/README b/irc-relay/README
@@ -1,4 +1,4 @@
-Needs the following packages: libpoe-perl libpoe-component-irc-perl
+The bot code needs the following packages: libpoe-perl libpoe-component-irc-perl
 Originally written by OverlordQ: http://en.wikipedia.org/wiki/User:OverlordQ/IRCRCBot
 
 Feature requests:

diff --git a/irc-relay/bot/COPYING b/irc-relay/bot/COPYING
diff --git a/irc-relay/error-relay.pl → irc-relay/bot/error-relay.pl b/irc-relay/error-relay.pl → irc-relay/bot/error-relay.pl
diff --git a/irc-relay/rc-relay.pl → irc-relay/bot/rc-relay.pl b/irc-relay/rc-relay.pl → irc-relay/bot/rc-relay.pl
diff --git a/irc-relay/logfilter.php b/irc-relay/logfilter.php
@@ -3,8 +3,6 @@
  * A script to forward error log messages with some rate limiting.
  *
  * @author Niklas Laxstrom
- *
- * @copyright Copyright © 2010, Niklas Laxström
  * @license GPL-2.0-or-later
  * @file
  */

diff --git a/puppet/modules/wiki/files/irc-log-relay.service b/puppet/modules/wiki/files/irc-log-relay.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 User=betawiki
 Group=betawiki
-ExecStart=/usr/bin/perl /home/betawiki/config/irc-relay/error-relay.pl
+ExecStart=/usr/bin/perl /home/betawiki/config/irc-relay/bot/error-relay.pl
 Restart=always
 RestartSec=60
 PrivateDevices=true

diff --git a/puppet/modules/wiki/files/irc-rc-relay.service b/puppet/modules/wiki/files/irc-rc-relay.service
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 User=betawiki
 Group=betawiki
-ExecStart=/usr/bin/perl /home/betawiki/config/irc-relay/rc-relay.pl
+ExecStart=/usr/bin/perl /home/betawiki/config/irc-relay/bot/rc-relay.pl
 Restart=always
 RestartSec=60
 PrivateDevices=true