[freeside-commits] branch master updated. aa7d05879906fde83caf3989d288c4e42de6df86
Ivan
ivan at 420.am
Fri May 10 13:12:25 PDT 2013
The branch, master has been updated
via aa7d05879906fde83caf3989d288c4e42de6df86 (commit)
via ec5706f29a4b1d6826f150ed4e64bb79c4fe0cb7 (commit)
via 5fc7d59d743f5efedcdcc28594cfb2d67602158e (commit)
from 63973c641c4be00765fa27e55c57cc5b9aa4da19 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aa7d05879906fde83caf3989d288c4e42de6df86
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri May 10 13:12:22 2013 -0700
remove obsolete mapsecrets stuff, RT#21563
diff --git a/FS/FS/InitHandler.pm b/FS/FS/InitHandler.pm
deleted file mode 100644
index 5038cf3..0000000
--- 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 (<MAPSECRETS>) {
- 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 7a93f78..6e4e0fe 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 f689bfd..c1ab783 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 dcc6ac4..5eac06b 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 714b321..42bd884 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 4f05238..cf47339 100755
--- a/bin/rebill
+++ b/bin/rebill
@@ -117,7 +117,7 @@ the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-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.
commit ec5706f29a4b1d6826f150ed4e64bb79c4fe0cb7
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri May 10 13:08:59 2013 -0700
remove obsolete mapsecrets stuff, RT#21563
diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser
index 5304813..6bfb759 100644
--- a/FS/bin/freeside-adduser
+++ b/FS/bin/freeside-adduser
@@ -7,46 +7,9 @@ use Getopt::Std;
my $FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
-getopts("s:g:n");
+getopts("g:");
my $user = shift or die &usage;
-if ( $opt_s ) {
-
- #if ( -e "$FREESIDE_CONF/mapsecrets" ) {
- # open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
- # or die "can't open $FREESIDE_CONF/mapsecrets: $!";
- # while (<MAPSECRETS>) {
- # /^(\S+) / or die "unparsable line in mapsecrets: $_";
- # die "user $user already exists\n" if $user eq $1;
- # }
- # close MAPSECRETS;
- #}
-
- #insert new entry before a wildcard...
- open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
- and flock(MAPSECRETS,LOCK_EX)
- or die "can't open $FREESIDE_CONF/mapsecrets: $!";
- open(NEW,">$FREESIDE_CONF/mapsecrets.new")
- or die "can't open $FREESIDE_CONF/mapsecrets.new: $!";
- while(<MAPSECRETS>) {
- if ( /^\*\s/ ) {
- print NEW "$user $opt_s\n";
- }
- print NEW $_;
- }
- close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
- close NEW or die "can't close $FREESIDE_CONF/mapsecrets.new: $!";
- rename("$FREESIDE_CONF/mapsecrets.new", "$FREESIDE_CONF/mapsecrets")
- or die "can't move mapsecrets.new into place: $!";
-
-}
-
-###
-
-exit if $opt_n;
-
-###
-
use FS::UID qw(adminsuidsetup);
use FS::CurrentUser;
use FS::access_user;
@@ -58,7 +21,7 @@ adminsuidsetup $user;
my $access_user = new FS::access_user {
'username' => $user,
- '_password' => 'notyet',
+ '_password' => '',
'first' => 'Firstname', # $opt_f ||
'last' => 'Lastname', # $opt_l ||
};
@@ -79,7 +42,7 @@ if ( $opt_g ) {
###
sub usage {
- die "Usage:\n\n freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]"
+ die "Usage:\n\n freeside-adduser [ -g groupnum ] username [ password ]"
}
=head1 NAME
@@ -88,7 +51,7 @@ freeside-adduser - Command line interface to add (freeside) users.
=head1 SYNOPSIS
- freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]
+ freeside-adduser [ -g groupnum ] username [ password ]
=head1 DESCRIPTION
@@ -100,17 +63,6 @@ B<Configuration | Employees | View/Edit employees>.
-g: initial groupnum
- Development/multi-DB options:
-
- -s: alternate secrets file
-
- -n: no ACL added, for bootstrapping
-
-=head1 NOTE
-
-No explicit htpasswd options are available in 1.7 - passwords are now
-maintained automatically.
-
=head1 SEE ALSO
Base Freeside documentation
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index ac93aaf..0e43276 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -149,7 +149,7 @@ the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-k: skip notify_flat_delay
-user: From the mapsecrets file - see config.html from the base documentation
+user: Typically "fs_daily"
custnum: if one or more customer numbers are specified, only bills those
customers. Otherwise, bills all customers.
diff --git a/FS/bin/freeside-deluser b/FS/bin/freeside-deluser
deleted file mode 100644
index a2a361a..0000000
--- a/FS/bin/freeside-deluser
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use vars qw($opt_h);
-use Fcntl qw(:flock);
-use Getopt::Std;
-
-my $FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
-
-getopts("h:");
-my $user = shift or die &usage;
-
-if ( $opt_h ) {
- open(HTPASSWD,"<$opt_h")
- and flock(HTPASSWD,LOCK_EX)
- or die "can't open $opt_h: $!";
- open(HTPASSWD_TMP,">$opt_h.tmp") or die "can't open $opt_h.tmp: $!";
- while (<HTPASSWD>) {
- print HTPASSWD_TMP $_ unless /^$user:/;
- }
- close HTPASSWD_TMP;
- rename "$opt_h.tmp", "$opt_h" or die $!;
- flock(HTPASSWD,LOCK_UN);
- close HTPASSWD;
-}
-
-open(MAPSECRETS,"<$FREESIDE_CONF/mapsecrets")
- and flock(MAPSECRETS,LOCK_EX)
- or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-open(MAPSECRETS_TMP,">>$FREESIDE_CONF/mapsecrets.tmp")
- or die "can't open $FREESIDE_CONF/mapsecrets.tmp: $!";
-while (<MAPSECRETS>) {
- print MAPSECRETS_TMP $_ unless /^$user\s/;
-}
-close MAPSECRETS_TMP;
-rename "$FREESIDE_CONF/mapsecrets.tmp", "$FREESIDE_CONF/mapsecrets" or die $!;
-flock(MAPSECRETS,LOCK_UN);
-close MAPSECRETS;
-
-sub usage {
- die "Usage:\n\n freeside-deluser [ -h htpasswd_file ] username"
-}
-
-=head1 NAME
-
-freeside-deluser - Command line interface to add (freeside) users.
-
-=head1 SYNOPSIS
-
- freeside-deluser [ -h htpasswd_file ] username
-
-=head1 DESCRIPTION
-
-Adds a user to the Freeside billing system. This is for adding users (internal
-sales/tech folks) to the web interface, not for adding customer accounts.
-
- -h: Also delete from the given htpasswd filename
-
-=head1 SEE ALSO
-
-L<freeside-adduser>, L<htpasswd>(1), base Freeside documentation
-
-=cut
-
diff --git a/FS/bin/freeside-monthly b/FS/bin/freeside-monthly
index 69502a0..431fbd8 100755
--- a/FS/bin/freeside-monthly
+++ b/FS/bin/freeside-monthly
@@ -74,7 +74,7 @@ the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-m: Experimental multi-process mode (delay upload jobs until billing jobs complete)
-user: From the mapsecrets file - see config.html from the base documentation
+user: Typically "fs_daily"
custnum: if one or more customer numbers are specified, only bills those
customers. Otherwise, bills all customers.
diff --git a/bin/cdr_upstream_rate.import b/bin/cdr_upstream_rate.import
index fda3883..ac2856c 100755
--- a/bin/cdr_upstream_rate.import
+++ b/bin/cdr_upstream_rate.import
@@ -6,7 +6,7 @@
#
# Example: bin/cdr_upstream_rate.import ivan 1 ~ivan/convergent/sample_rate_table.csv
#
-# username: a freeside login (from /usr/local/etc/freeside/mapsecrets)
+# username: a freeside login
# ratenum: rate plan (FS::rate) created with the web UI
# filename: CSV file
#
commit 5fc7d59d743f5efedcdcc28594cfb2d67602158e
Author: Ivan Kohler <ivan at freeside.biz>
Date: Fri May 10 13:02:36 2013 -0700
remove obsolete docs
diff --git a/httemplate/docs/session.html b/httemplate/docs/session.html
deleted file mode 100644
index 72e1642..0000000
--- a/httemplate/docs/session.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<head>
- <title>Session monitor</title>
-</head>
-<body>
-<h1>Session monitor</h1>
-<h2>Installation</h2>
-For security reasons, the client portion of the session montior may run on one
-or more external public machine(s). On these machines, install:
-<ul>
- <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at l
-east 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series. Don't enable experimental features like threads or the PerlIO abstraction layer.)
- <li><a href="man/FS/SessionClient.html">FS::SessionClient</a> (copy the fs_session/FS-SessionClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
- <li>Add the user `freeside' to the the external machine.
- <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
- <li>touch /usr/local/freeside/fs_sessiond_socket; chown freeside /usr/local/freeside/fs_sessiond_socket; chmod 600 /usr/local/freeside/fs_sessiond_socket
- <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
- <li>Run <pre>fs_session_server <i>user</i> <i>machine</i></pre> on the Freeside machine.
- <ul>
- <li><i>user</i> is a user from the mapsecrets file.
- <li><i>machine</i> is the name of the external machine.
- </ul>
-</ul>
-<h2>Usage</h2>
-<ul>
- <li>Web
- <ul>
- <li>Copy FS-SessionClient/cgi/login.cgi and logout.cgi to your web
- server's document space.
- <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run login.cgi and logout.cgi as the freeside user.
- </ul>
- <li>Command-line
- <br><pre>freeside-login username ( portnum | ip | nasnum nasport )
-freeside-logout username ( portnum | ip | nasnum nasport )</pre>
- <ul>
- <li><i>username</i> is a customer username from the svc_acct table
- <li><i>portnum</i>, <i>ip</i> or <i>nasport</i> and <i>nasnum</i> uniquely identify a port in the <a href="schema.html#port">port</a> database table.
- </ul>
- <li>RADIUS - One of:
- <ul>
- <li>Run the <b>freeside-sqlradius-radacctd</b> daemon to import radacct
- records from all configured sqlradius exports:
- <tt>freeside-sqlradius-radacctd username</tt>
- <li>Configure your RADIUS server's login and logout callbacks to use the command-line <tt>freeside-login</tt> and <tt>freeside-logout</tt> utilites.
- <li> <i>(incomplete)</i>Use the <b>fs_radlog/fs_radlogd</b> tool to
- import records from a text radacct file.
- </ul>
-</ul>
-<h2>Callbacks</h2>
-<ul>
- <li>Sesstion start - The command(s) specified in the <a href="config.html#session-start">session-start</a> configuration file are executed on the Freeside machine. The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
- <li>Session end - The command(s) specified in the <a href="config.html#session-stop">session-stop</a> configuration file are executed on the Freeside machine. The contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$ip</code>, <code>$nasip</code> and <code>$nasfqdn</code>, which are the IP address of the starting session, and the IP address and fully-qualified domain name of the NAS this session is on.
-</ul>
-<h2>Dropping expired users</h2>
-Run <pre>bin/freeside-session-kill username</pre> periodically from cron.
-</body>
-</html>
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
deleted file mode 100644
index 97d7aa7..0000000
--- a/httemplate/docs/signup.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<head>
- <title>Signup server</title>
-</head>
-<body>
- <h1>Signup server</h1>
-For security reasons, the signup server should run on an external public
-webserver. On this machine, install:
-<ul>
- <li>A web server, such as <a href="http://www.apache-ssl.org">Apache-SSL</a> or <a href="http://www.apache.org">Apache</a>
- <li><a href="ftp://ftp.cs.hut.fi/pub/ssh/">SSH</a>
- <li><a href="http://www.perl.com/CPAN/doc/relinfo/INSTALL.html">Perl</a> (at least 5.004_05 for the 5.004 series or 5.005_03 for the 5.005 series. Don't enable experimental features like threads or the PerlIO abstraction layer.)
- <li><a href="http://search.cpan.org/search?dist=Text-Template">Text::Template</a>
- <li><a href="http://search.cpan.org/search?dist=Storable">Storable</a>
- <li><a href="http://search.cpan.org/search?dist=Business-CreditCard">Business-CreditCard</a>
- <li><a href="http://search.cpan.org/search?dist=HTTP-BrowserDetect">HTTP::BrowserDetect</a>
-
- <li><a href="man/FS/SignupClient.html">FS::SignupClient</a> (copy the fs_signup/FS-SignupClient directory to the external machine, then: perl Makefile.PL; make; make install)
-</ul>
-Then:
-<ul>
- <li>Add the user `freeside' to the the external machine.
- <li>Copy or symlink fs_signup/FS-SignupClient/cgi/signup.cgi into the web server's document space.
- <li>When linking to signup.cgi, you can include a referring custnum in the URL as follows: <code>http://public.web.server/path/signup.cgi?ref=1542</code>
- <li>Enable CGI execution for files with the `.cgi' extension. (with <a href="http://www.apache.org/docs/mod/mod_mime.html#addhandler">Apache</a>)
- <li>Create the /usr/local/freeside directory on the external machine (owned by the freeside user).
- <li>touch /usr/local/freeside/fs_signupd_socket; chown freeside /usr/local/freeside/fs_signupd_socket; chmod 600 /usr/local/freeside/fs_signupd_socket
- <li>Use <a href="http://www.apache.org/docs/suexec.html">suEXEC</a> or <a href="http://www.perl.com/CPAN-local/doc/manual/html/pod/perlsec.html#Security_Bugs">setuid</a> (see <a href="install.html">install.html</a> for details) to run signup.cgi as the freeside user.
- <li>Append the identity.pub from the freeside user on your freeside machine to the authorized_keys file of the newly created freeside user on the external machine(s).
- <li>Run <pre>fs_signup_server <i>user</i> <i>machine</i> <i>agentnum</i> <i>refnum</i></pre> on the Freeside machine.
- <ul>
- <li><i>user</i> is a user from the mapsecrets file.
- <li><i>machine</i> is the name of the external machine.
- <li><i>agentnum</i> and <i>refnum</i> are the <a href="schema.html#agent">agent</a> and <a href="schema.html#part_referral">referral</a>, respectively, to use for customers who sign up via this signup server.
- </ul>
-</ul>
-Optional:
-<ul>
- <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>. This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
- (an example file is included as <b>fs_signup/ieak.template</b>) See the section on <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/INS.HTM">internet settings files</a> in the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
- <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page. Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html. An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
- <li>Variable substitutions available in <b>ieak.template</b>, <b>cck.template</b> and <b>success.html</b>:
- <ul>
- <li>$ac - area code of selected POP
- <li>$exch - exchange of selected POP
- <li>$loc - local part of selected POP
- <li>$username
- <li>$password
- <li>$email_name - first and last name
- <li>$pkg - package name
- </ul>
- <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML. This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
- <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid. This can be used to implement pre-paid "calling card" type signups. The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
-</ul>
-</body>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/InitHandler.pm | 91 ------------------------------------------
FS/bin/freeside-adduser | 56 ++------------------------
FS/bin/freeside-daily | 2 +-
FS/bin/freeside-deluser | 64 -----------------------------
FS/bin/freeside-email | 2 +-
FS/bin/freeside-fetch | 2 +-
FS/bin/freeside-monthly | 2 +-
FS/bin/freeside-queued | 2 +-
bin/cdr_upstream_rate.import | 2 +-
bin/cust_pay_histogram | 2 +-
bin/rebill | 2 +-
httemplate/docs/session.html | 59 ---------------------------
httemplate/docs/signup.html | 54 -------------------------
13 files changed, 12 insertions(+), 328 deletions(-)
delete mode 100644 FS/FS/InitHandler.pm
delete mode 100644 FS/bin/freeside-deluser
delete mode 100644 httemplate/docs/session.html
delete mode 100644 httemplate/docs/signup.html
More information about the freeside-commits
mailing list