From edda09a317f5dfef05fb8906f28531ec6f4b0927 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 30 Oct 2001 11:47:54 +0000 Subject: [PATCH] whew more install docs and automation --- FS/bin/freeside-adduser | 6 ++--- Makefile | 16 ++++++------- httemplate/docs/admin.html | 13 +++++----- httemplate/docs/config.html | 5 ++-- httemplate/docs/index.html | 2 ++ httemplate/docs/install.html | 57 +++++++++++++++++++++++++++++++------------- 6 files changed, 62 insertions(+), 37 deletions(-) diff --git a/FS/bin/freeside-adduser b/FS/bin/freeside-adduser index 4517a83fa..e66b0d012 100644 --- a/FS/bin/freeside-adduser +++ b/FS/bin/freeside-adduser @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# $Id: freeside-adduser,v 1.1 2001-10-30 10:20:32 ivan Exp $ +# $Id: freeside-adduser,v 1.2 2001-10-30 11:47:54 ivan Exp $ use strict; use vars qw($opt_h $opt_c); @@ -33,9 +33,9 @@ freeside-adduser - Command line interface to add (freeside) users. =head1 SYNOPSIS - freeside-adduser [ -h htpasswd_file [ -c ] ] username + freeside-adduser [ -h htpasswd_file [ -c ] ] secretfile username -=head DESCRIPTION +=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. diff --git a/Makefile b/Makefile index 90b6bf465..3b0262523 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,11 @@ #!/usr/bin/make -#Pg DATASOURCE = DBI:Pg:host=localhost;dbname=freeside +#DATASOURCE=DBI:mysql:freeside #pgsql on some systems; check /etc/passwd -DB_ADMIN_USER = postgres -DB_ADMIN_PASSWORD= -#mysql -#DATASOURCE=DBI:mysql:freeside -#DB_ADMIN_USER=mysql -#DB_ADMIN_PASSWORD= +DB_USER = freeside +DB_PASSWORD= TEMPLATE = asp #mason's a bit dodgy stil @@ -57,7 +53,7 @@ perl-modules: install-perl-modules: perl-modules cd FS; \ - make install + make install UNINST=1 install: install-perl-modules install-docs @@ -65,12 +61,14 @@ deploy: install /etc/init.d/apache restart create-database: - perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_ADMIN_USER}\', \'${DB_ADMIN_PASSWORD}\' ) or die $DBIx::DataSource::errstr;' + perl -e 'use DBIx::DataSource qw( create_database ); create_database( \'${DATASOURCE}\', \'${DB_USER}\', \'${DB_PASSWORD}\' ) or die $DBIx::DataSource::errstr;' create-config: install-perl-modules [ -d ${FREESIDE_CONF} ] || mkdir ${FREESIDE_CONF} chown freeside ${FREESIDE_CONF} + echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets + [ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \ || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}" chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}" diff --git a/httemplate/docs/admin.html b/httemplate/docs/admin.html index f137188f3..1dab439e1 100755 --- a/httemplate/docs/admin.html +++ b/httemplate/docs/admin.html @@ -10,13 +10,12 @@ /home/httpd/html/freeside, and your web browser's DocumentRoot is /home/httpd/html, open https://your_host/freeside/. Replace "your_host" with the name or network address of your web server. - -
  • Once in the Freeside web interface, you must first create a - service definition. An example of a service definition would be a dial-up - account or a domain. For starters, it is necessary to create a domain - definition. Click on View/Edit service definitions and - Add a new service definition with Table svc_domain - (and no modifiers). +
  • Select Configuration from the main menu and update your configuration values. +
  • Next you must create a service definition. An example of a service + definition would be a dial-up account or a domain. For starters, it is + necessary to create a domain definition. Click on View/Edit service + definitions and Add a new service definition with Table + svc_domain (and no modifiers).
  • Now that you have created your first service, you must create a package including this service which you can sell to customers. Zero, one, or many diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html index 656723781..9caf3bb3a 100644 --- a/httemplate/docs/config.html +++ b/httemplate/docs/config.html @@ -3,6 +3,7 @@

    Configuration files

    +Configuration is now done by the top-level Makefile and web interface. The instructions below are no longer necessary.