Update of /cvsroot/lxr/html/en/1-0-InstallSteps
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8347/en/1-0-InstallSteps
Modified Files:
1-0-install1tools.shtml 1-0-install5server.shtml
Log Message:
Ubuntu specific information
Glimpse licence change
Various minor typo or visual enhancements
Index: 1-0-install1tools.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/1-0-InstallSteps/1-0-install1tools.shtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 1-0-install1tools.shtml 18 Jan 2014 10:00:03 -0000 1.6
+++ 1-0-install1tools.shtml 15 Oct 2014 09:18:18 -0000 1.7
@@ -70,6 +70,7 @@
</li>
<li>A relational database
<p class="normal">
+<a href="https://mariadb.org" title="MariaDB Web Site">MariaDB</a> or
<a href="http://www.mysql.com" title="MySQL Web Site">MySQL</a>
4.x/5.x,
<a href="http://www.oracle.com" title="Oracle Web Site">Oracle</a>,
@@ -89,13 +90,15 @@
with
<a href="http://perl.apache.org" title="Perl module for Apache">
mod_perl</a>
-is recommended.
+is very common.
<a href="http://www.lighttpd.net" title="lighttpd Web Site">lighttpd</a> is an alternate choice.
Starting with <em>LXR 2.0</em>,
<a href="http://cherokee-project.com" title="Cherokee Web Site">Cherokee</a>,
<a href="http://nginx.org" title="Nginx Web Site">Nginx</a> and
<a href="http://www.acme.com/software/thttpd" title="thttpd Web Site">thttpd</a>
may also be used.
+ </p>
+ <p class="comment">
All may be installed from a package.
</p>
</li>
@@ -107,28 +110,34 @@
Swish-e</a>
version 2.1 or later
<p class="comment">
-Swish-e is fully GPL'ed while Glimpse is only free
-for non-commercial use.
-Thus you have little chance to find it among your distribution
-packages, but installing it is quite automated.
+Swish-e is fully GPL'ed.
+Since September 2014, Glimpse is released under ISC open source licence
+which is GPL compatible.
+However, it is highly unlikely you would find binary packages for them
+in your favorite distribution,
+but installing one from source is quite automated.
</p>
- <div class="normal">
+ <p class="normal">
How do you choose between them?
- <ul>
- <li class="classics">
+ </p>
+ <ul>
+ <li class="classics">
<strong>Glimpse</strong> gives you access to the
<strong>line</strong> of the occurrence and can distinguish
multiple occurrences within a file.
- </li>
- <li class="classics">
+ </li>
+ <li class="classics">
<strong>Swish-e</strong> gives you access to the
<strong>file</strong> containing occurrences,
merging all occurrences into a single reference.
But it can index CVS repositories
(through file copy, which cancels the size advantage of a CVS repository).
- </li>
- </ul>
- </div>
+ </li>
+ </ul>
+ <p class="comment">
+The developers preferred choice is <strong>Glimpse</strong>
+which provides more useful information.
+ </p>
</li>
<li>The Perl database driver interface <strong>DBI</strong>
and the relevant <strong>DBD</strong> driver for the database
Index: 1-0-install5server.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/1-0-InstallSteps/1-0-install5server.shtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 1-0-install5server.shtml 21 May 2014 13:32:01 -0000 1.6
+++ 1-0-install5server.shtml 15 Oct 2014 09:18:18 -0000 1.7
@@ -15,6 +15,17 @@
and <strong>lighttpd</strong> servers.
Read the <cite>User's Manual</cite> for other servers.
</p>
+ <div class="normal boxed">
+ <p class="caution">
+CAVEAT!
+ </p>
+ <p class="comment">
+Configuration file and directory names are given below
+for a <strong>Fedora</strong> distribution.
+Other distributions may have different defaults.
+In particular, see this <a href="../Tips/tipubuntu.shtml">tip</a>
+for <strong>Ubuntu</strong>.
+ </div>
<ul>
<li><strong>Apache</strong> web server
<p class="comment">
@@ -125,17 +136,42 @@
</p>
</li>
<li>for system-wide service
- <span class="comment">(on a single line)</span>
+ <ul class="version">
+ <li><em>systemd</em> service enabled
+ <p class="normal">
+First, copy the configuration file to its expected location:
+ </p>
<pre class="shell">
-<samp>$ </samp><kbd>LIGHTTPD_CONF_PATH="/path/to/lxr/custom.d/lighttpd-lxrserver.conf" \
- ./scripts/lighttpd-init start</kbd>
+<samp>$ </samp><kbd>cp custom.d/lighttpd-lxrserver.conf /etc/lighttpd/conf.d</kbd>
</pre>
- <p class="normal">
+ <p class="normal">
+Start the server:
+ </p>
+<pre class="shell">
+<samp>$ </samp><kbd>systemctl start lighttpd.service</kbd>
+</pre>
+ <p class="normal">
To stop lighttpd, type:
- </p>
+ </p>
+<pre class="shell">
+<samp>$ </samp><kbd>systemctl stop lighttpd.service</kbd>
+</pre>
+ </li>
+ <li>without <em>systemd</em>
+<span class="comment">(on a single line or with continuation indicators)</span>
+<pre class="shell">
+<samp>$ </samp><kbd>LIGHTTPD_CONF_PATH=\
+"/path/to/lxr/custom.d/lighttpd-lxrserver.conf" \
+ ./scripts/lighttpd-init start</kbd>
+</pre>
+ <p class="normal">
+To stop lighttpd, type:
+ </p>
<pre class="shell">
<samp>$ </samp><kbd>./scripts/lighttpd-init stop</kbd>
</pre>
+ </li>
+ </ul>
</li>
</ul>
<p class="comment">
|
