update install documentation for 1.5 HTML::Mason or Apache::ASP install

2 files changed, 20 insertions, 38 deletions

diff --git a/ANNOUNCE.1.5.0 b/ANNOUNCE.1.5.0
index 46204b8bf..59f1db1f0 100644
--- a/ANNOUNCE.1.5.0
+++ b/ANNOUNCE.1.5.0
@@ -9,15 +9,16 @@
 - reseller interface
 
 1.5.0pre6:
-- cust_pay_refund and credit card/ACH refunds w/supported processor
-- proper payment receipts (not invoice copies)
-- expanded reseller interface
 - RADIUS session viewing
+- Major updates for reseller interface
+- Credit card and ACH refunds (w/supported processor module)
+- Proper email payment receipts (not invoice copies)
 - modular price plans, rewrote package add/edit page
-- fixed up tax report - should be correct for all edge cases with named taxes,
+- fixed up tax report - should be correct for edge cases with named taxes,
   tax classes, etc.
-- some documentation updates
+- Documentation updates
 
 1.5.0pre7:
+- fix bug that could cause mis-billing on upgrades! (new installs ok)
+- update install documentation for 1.5 HTML::Mason or Apache::ASP install
 - historical late notice viewing in web interface
-
diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index d4507a2a5..c95b41f5d 100644
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -107,32 +107,20 @@ $ su
 # make create-config
 </pre>
     <li>Run a <b>separate</b> iteration of Apache[-SSL] with mod_perl enabled <b>as the freeside user</b>.
+    <li>Edit the <tt>Makefile</tt> and set <tt>TEMPLATE</tt> to <tt>asp</tt> or <tt>mason</tt>.  Also set <tt>FREESIDE_DOCUMENT_ROOT</tt>.
+    <li>Run <tt> make install-docs</tt>.
 </ul>
 <table>
   <tr>
     <th>Apache::ASP</th><th>Mason</th>
   </tr>
   <tr>
-    <td><ul>
-      <li>Run <tt>make aspdocs</tt>
-      <li>Copy <tt>aspdocs/</tt> to your web server's document space:
-<font size="-1"><pre>
-cp&nbsp;aspdocs&nbsp;/usr/local/apache/htdocs/freeside-asp
-</pre></font>
-      <li>Create a <a href="http://www.apache-asp.org/config.html#Global">Global</a> directory, such as <tt>/usr/local/etc/freeside/asp-global/</tt>:
-<font size="-1"><pre>
-mkdir&nbsp;/usr/local/etc/freeside/asp-global/
-chown&nbsp;freeside&nbsp;/usr/local/etc/freeside/asp-global/
-</pre></font>
-      <li>Copy <tt>htetc/global.asa</tt> to the Global directory:
-<font size="-1"><pre>
-cp&nbsp;htetc/global.asa&nbsp;/usr/local/etc/freeside/asp-global/global.asa
-</pre></font>
-      <li>Configure Apache for the Global directory and to execute .cgi files using Apache::ASP.  For example, add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
+    <td valign="top"><ul>
+      <li>Configure Apache:
 <font size="-1"><pre>
 PerlModule Apache::ASP
 # your freeside document root
-&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-asp&gt;
+&lt;Directory&nbsp;/var/www/freeside&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
 AddHandler perl-script .cgi .html
 PerlHandler Apache::ASP
@@ -144,24 +132,16 @@ PerlSetVar&nbsp;Global&nbsp;/usr/local/etc/freeside/asp-global/
 PerlSetVar&nbsp;Debug&nbsp;2
 PerlSetVar&nbsp;RequestBinaryRead&nbsp;Off
 # your freeside document root
-PerlSetVar&nbsp;IncludesDir&nbsp;/usr/local/apache/htdocs/freeside-asp
+PerlSetVar&nbsp;IncludesDir&nbsp;/var/www/freeside
 &lt;/Directory&gt;
 </pre></font>
     </ul></td>
-    <td><ul>
-      <li>Run <tt>make masondocs</tt>
-      <li>Copy <tt>masondocs/</tt> to your web server's document space. (For example: <tt>/usr/local/apache/htdocs/freeside-mason</tt>)
-      <li>Copy <tt>htetc/handler.pl</tt> to <tt>/usr/local/etc/freeside</tt>
-      <li>Edit <tt>handler.pl</tt> and:
-      <ul>
-        <li> set an appropriate <tt>comp_root</tt>, such as <tt>/usr/local/apache/htdocs/freeside-mason</tt>
-        <li> set an appropriate <tt>data_dir</tt>, such as <tt>/usr/local/etc/freeside/masondata</tt>
-      </ul>
-
-      <li>Configure Apache to use the <tt>handler.pl</tt> file and to execute .cgi files using HTML::Mason.  For example, add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
+    <td valign="top"><ul>
+      <li>Configure Apache:
 <font size="-1"><pre>
 PerlModule HTML::Mason
-&lt;Directory&nbsp;/usr/local/apache/htdocs/freeside-mason&gt;
+# your freeside docuemnt root
+&lt;Directory&nbsp;/var/www/freeside&gt;
 &lt;Files ~ (\.cgi|\.html)&gt;
 AddHandler perl-script .cgi .html
 PerlHandler HTML::Mason
@@ -177,7 +157,8 @@ require&nbsp;"/usr/local/etc/freeside/handler.pl";
 <ul>
 <li>Restrict access to this web interface - see the <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache documentation on user authentication</a>.    For example, to configure user authentication with <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files), add something like the following to your Apache httpd.conf file, adjusting for your actual paths:
 <pre>
-&lt;Directory /usr/local/apache/htdocs/freeside-asp&gt;
+#your freeside document root
+&lt;Directory /var/www/freeside&gt;
 AuthName Freeside
 AuthType Basic
 AuthUserFile /usr/local/etc/freeside/htpasswd
@@ -193,7 +174,7 @@ $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -c -h /usr/local/
 <pre>$ su
 $ <a href="man/bin/freeside-adduser.html">freeside-adduser</a> -h /usr/local/etc/freeside/htpasswd <i>username</i></pre></font>
     </ul>
-  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt></i>
+  <i>(using other auth types, add each user to your <a href="http://httpd.apache.org/docs/misc/FAQ.html#user-authentication">Apache authentication</a> and then run: <tt>freeside-adduser <b>username</b></tt>)</i>
   <li>As the freeside UNIX user, run <tt>freeside-setup <b>username</b></tt> to create the database tables, passing the username of a Freeside user you created above:
 <pre>
 $ su freeside