diff --git a/livesupport/doc/install.html b/livesupport/doc/install.html
index 831271dde..98c987ba7 100644
--- a/livesupport/doc/install.html
+++ b/livesupport/doc/install.html
@@ -3,7 +3,7 @@
LiveSupport installation documentation
-
+
Preface
@@ -12,7 +12,7 @@ project, Copyright © 2004 Media
Development Loan Fund, under the GNU GPL.
- - Author: $Author: sebastian $
+ - Author: $Author$
- Version: $Revision: 1.16 $
- Location: $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/doc/install.html,v $
@@ -72,6 +72,10 @@ environment variable WANT_AUTOCONF_2_5="1" before compiling the tools.)
gzip
bzip2
curl
+
+ bison >= 1.35
+ flex
+
Libraries
@@ -122,8 +126,11 @@ importantly a PHP-capable web server (we assume apache), and a database
server (we assume PostgreSQL).
Database
LiveSupport expects a PostgreSQL
-database, version 7.4 or later, to be installed on your system. The
-database will be accessed through TCP/IP, usually via the localhost
+database, version 7.4 or later, to be installed on your system. You will
+also need a postgresql driver for unixODBC; this may be in the unixODBC
+package, or may need to be installed separately.
+
+The database will be accessed through TCP/IP, usually via the localhost
interface. To achieve this, make sure to make the following changes to
the PostgreSQL configuration files.
@@ -160,7 +167,10 @@ If you changed this setting, increase "post_max_size" to something bigger than "
Please note the user group your apache daemon is running as (usually apache
or www-data
), you will need this information later. Later
-on in this document, this group will be referred to as <apache-group>
.
+on in this document, this group will be referred to as <apache-group>
. For the automatic install scripts to work, the user
+running them must either be root
, or belong to
+<apache-group>
.
+
Also note the document root directory for your apache installation
(usually /var/www
or /var/www/htdocs
or /var/www/<yourhost>/htdocs
). Later on in this
@@ -170,7 +180,7 @@ document, this directory will be referred to as <www-root>
.cat /proc/asound/cards
should show entry for your soundcard.
-If not, maybee you do not have suitable alsa module for your soundcard on the system. Try to
+If not, maybe you do not have suitable alsa module for your soundcard on the system. Try to
apt-get install alsa-modules-2.4.27-2-386
or one other from http://packages.debian.org/cgi-bin/search_packages.pl....
diff --git a/livesupport/modules/htmlUI/bin/configureApache.sh b/livesupport/modules/htmlUI/bin/configureApache.sh
index 0aafa5279..4936e78ee 100755
--- a/livesupport/modules/htmlUI/bin/configureApache.sh
+++ b/livesupport/modules/htmlUI/bin/configureApache.sh
@@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Author : $Author: maroy $
+# Author : $Author$
# Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/bin/configureApache.sh,v $
#-------------------------------------------------------------------------------
@@ -102,7 +102,8 @@ echo "Configuring apache ..."
CONFFILE=90_php_livesupport.conf
AP_DDIR_FOUND=no
for APACHE_DDIR in \
- /etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d
+ /etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d \
+ /etc/apache2/conf.d
do
echo -n "$APACHE_DDIR "
if [ -d $APACHE_DDIR ]; then