[dw-free] Remove unneeded djabberd line in multicvs.conf.

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/ec87b4c21587]

http://bugs.dwscoalition.org/show_bug.cgi?id=2545

Remove remaining djabberd scripts.

Patch by denise.

Files modified:

• bin/fakesms-djabberd
• bin/ljtalkd

--------------------------------------------------------------------------------
diff -r 7dac7303e79d -r ec87b4c21587 bin/fakesms-djabberd
--- a/bin/fakesms-djabberd	Tue Jun 29 22:31:49 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-#!/usr/bin/perl
-# This code was forked from the LiveJournal project owned and operated
-# by Live Journal, Inc. The code has been modified and expanded by 
-# Dreamwidth Studios, LLC. These files were originally licensed under
-# the terms of the license supplied by Live Journal, Inc, which can
-# currently be found at:
-#
-# http://code.livejournal.org/trac/livejournal/browser/trunk/LICENSE-LiveJournal.txt
-#
-# In accordance with the original license, this code and all its
-# modifications are provided under the GNU General Public License. 
-# A copy of that license can be found in the LICENSE file included as
-# part of this distribution.
-
-use strict;
-use lib "$ENV{LJHOME}/cgi-bin";
-use lib "$ENV{LJHOME}/src/djabberd/lib";
-require 'ljconfig.pl';
-
-use DJabberd;
-use DJabberd::Authen::AllowedUsers;
-use DJabberd::Authen::StaticPassword;
-use DJabberd::Delivery::Local;
-use DJabberd::FakeSMS;
-use Getopt::Long;
-
-use vars qw($DEBUG);
-$DEBUG = 0;
-
-my ($daemonize);
-
-Getopt::Long::GetOptions(
-    'd|daemon'       => \$daemonize,
-    'debug=i'        => \$DEBUG,
-   );
-
-use FindBin qw($Bin);
-
-use DJabberd::VHost;
-my $vhost = DJabberd::VHost->new(
-                                 server_name => $LJ::DOMAIN,
-                                 s2s       => 0,
-                                 plugins   => [
-                                               DJabberd::Authen::AllowedUsers->new(policy => "deny",
-                                                                                   allowedusers => [qr/^\+?\d+/, 'sms']),
-                                               DJabberd::Authen::StaticPassword->new(password => "smstest"),
-                                               DJabberd::Delivery::FakeSMS->new(),
-                                               DJabberd::Delivery::Local->new(),
-                                               DJabberd::RosterStorage::FakeSMS->new(),
-                                               DJabberd::PresenceChecker::FakeSMS->new(),
-                                               ],
-                                 );
-
-my $server = DJabberd->new(
-                           daemonize => $daemonize,
-                           );
-
-$server->add_vhost($vhost);
-
-# incoming
-$server->start_simple_server(5224);
-
-$server->run;
-
-
diff -r 7dac7303e79d -r ec87b4c21587 bin/ljtalkd
--- a/bin/ljtalkd	Tue Jun 29 22:31:49 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#!/usr/bin/perl
-# This code was forked from the LiveJournal project owned and operated
-# by Live Journal, Inc. The code has been modified and expanded by 
-# Dreamwidth Studios, LLC. These files were originally licensed under
-# the terms of the license supplied by Live Journal, Inc, which can
-# currently be found at:
-#
-# http://code.livejournal.org/trac/livejournal/browser/trunk/LICENSE-LiveJournal.txt
-#
-# In accordance with the original license, this code and all its
-# modifications are provided under the GNU General Public License. 
-# A copy of that license can be found in the LICENSE file included as
-# part of this distribution.
-
-use strict;
-use lib "$ENV{LJHOME}/cgi-bin";
-use Danga::Socket;
-use IO::Socket::INET;
-require 'ljlib.pl';
-
-die "This is currently for dev servers only.\n" unless $LJ::IS_DEV_SERVER;
-die "No gearmand servers configured in \@LJ::GEARMAN_SERVERS.\n" unless @LJ::GEARMAN_SERVERS;
-my $sock = IO::Socket::INET->new(PeerAddr => $LJ::GEARMAN_SERVERS[0])
-    or die "First gearmand server in \@LJ::GEARMAN_SERVERS ($LJ::GEARMAN_SERVERS[0]) isn't responding.\n";
-
-print $sock "workers\r\n";
-my $found_ljtalk = 0;
-while (<$sock>) {
-    $found_ljtalk = 1 if (/ljtalk_auth_check/ && /ljtalk_bot_talk/);
-    last if /^\./;
-}
-
-my $worker_pid;
-END {
-    if ($worker_pid) {
-        kill 9, $worker_pid;
-        print "killing worker pid $worker_pid\n";
-    }
-}
-unless ($found_ljtalk) {
-    $worker_pid = fork;
-    die "Fork error" unless defined $worker_pid;
-    if (!$worker_pid) {
-        exec("$LJ::HOME/bin/worker/ljtalk-gm");
-    }
-    print "Gearman worker ljtalk-gm started w/ pid $worker_pid.\n";
-}
-
-chdir("$LJ::HOME/cvs/djabberd/DJabberd") or die "failed to chdir";
-print "Starting djabberd.\n";
-$ENV{LJ_DOMAIN} = $LJ::DOMAIN;
-system("perl",
-       "-I", "$ENV{LJHOME}/cgi-bin",
-       '-I', '../../gearman/api/perl/Gearman-Client-Async/lib/',
-       '-I', '../DJabberd-LiveJournal/lib',
-       '-I', 'lib',
-       './djabberd', '--conf=../DJabberd-LiveJournal/conf/ljtalk.conf');
-
-
--------------------------------------------------------------------------------