summaryrefslogtreecommitdiff
path: root/FS/bin
diff options
context:
space:
mode:
Diffstat (limited to 'FS/bin')
-rwxr-xr-xFS/bin/freeside-delete-addr_blocks31
-rwxr-xr-xFS/bin/freeside-init-config92
-rw-r--r--FS/bin/freeside-selfservice-server7
-rwxr-xr-xFS/bin/freeside-setup25
-rwxr-xr-xFS/bin/freeside-upgrade16
5 files changed, 6 insertions, 165 deletions
diff --git a/FS/bin/freeside-delete-addr_blocks b/FS/bin/freeside-delete-addr_blocks
deleted file mode 100755
index a7e99766a..000000000
--- a/FS/bin/freeside-delete-addr_blocks
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use vars qw( $user $block @blocks );
-use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearch);
-use FS::addr_block;
-use FS::svc_broadband;
-
-$user = shift or die &usage;
-&adminsuidsetup( $user );
-
-@blocks = qsearch('addr_block', {} );
-die "No address blocks" unless (scalar(@blocks) > 0);
-
-foreach $block (@blocks) {
- my @devices = qsearch('svc_broadband', { 'blocknum' => $block->blocknum } );
- if (@devices) {
- print "Skipping block " . $block->ip_gateway . " / " . $block->ip_netmask;
- print "\n";
- }else{
- print "Deleting block " . $block->ip_gateway . " / " . $block->ip_netmask;
- print "\n";
- $block->delete;
- }
-}
-
-
-sub usage {
- "Usage:\n freeside-delete-addr_blocks user \n";
-}
diff --git a/FS/bin/freeside-init-config b/FS/bin/freeside-init-config
deleted file mode 100755
index a186d1a85..000000000
--- a/FS/bin/freeside-init-config
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use strict;
-use vars qw($opt_u $opt_f $opt_v);
-use Getopt::Std;
-use IO::File;
-use FS::UID qw(adminsuidsetup checkeuid dbh);
-use FS::CurrentUser;
-use FS::Record qw(qsearch);
-
-
-die "Not running uid freeside!" unless checkeuid();
-
-getopts("u:vf");
-my $dir = shift or die &usage;
-
-$FS::CurrentUser::upgrade_hack = 1;
-adminsuidsetup $opt_u; #$user;
-
-$|=1;
-
-my $conf = new FS::Conf;
-if (!scalar(qsearch('conf', {})) || $opt_f) {
-
- foreach my $item ( $conf->config_items() ) {
- insert_config_item($item,$dir);
- }
-
- # ugly pseudo false laziness with Conf.pm
- foreach my $item ( map { my $basename = basename($_);
- $basename =~ /^(.*)$/;
- $basename = $1;
- new FS::ConfItem {
- 'key' => $basename,
- 'type' => '',
- }
- } glob($dir. '/invoice_template_*'),
- glob($dir. '/invoice_html_*'),
- glob($dir. '/invoice_htmlnotes_*'),
- glob($dir. '/invoice_latex_*'),
- glob($dir. '/invoice_latexnotes_*')
- ) {
-
- insert_config_item($item,$dir);
-
- }
-
- foreach my $item ( map { my $basename = basename($_);
- $basename =~ /^(.*)$/;
- $basename = $1;
- new FS::ConfItem {
- 'key' => $basename,
- 'type' => 'binary',
- }
- } glob($dir. '/logo_*.png'),
- glob($dir. '/logo_*.eps')
- ) {
-
- insert_config_item($item,$dir);
-
- }
-
-}
-
-warn "Freeside database initialized - committing transaction\n" if $opt_v;
-
-dbh->commit or die dbh->errstr;
-dbh->disconnect or die dbh->errstr;
-
-warn "Configuration initialization committed successfully\n" if $opt_v;
-
-sub insert_config_item {
- local $/;
- my ($item,$dir) = @_;
- my $key = $item->key;
- if (-e "$dir/$key") {
- warn "Inserting $key\n" if $opt_v;
- my $value = readline(new IO::File "$dir/$key");
- if ($item->type eq 'binary'){
- $conf->set_binary($key, $value);
- }else{
- $conf->set($key, $value);
- }
- }
-}
-
-sub usage {
- die "Usage:\n freeside-init-config directory [ -v ] [ -f ]\n"
- # [ -u user ] for devel/multi-db installs
-}
-
-1;
diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
index 205f1c3ab..187bc1469 100644
--- a/FS/bin/freeside-selfservice-server
+++ b/FS/bin/freeside-selfservice-server
@@ -16,7 +16,8 @@ use FS::UID qw(adminsuidsetup forksuidsetup);
use FS::ClientAPI;
use FS::Conf;
-use FS::cust_svc;
+use FS::cust_bill;
+use FS::cust_pkg;
$FREESIDE_LOG = "%%%FREESIDE_LOG%%%";
$FREESIDE_LOCK = "%%%FREESIDE_LOCK%%%";
@@ -57,10 +58,6 @@ logfile("$FREESIDE_LOG/selfservice.$machine.log");
daemonize2();
my $conf = new FS::Conf;
-if ( $conf->exists('selfservice-ignore_quantity') ) {
- $FS::cust_svc::ignore_quantity = 1;
- $FS::cust_svc::ignore_quantity = 1; #now it is used twice.
-}
my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index ed737b395..ddc210f50 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -19,12 +19,9 @@ die "Not running uid freeside!" unless checkeuid();
# map { lc($FS::raddb::attrib{$_}) => $_ } keys %FS::raddb::attrib;
getopts("u:vd:");
-my $config_dir = shift || 'conf' ;
-$config_dir =~ /^([\w.:=]+)$/
- or die "unacceptable configuration directory name";
-$config_dir = $1;
+#my $user = shift or die &usage;
-getsecrets($opt_u);
+getsecrets($opt_u); #$user);
#needs to match FS::Record
my($dbdef_file) = "%%%FREESIDE_CONF%%%/dbdef.". datasrc;
@@ -91,9 +88,7 @@ $dbdef->save($dbdef_file);
###
$FS::CurrentUser::upgrade_hack = 1;
-$FS::UID::callback_hack = 1;
my $dbh = adminsuidsetup $opt_u; #$user;
-$FS::UID::callback_hack = 0;
#create tables
$|=1;
@@ -110,20 +105,6 @@ dbdef_create($dbh, $dbdef_file);
delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
reload_dbdef($dbdef_file);
-warn "Freeside schema initialized - commiting transaction\n" if $opt_v;
-
-$dbh->commit or die $dbh->errstr;
-$dbh->disconnect or die $dbh->errstr;
-
-warn "Database schema committed successfully\n" if $opt_v;
-
-my $init_config = "freeside-init-config";
-$init_config .= " -v" if $opt_v;
-$init_config .= " -u $opt_u" if $opt_u;
-$init_config .= " $config_dir";
-system "$init_config" ;
-
-$dbh = adminsuidsetup $opt_u;
create_initial_data('domain' => $opt_d);
warn "Freeside database initialized - commiting transaction\n" if $opt_v;
@@ -140,7 +121,7 @@ sub dbdef_create { # reverse engineer the schema from the DB and save to file
}
sub usage {
- die "Usage:\n freeside-setup -d domain.name [ -v ] [ config/dir ]\n"
+ die "Usage:\n freeside-setup -d domain.name [ -v ]\n"
# [ -u user ] for devel/multi-db installs
}
diff --git a/FS/bin/freeside-upgrade b/FS/bin/freeside-upgrade
index db58c117c..3a4e4f8e3 100755
--- a/FS/bin/freeside-upgrade
+++ b/FS/bin/freeside-upgrade
@@ -8,7 +8,6 @@ use DBIx::DBSchema 0.31;
use FS::UID qw(adminsuidsetup checkeuid datasrc ); #getsecrets);
use FS::CurrentUser;
use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
-use FS::Misc qw(prune_applications);
die "Not running uid freeside!" unless checkeuid();
@@ -41,25 +40,12 @@ if ( $DRY_RUN ) {
dbdef->update_schema( dbdef_dist, $dbh );
}
-my $hashref = {};
-$hashref->{dry_run} = 1 if $DRY_RUN;
-$hashref->{debug} = 1 if $DEBUG;
-print join "\n", prune_applications($hashref);
-print "\n" if $DRY_RUN;
-
-
$dbh->commit or die $dbh->errstr;
dbdef_create($dbh, $dbdef_file);
$dbh->disconnect or die $dbh->errstr;
-unless ( $DRY_RUN ) {
- my $init_config = "freeside-init-config -u $user ";
- $init_config .= "%%%FREESIDE_CONF%%%/conf.". datasrc;
- system "$init_config" ;
-}
-
###
sub dbdef_create { # reverse engineer the schema from the DB and save to file
@@ -78,7 +64,7 @@ freeside-upgrade - Upgrades database schema for new freeside verisons.
=head1 SYNOPSIS
- freeside-upgrade [ -d ] [ -q | -v ]
+ freeside-adduser [ -d ] [ -q | -v ]
=head1 DESCRIPTION
generated by cgit v1.2.1 (git 2.18.0) at 2025-06-30 23:03:06 +0000