From: Ivan Kohler Date: Fri, 10 May 2013 20:08:59 +0000 (-0700) Subject: remove obsolete mapsecrets stuff, RT#21563 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ec5706f29a4b1d6826f150ed4e64bb79c4fe0cb7 remove obsolete mapsecrets stuff, RT#21563 --- diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser index 530481377..6bfb759f8 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 () { - # /^(\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() { - 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. -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 ac93aaf2f..0e43276ad 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. -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 a2a361a83..000000000 --- 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 () { - 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 () { - 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, L(1), base Freeside documentation - -=cut - diff --git a/FS/bin/freeside-monthly b/FS/bin/freeside-monthly index 69502a01d..431fbd86f 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. -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 fda3883b5..ac2856cee 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 #