From aa7d05879906fde83caf3989d288c4e42de6df86 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Fri, 10 May 2013 13:12:22 -0700 Subject: [PATCH] remove obsolete mapsecrets stuff, RT#21563 --- FS/FS/InitHandler.pm | 91 -------------------------------------------------- FS/bin/freeside-email | 2 +- FS/bin/freeside-fetch | 2 +- FS/bin/freeside-queued | 2 +- bin/cust_pay_histogram | 2 +- bin/rebill | 2 +- 6 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 FS/FS/InitHandler.pm diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm deleted file mode 100644 index 5038cf352..000000000 --- a/FS/FS/InitHandler.pm +++ /dev/null @@ -1,91 +0,0 @@ -package FS::InitHandler; - -# this leaks memory under graceful restarts and i wouldn't use it on any -# modern server. useful for very slow machines with memory to spare, just -# always do a full restart - -use strict; -use vars qw($DEBUG); -use FS::UID qw(adminsuidsetup); -use FS::Record; - -$DEBUG = 1; - -sub handler { - - use Date::Format; - use Date::Parse; - use Tie::IxHash; - use HTML::Entities; - use IO::Handle; - use IO::File; - use String::Approx; - use HTML::Widgets::SelectLayers 0.02; - #use FS::UID; - #use FS::Record; - use FS::Conf; - use FS::CGI; - use FS::Msgcat; - - use FS::agent; - use FS::agent_type; - use FS::domain_record; - use FS::cust_bill; - use FS::cust_bill_pay; - use FS::cust_credit; - use FS::cust_credit_bill; - use FS::cust_main; - use FS::cust_main_county; - use FS::cust_pay; - use FS::cust_pkg; - use FS::cust_refund; - use FS::cust_svc; - use FS::nas; - use FS::part_bill_event; - use FS::part_pkg; - use FS::part_referral; - use FS::part_svc; - use FS::pkg_svc; - use FS::port; - use FS::queue; - use FS::raddb; - use FS::session; - use FS::svc_acct; - use FS::svc_acct_pop; - use FS::svc_domain; - use FS::svc_forward; - use FS::svc_www; - use FS::type_pkgs; - use FS::part_export; - use FS::part_export_option; - use FS::export_svc; - use FS::msgcat; - - warn "[FS::InitHandler] handler called\n" if $DEBUG; - - #this is sure to be broken on freebsd - $> = $FS::UID::freeside_uid; - - open(MAPSECRETS,"<$FS::UID::conf_dir/mapsecrets") - or die "can't read $FS::UID::conf_dir/mapsecrets: $!"; - - my %seen; - while () { - next if /^\s*(#|$)/; - /^([\w\-\.]+)\s(.*)$/ - or do { warn "strange line in mapsecrets: $_"; next; }; - my($user, $datasrc) = ($1, $2); - next if $seen{$datasrc}++; - warn "[FS::InitHandler] preloading $datasrc for $user\n" if $DEBUG; - adminsuidsetup($user); - } - - close MAPSECRETS; - - #lalala probably broken on freebsd - ($<, $>) = ($>, $<); - $< = 0; - -} - -1; diff --git a/FS/bin/freeside-email b/FS/bin/freeside-email index 7a93f78ee..6e4e0fe6c 100755 --- a/FS/bin/freeside-email +++ b/FS/bin/freeside-email @@ -45,7 +45,7 @@ freeside-email - Prints email addresses of all users on STDOUT Prints the email addresses of all customers on STDOUT, separated by newlines. -user: From the mapsecrets file - see config.html from the base documentation +user: Freeside user =head1 BUGS diff --git a/FS/bin/freeside-fetch b/FS/bin/freeside-fetch index f689bfd93..c1ab78373 100755 --- a/FS/bin/freeside-fetch +++ b/FS/bin/freeside-fetch @@ -79,7 +79,7 @@ freeside-fetch - Send a freeside page to a list of employees. Fetches a web page specified by url as if employee and emails it to employee. Useful when run out of cron to send freeside web pages. - user: From the mapsecrets file - a user with access to the freeside database + user: Freeside user employee: the username of an employee to receive the emailed page. May be a comma separated list diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued index dcc6ac4ba..5eac06b24 100644 --- a/FS/bin/freeside-queued +++ b/FS/bin/freeside-queued @@ -296,7 +296,7 @@ Job queue daemon. Should be running at all times. -n: non-"secure" jobs only (other jobs) -user: from the mapsecrets file - see config.html from the base documentation +user: Typically "fs_queue" =head1 VERSION diff --git a/bin/cust_pay_histogram b/bin/cust_pay_histogram index 714b32140..42bd8844d 100755 --- a/bin/cust_pay_histogram +++ b/bin/cust_pay_histogram @@ -103,7 +103,7 @@ Displays a histogram of cust_pay records in the database. -a: Only process payments of customers with the specified agentnum -user: From the mapsecrets file - see config.html from the base documentation +user: Freeside username =head1 BUGS diff --git a/bin/rebill b/bin/rebill index 4f052384d..cf473398a 100755 --- a/bin/rebill +++ b/bin/rebill @@ -117,7 +117,7 @@ the bill and collect methods of a cust_main object. See L. -k: skip notify_flat_delay and vacuum -user: From the mapsecrets file - see config.html from the base documentation +user: Freeside user custnum: if one or more customer numbers are specified, only bills those customers. Otherwise, bills all customers. -- 2.11.0