summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2001-09-04 11:03:22 +0000
committerivan <ivan>2001-09-04 11:03:22 +0000
commit2bad1d2cc99f713d10f447d018742eb03453d422 (patch)
tree0dc21ebe720f041dfd092a7b6cd57bea3e0b9652
parent8c8e1e437e684c54dfbd846fb0997b30f4993131 (diff)
silly syntax error and doc updates
-rwxr-xr-xbin/fs-setup6
-rw-r--r--httemplate/docs/config.html19
2 files changed, 12 insertions, 13 deletions
diff --git a/bin/fs-setup b/bin/fs-setup
index 6efdd65bb..0c2b67dda 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: fs-setup,v 1.49 2001-09-03 22:16:29 ivan Exp $
+# $Id: fs-setup,v 1.50 2001-09-04 11:03:22 ivan Exp $
#to delay loading dbdef until we're ready
BEGIN { $FS::Record::setup_hack = 1; }
@@ -433,7 +433,7 @@ sub tables_hash_hack {
'amount', @money_type,
'_date', @date_type
],
- 'primary_key' => 'billpaynum'
+ 'primary_key' => 'billpaynum',
'unique' => [ [] ],
'index' => [ [ 'paynum', 'invnum' ] ],
},
@@ -507,7 +507,7 @@ sub tables_hash_hack {
'amount', @money_type,
'_date', @date_type
],
- 'primary_key' => 'creditrefundnum'
+ 'primary_key' => 'creditrefundnum',
'unique' => [ [] ],
'index' => [ [ 'crednum', 'refundnum' ] ],
},
diff --git a/httemplate/docs/config.html b/httemplate/docs/config.html
index f26ff0f78..deae044d2 100644
--- a/httemplate/docs/config.html
+++ b/httemplate/docs/config.html
@@ -29,13 +29,12 @@ dbpassword
</ul>
All further configuration files and directories are located in
<tt>/usr/local/etc/freeside/conf.<i>datasource</i></tt>, for example,
-<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>).
+<tt>/usr/local/etc/freeside/conf.DBI:Pg:host=localhost;dbname=freeside</tt> (remember to backslash-escape the ; character when creating directories in the shell: <tt>mkdir&nbsp;/usr/local/etc/freeside/conf.DBI:Pg:host=localhost\;dbname=freeside</tt>). Files listed in <font color="#ff0000">red</font> are requried.
<ul>
<li><a name="address">address</a> - This configuration file is no longer used. See <a href="#invoice_template">invoice_template</a> instead.
<li><a name="apacheroot">apacheroot</a> - The directory containing Apache virtual hosts
<li><a name="apachemachine">apachemachine</a> - A machine with the apacheroot directory and user home directories. The existance of this file enables setup of virtual host directories, and, in conjunction with the `home' configuration file, symlinks into user home directories.
<li><a name="apachemachines">apachemachines</a> - Your Apache machines, one per line. This enables export of `/etc/apache/vhosts.conf', which can be included in your Apache configuration via the <a href="http://www.apache.org/docs/mod/core.html#include">Include</a> directive.
- <li><a name="autocapnames">autocapnames</a> - The presence of this file will cause Freeside to use Javascript in /htdocs/edit/cust_main.cgi to automatically capitalize the first and last names of customers.
<li><a name="bindprimary">bindprimary</a> - Your BIND primary nameserver. This enables export of /var/named/named.conf and zone files into /var/named
<li><a name="bindsecondaries">bindsecondaries</a> - Your BIND secondary nameservers, one per line. This enables export of /var/named/named.conf
<li><a name="business-onlinepayment">business-onlinepayment</a> - <a href="http://search.cpan.org/search?dist=Business-OnlinePayment">Business::OnlinePayment</a> support, at least three lines: processor, login, and password. An optional fourth line specifies the action. Optional additional lines are passed to Business::OnlinePayment as %processor_options.
@@ -45,19 +44,19 @@ All further configuration files and directories are located in
<li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support. Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture'). CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
<li><a name="deletecustomers">deletecustomers</a> - The existance of this file will enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customers' packages if they cancel service.
<li><a name="disable_customer_referrals">disable_customer_referrals</a> - The existance of this file will disable new customer-to-customer referrals in the web interface.
- <li><a name="domain">domain</a> - Your domain name.
+ <li><a name="domain"><font color="#ff0000">domain</font></a> - Your domain name.
<li><a name="editreferrals">editreferrals</a> - The existance of this file will allow you to change the referral of existing customers.
<li><a name="erpcdmachines">erpcdmachines</a> - Your ERPCD authenticaion machines, one per line. This enables export of `/usr/annex/acp_passwd' and `/usr/annex/acp_dialup'.
<li><a name="hidecancelledpackages">hidecancelledpackages</a> - The existance of this file will prevent cancelled packages from showing up in listings (though they will still be in the database)
<li><a name="hidecancelledcustomers">hidecancelledcustomers</a> - The existance of this file will prevent customers with only cancelled packages from showing up in listings (though they will still be in the database)
- <li><a name="home">home</a> - For new users, prefixed to usrename to create a directory name. Should have a leading but not a trailing slash.
+ <li><a name="home"><font color="#ff0000">home</font></a> - For new users, prefixed to usrename to create a directory name. Should have a leading but not a trailing slash.
<li><a name="icradiusmachines">icradiusmachines</a> - Your <a href="ftp://ftp.cheapnet.net/pub/icradius">ICRADIUS</a> machines, one per line. The existance of this file (even if empty) turns on radcheck table creation (in the freeside database - the radcheck table needs to be created manually). Machines listed in this file will have the radcheck table exported to them. Each line of this file should contain four items, separted by whitespace: machine name, MySQL database name, MySQL username, and MySQL password. For example: "<CODE>radius.isp.tld&nbsp;radius_db&nbsp;radius_user&nbsp;passw0rd</CODE>". Note that to use ICRADIUS export you need to be using MySQL.
<li><a name="icradius_mysqldest">icradius_mysqldest</a> - Destination directory for the MySQL databases, on the ICRADIUS machines. Defaults to "/usr/local/var/".
<li><a name="icradius_mysqlsource">icradius_mysqlsource</a> - Source directory for for the MySQL radcheck table files, on the Freeside machine. Defaults to "/usr/local/var/freeside".
<li><a name="icradius_secrets">icradius_secrets</a> - Optionally specifies a MySQL database for ICRADIUS export, if you're not running MySQL for your Freeside database. The database should be on the Freeside machine and store data in the <a href="#icradius_mysqlsource">icradius_mysqlsource</a> directory. Three lines: DBI data source, username and password. This file should not be world readable.
- <li><a name="invoice_from">invoice_from</a> - Return address on email invoices.
- <li><a name="invoice_template">invoice_template</a> - Required template file for invoices. See the <a href="billing.html">section on billing</a> for details.
- <li><a name="lpr">lpr</a> - Print command for paper invoices, for example `lpr -h'.
+ <li><a name="invoice_from"><font color="#ff0000">invoice_from</font></a> - Return address on email invoices.
+ <li><a name="invoice_template"><font color="#ff0000">invoice_template</font></a> - Required template file for invoices. See the <a href="billing.html">section on billing</a> for details.
+ <li><a name="lpr"><font color="#ff0000">lpr</font></a> - Print command for paper invoices, for example `lpr -h'.
<li><a name="maildisablecatchall">maildisablecatchall</a> - <b>DEPRECIATED</b>, now the default. The existance of this file used to disable the requirement that each virtual domain have a catch-all mailbox.
<li><a name="money_char">money_char</a> - Currency symbol - defaults to `$'.
<li><a name="mxmachines">mxmachines</a> - MX entries for new domains, weight and machine, one per line, with trailing `.'
@@ -67,7 +66,7 @@ All further configuration files and directories are located in
<li><a name="qmailmachines">qmailmachines</a> - Your qmail machines, one per line. This enables export of `/var/qmail/control/virtualdomains', `/var/qmail/control/recipientmap', and `/var/qmail/control/rcpthosts'. The existance of this file (even if empty) also turns on user `.qmail-extension' file maintenance in conjunction with `shellmachine'.
<li><a name="radiusmachines">radiusmachines</a> - Your RADIUS authentication machines, one per line. This enables export of `/etc/raddb/users'.
<li><a name="referraldefault">referraldefault</a> - Default referral, specified by refnum.
- <li><a name="registries">registries</a> - Directory which contains domain registry information. Each registry is a directory.
+ <li><a name="registries"><font color="#ff0000">registries</font></a> - Directory which contains domain registry information. Each registry is a directory.
<ul>
<li>registries/internic - Currently the only supported registry
<ul>
@@ -88,9 +87,9 @@ All further configuration files and directories are located in
<li>shellmachine-userdel - The command(s) to run on shellmachine when an account is deleted. If this file does not exist, <code>userdel $username</code> is the default. If the file exists but is empty, <code>rm -rf $dir</code> is the default instead. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$username</code> and <code>$dir</code>.
<li>shellmachine-usermod - The command(s) to run on shellmachine when an account is modified. If this file does not exist or is empty, <code>[ -d $old_dir ] &amp;&amp; mv $old_dir $new_dir || ( chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; find . -depth -print | cpio -pdm $new_dir; chmod u-t $new_dir; chown -R $uid.$gid $new_dir; rm -rf $old_dir )</code> is the default. Otherwise the contents of the file are treated as a double-quoted perl string, with the following variables available: <code>$old_dir</code>, <code>$new_dir</code>, <code>$uid</code> and <code>$gid</code>.
<li><a name="shellmachines">shellmachines</a> - Your Linux and System V flavored shell (and mail) machines, one per line. This enables export of `/etc/passwd' and `/etc/shadow' files.
- <li><a name="shells">shells</a> - Legal shells (think /etc/shells). You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords. A blank line specifies that an empty shell is permitted.
+ <li><a name="shells"><font color="#ff0000">shells</font></a> - Legal shells (think /etc/shells). You probably want to `cut -d: -f7 /etc/passwd | sort | uniq' initially so that importing doesn't fail with `Illegal shell' errors, then remove any special entries afterwords. A blank line specifies that an empty shell is permitted.
<li><a name="showpasswords">showpasswords</a> - The existance of this file will allow unencrypted user passwords to be displayed.
- <li><a name="smtpmachine">smtpmachine</a> - SMTP relay for Freeside's outgoing mail.
+ <li><a name="smtpmachine"><font color="#ff0000">smtpmachine</font></a> - SMTP relay for Freeside's outgoing mail.
<li><a name="soadefaultttl">soadefaultttl</a> - SOA default TTL for new domains.
<li><a name="soaemail">soaemail</a> - SOA email for new domains, in BIND form (`.' instead of `@'), with trailing `.'
<li><a name="soaexpire">soaexpire</a> - SOA expire for new domains