diff --git a/livesupport/INSTALL b/livesupport/INSTALL index d6b9b55d8..3ece107d1 100644 --- a/livesupport/INSTALL +++ b/livesupport/INSTALL @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.3 $ + Version : $Revision: 1.4 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/INSTALL,v $ -------------------------------------------------------------------------------- @@ -37,9 +37,9 @@ wget http://livesupport.campware.org/look/campware/download/livesupport-librarie tar xfj livesupport-.tar.bz2 tar xfj livesupport-libraries-.tar.bz2 cd livesupport- +./configure make setup && make compile -./bin/install.sh -d /usr/local/livesupport -g apache -ln -s /usr/local/livesupport/var /var/www/livesupport +./bin/install.sh -d /usr/local/livesupport -g apache -r /var/www /usr/local/livesupport/bin/scheduler.sh start diff --git a/livesupport/bin/dist.sh b/livesupport/bin/dist.sh index 2a1557fc2..e49238ffe 100755 --- a/livesupport/bin/dist.sh +++ b/livesupport/bin/dist.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.5 $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/dist.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -209,7 +209,7 @@ cp -pPR $products_dir/* $products_tmpdir #------------------------------------------------------------------------------- cp -pPR $docdir $ls_tmpdir cp -pPR $etcdir $ls_tmpdir -cp -pPR README Makefile $ls_tmpdir +cp -pPR README INSTALL configure $ls_tmpdir #------------------------------------------------------------------------------- diff --git a/livesupport/doc/install.html b/livesupport/doc/install.html index 89ad5e157..2cb8be6ec 100644 --- a/livesupport/doc/install.html +++ b/livesupport/doc/install.html @@ -13,7 +13,7 @@ Development Loan Fund, under the GNU GPL.
  • Author: $Author: maroy $
    • -
  • Version: $Revision: 1.3 $
    • +
  • Version: $Revision: 1.4 $
  • Location: $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/doc/install.html,v $

Scope

@@ -36,7 +36,7 @@ Those who think they know everything, the quick steps to install LiveSupport are (make sure to run at least the ./bin/install.sh script as root):

-
wget http://livesupport.campware.org/look/campware/download/livesupport-<version>.tar.bz2
wget http://livesupport.campware.org/look/campware/download/livesupport-libraries-<version>.tar.bz2
tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2
cd livesupport-<version>
make setup && make compile
./bin/install.sh -d /usr/local/livesupport -g apache
ln -s /usr/local/livesupport/var /var/www/livesupport
/usr/local/livesupport/bin/scheduler.sh start
+
wget http://livesupport.campware.org/look/campware/download/livesupport-<version>.tar.bz2
wget http://livesupport.campware.org/look/campware/download/livesupport-libraries-<version>.tar.bz2
tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2
cd livesupport-<version>
./configure
make setup && make compile
./bin/install.sh -d /usr/local/livesupport -g apache -r /var/www
/usr/local/livesupport/bin/scheduler.sh start

Then try the URL http://localhost/livesupport/htmlUI/var/html/ , and log in using username: root, password: q.
@@ -149,7 +149,11 @@ list and installed by e.g.: pear install DB): 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>. +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 +document, this directory will be reffered to as <www-root>.

Obtaining LiveSupport sources

LiveSupport sources come in two different tarballs:
    @@ -180,7 +184,7 @@ LiveSupport.
    To compile LiveSupport, enter the LiveSupport directory, and execute the following commands:

    -
    cd livesupport-<version>
    make setup && make compile
    +
    cd livesupport-<version>
    ./configure
    make setup && make compile

    This will take quite a while, so go have a tea, watch a movie, relax, etc.
    @@ -205,6 +209,13 @@ The user group the apache web server daemon runs at (see the section above on installing apache). Supply the <apache-group> value here, as mentioned above, which is usually either apache or www-data.
    +
    +
      -r, --www-root      The root directory for web documents served
                          by apache [default: /var/www]

    +The document root of your apache installation (see the section above on +installing apache). Supply the <www-root> +value here, as mentioned above, which is usually /var/www +or /var/www/htdocs +or /var/www/<yourhost>/htdocs. 

      -H, --host          The fully qualified host name of the system
                          [default: guess].

    The fully qualified domain name of your system. If the install script cannot determine your host name correctly, please supply the FQDN via @@ -212,7 +223,7 @@ this parameter.

    Thus a typical invocation of the install script is the following:

    -
    ./bin/install.sh -d <ls-installdir> -g <apache-group>
    +
    ./bin/install.sh -d <ls-installdir> -g <apache-group> -r <www-root>

    The install script has more options, which enable you to customize your installation of LiveSupport. Note that the defaults are usually quite @@ -225,22 +236,9 @@ password livesupport.
  • an ODBC data source named LiveSupport, connecting to the database of the same name.
  • initialize the database with appropriate tables
    • +
  • create a symlink into your apache root to point to <ls-installdir>/var.
    +
-

Configuring apache

-After a successful run of the installation script, all LiveSupport -files are copied to <ls-installdir>. An additional -manual installation step is required, to make sure that the LiveSupport -web and XML-RPC interfaces are accessible through your apache web -server. LiveSupport expects that the URL http://<yourhost>/livesupport -points to the directory <ls-installdir>/var. To -achieve this, create a symbolic link from your apache document root to -the LiveSupport installation directory:
-
-
ln -s <ls-installdir>/var <apache-docroot>/livesupport
-
-Where <apache-docroot> is dependent on your -installation, but is usually something like /var/www or /var/www/htdocs -or /var/www/<yourhost>/htdocs.

Try it out

After a successful installation, the LiveSupport scheduler has to be started. The scheduler has a System V runlevel-style startup script, diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 6f782c3f1..fdb481e92 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -270,7 +270,6 @@ ifeq (${prefix},) else INSTALL_PREFIX = ${prefix} endif -APACHE_GROUP = @apache_group@ install: setup compile ${INSTALL_COPY_EXE} --directory ${INSTALL_PREFIX} diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac index 757fbbbaa..30eff8c86 100644 --- a/livesupport/etc/configure.ac +++ b/livesupport/etc/configure.ac @@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl dnl dnl Author : $Author: maroy $ -dnl Version : $Revision: 1.1 $ +dnl Version : $Revision: 1.2 $ dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/configure.ac,v $ dnl----------------------------------------------------------------------------- @@ -35,21 +35,12 @@ dnl----------------------------------------------------------------------------- AC_INIT(LiveSupport, 0.9, bugs@campware.org) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL]) -AC_REVISION($Revision: 1.1 $) +AC_REVISION($Revision: 1.2 $) AC_CONFIG_SRCDIR(../products/scheduler/src/main.cxx) AC_PROG_CXX() -AC_ARG_WITH([apache-group], -[ --with-apache-group specify the system group the apache daemon runs as - defaults to: [apache]], - CONFIG_APACHE_GROUP=${withval}, CONFIG_APACHE_GROUP="apache") - -apache_group=${CONFIG_APACHE_GROUP} -AC_MSG_RESULT([using apache daemon group: ${apache_group}]) -AC_SUBST(apache_group) - AC_CONFIG_FILES(../Makefile:../etc/Makefile.in) AC_OUTPUT() diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules index c287d668b..8e3de12ad 100755 --- a/livesupport/etc/debian/rules +++ b/livesupport/etc/debian/rules @@ -30,7 +30,7 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/livesupport --with-apache-group=www-data + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/livesupport build: build-arch