#!/usr/bin/perl -w
-#
-# $Id: freeside-adduser,v 1.11 2006-06-30 14:30:26 ivan Exp $
use strict;
-use vars qw($opt_h $opt_b $opt_c $opt_g);
+use vars qw($opt_s $opt_g $opt_n);
use Fcntl qw(:flock);
use Getopt::Std;
-my $FREESIDE_CONF = "/usr/local/etc/freeside";
+my $FREESIDE_CONF = "%%%FREESIDE_CONF%%%";
-getopts("bch:g:");
-die &usage if $opt_c && ! $opt_h;
+getopts("s:g:n");
my $user = shift or die &usage;
-#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;
-#}
-
-if ( $opt_h ) {
- my @args = ( 'htpasswd' );
- push @args, '-b' if $opt_b;
- push @args, '-c' if $opt_c;
- push @args, $opt_h, $user;
- push @args, shift if $opt_b;
- system(@args) == 0 or die "htpasswd failed: $?";
+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: $!";
+
}
-#my $secretfile = $opt_s || 'secrets';
-#
-#open(MAPSECRETS,">>$FREESIDE_CONF/mapsecrets")
-# and flock(MAPSECRETS,LOCK_EX)
-# or die "can't open $FREESIDE_CONF/mapsecrets: $!";
-#print MAPSECRETS "$user $secretfile\n";
-#close MAPSECRETS or die "can't close $FREESIDE_CONF/mapsecrets: $!";
+###
+
+exit if $opt_n;
###
###
sub usage {
- die "Usage:\n\n freeside-adduser [ -h htpasswd_file [ -c ] [ -b ] ] [ -g groupnum ] username"
+ die "Usage:\n\n freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]"
}
=head1 NAME
=head1 SYNOPSIS
- freeside-adduser [ -h htpasswd_file [ -c ] ] -g 1 username
+ freeside-adduser [ -n ] [ -s ] [ -g groupnum ] username [ password ]
=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 call htpasswd for this user with the given filename
+This functionality is now available in the web interface as well, under
+B<Configuration | Employees | View/Edit employees>.
+
+ -g: initial groupnum
- -c: Passed to htpasswd(1)
+ Development/multi-DB options:
- -b: same as htpasswd(1), probably insecure, not recommended
+ -s: alternate secrets file
- -g: initial groupnum
+ -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
-L<htpasswd>(1), base Freeside documentation
+Base Freeside documentation
=cut