Commit 033a613d authored by Clément OUDOT's avatar Clément OUDOT
Browse files

Doc update

parent a2cf115c
......@@ -58,7 +58,7 @@ The <code>convertConfig</code> utility reads 2 <acronym title="LemonLDAP::NG">LL
<li class="level1"><div class="li"> Launch that:</div>
</li>
</ul>
<pre class="code shell">$ convertConfig --current=/etc/lemonldap-ng/lemonldap-ng.ini --new=/new/lemonldap-ng.ini</pre>
<pre class="code shell">convertConfig --current=/etc/lemonldap-ng/lemonldap-ng.ini --new=/new/lemonldap-ng.ini</pre>
<ul>
<li class="level1"><div class="li"> Install the new lemonldap-ng.ini file in all <acronym title="LemonLDAP::NG">LL::NG</acronym> components</div>
</li>
......@@ -67,7 +67,7 @@ The <code>convertConfig</code> utility reads 2 <acronym title="LemonLDAP::NG">LL
</ul>
</div>
<!-- SECTION "Let's go" [427-779] -->
<!-- SECTION "Let's go" [427-777] -->
<h2><a name="see_also" id="see_also">See also</a></h2>
<div class="level2">
......@@ -87,4 +87,4 @@ Documentation is available for configuration backends :
</ul>
</div>
<!-- SECTION "See also" [780-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
<!-- SECTION "See also" [778-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
......@@ -27,51 +27,106 @@
</div>
<!-- SECTION "Installation on Debian/Ubuntu with packages" [1-59] -->
<h2><a name="organization" id="organization">Organization</a></h2>
<div class="level2">
<p>
LemonLDAP::NG provides these packages:
</p>
<ul>
<li class="level1"><div class="li"> lemonldap-ng: meta-package, contains no file but dependencies on other packages</div>
</li>
<li class="level1"><div class="li"> lemonldap-ng-doc: contains <acronym title="HyperText Markup Language">HTML</acronym> documentation and project docs (README, etc.)</div>
</li>
<li class="level1"><div class="li"> liblemonldap-ng-conf-perl: configuration and common files</div>
</li>
<li class="level1"><div class="li"> liblemonldap-ng-handler-perl: Handler files</div>
</li>
<li class="level1"><div class="li"> liblemonldap-ng-manager-perl: Manager files</div>
</li>
<li class="level1"><div class="li"> liblemonldap-ng-portal-perl: Portal files</div>
</li>
</ul>
</div>
<!-- SECTION "Organization" [60-495] -->
<h2><a name="get_the_packages" id="get_the_packages">Get the packages</a></h2>
<div class="level2">
</div>
<!-- SECTION "Get the packages" [496-525] -->
<h3><a name="official_repository" id="official_repository">Official repository</a></h3>
<div class="level3">
<p>
If you run Debian testing or unstable, the LemonLDAP::NG packages are directly installable:
If you run Debian testing or unstable, the packages are directly installable:
</p>
<pre class="code">
# apt-cache search lemonldap-ng
apt-cache search lemonldap-ng
</pre>
<p>
<p><div class="noteimportant">Packages from <a href="http://packages.debian.org/search?keywords=lemonldap-ng" class="urlextern" title="http://packages.debian.org/search?keywords=lemonldap-ng" rel="nofollow">Debian repository</a> may not be up to date. Prefer installing Debian packages <a href="../../download.html" class="wikilink1" title="download">downloaded from this site</a>.
<p><div class="noteimportant">Packages from <a href="http://packages.debian.org/search?keywords=lemonldap-ng" class="urlextern" title="http://packages.debian.org/search?keywords=lemonldap-ng" rel="nofollow">Debian repository</a> may not be up to date. Prefer then the other solutions (see below).
</div></p>
</p>
</div>
<!-- SECTION "Get the packages" [60-443] -->
<h2><a name="build_your_package" id="build_your_package">Build your package</a></h2>
<div class="level2">
<!-- SECTION "Official repository" [526-864] -->
<h3><a name="llng_repository" id="llng_repository">LL::NG repository</a></h3>
<div class="level3">
<p>
You can also get the <a href="../../download.html" class="wikilink1" title="download">LemonLDAP::NG archive</a> and make the package yourself:
You can add this repository to have recent packages:
</p>
<pre class="code">
vi /etc/apt/sources.list.d/lemonldap-ng.list
</pre>
<pre class="file">
# LemonLDAP::NG repository
deb http://lemonldap-ng.org/deb squeeze main
deb-src http://lemonldap-ng.org/deb squeeze main
</pre>
<p>
Run this to update packages cache:
</p>
<pre class="code">
$ tar xzf lemonldap-ng-*.tar.gz
$ cd lemonldap-ng-*
$ debuild
apt-get update
</pre>
</div>
<!-- SECTION "Build your package" [444-641] -->
<h2><a name="install_packages_with_apt-get" id="install_packages_with_apt-get">Install packages with apt-get</a></h2>
<!-- SECTION "LL::NG repository" [865-1214] -->
<h3><a name="manual_download" id="manual_download">Manual download</a></h3>
<div class="level3">
<p>
Packages are available on the <a href="../../download.html" class="wikilink1" title="download">Download page</a>.
</p>
</div>
<!-- SECTION "Manual download" [1215-1301] -->
<h2><a name="install_packages" id="install_packages">Install packages</a></h2>
<div class="level2">
</div>
<!-- SECTION "Install packages" [1302-1331] -->
<h3><a name="with_apt-get" id="with_apt-get">With apt-get</a></h3>
<div class="level3">
<pre class="code">
# apt-get install apache2 lemonldap-ng
apt-get install apache2 lemonldap-ng
</pre>
</div>
<!-- SECTION "Install packages with apt-get" [642-739] -->
<h2><a name="install_packages_with_dpkg" id="install_packages_with_dpkg">Install packages with dpkg</a></h2>
<div class="level2">
<!-- SECTION "With apt-get" [1332-1408] -->
<h3><a name="with_dpkg" id="with_dpkg">With dpkg</a></h3>
<div class="level3">
<p>
......@@ -83,11 +138,94 @@ Then:
</p>
<pre class="code">
# dpkg -i liblemonldap-ng-* lemonldap-ng*
dpkg -i liblemonldap-ng-* lemonldap-ng*
</pre>
</div>
<!-- SECTION "Install packages with dpkg" [740-909] -->
<!-- SECTION "With dpkg" [1409-1557] -->
<h2><a name="first_configuration_steps" id="first_configuration_steps">First configuration steps</a></h2>
<div class="level2">
</div>
<!-- SECTION "First configuration steps" [1558-1596] -->
<h3><a name="change_default_dns_domain" id="change_default_dns_domain">Change default DNS domain</a></h3>
<div class="level3">
<p>
By default, <acronym title="Domain Name System">DNS</acronym> domain is <code>example.com</code>. You can change it quick with a sed command. For example, we change it to <code>ow2.org</code>:
</p>
<pre class="code shell">sed -i 's/example\.com/ow2.org/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1 /var/lib/lemonldap-ng/test/index.pl</pre>
</div>
<!-- SECTION "Change default DNS domain" [1597-1911] -->
<h3><a name="enable_llng_sites" id="enable_llng_sites">Enable LL::NG sites</a></h3>
<div class="level3">
<p>
Enable <acronym title="LemonLDAP::NG">LL::NG</acronym> sites in Apache:
</p>
<pre class="code shell">a2ensite portal-apache2.conf
a2ensite manager-apache2.conf
&nbsp;
Restart Apache:
&lt;code shell&gt;
apache2ctl configtest
apache2ctl restart</pre>
</div>
<!-- SECTION "Enable LL::NG sites" [1912-2125] -->
<h3><a name="upgrade" id="upgrade">Upgrade</a></h3>
<div class="level3">
<p>
If you upgraded <acronym title="LemonLDAP::NG">LL::NG</acronym>, check all <a href="../../documentation/1.0/upgrade.html" class="wikilink1" title="documentation:1.0:upgrade">upgrade notes</a>.
</p>
<p>
The upgrade process will also have migrate old configuration files into <code>/etc/lemonldap-ng/lemonldap-ng.ini</code>. This includes the application list which is now set in the <code>applicationList</code> parameter from <code>[portal]</code> section, for example:
</p>
<pre class="code file ini"><span class="re0"><span class="br0">&#91;</span>portal<span class="br0">&#93;</span></span>
<span class="re1">applicationList</span><span class="sy0">=</span><span class="re2"><span class="br0">&#123;</span> 'Menu' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'category', 'Example' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'category', 'test1' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'Application Test <span class="nu0">1</span>', uri <span class="sy0">=</span>&gt; 'http://test1.example.com/', description <span class="sy0">=</span>&gt; 'A simple application displaying authenticated user', logo <span class="sy0">=</span>&gt; 'wheels.png', display <span class="sy0">=</span>&gt; 'auto', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>,'test2' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'Application Test <span class="nu0">2</span>', uri <span class="sy0">=</span>&gt; 'http://test2.example.com/', description <span class="sy0">=</span>&gt; 'The same simple application displaying authenticated user', logo <span class="sy0">=</span>&gt; 'wheels.png', display <span class="sy0">=</span>&gt; 'auto', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>, <span class="br0">&#125;</span>,'Administration' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'category', 'manager' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'WebSSO Manager', uri <span class="sy0">=</span>&gt; 'http://manager.example.com/', description <span class="sy0">=</span>&gt; 'Configure LemonLDAP::NG WebSSO', logo <span class="sy0">=</span>&gt; 'tools.png', display <span class="sy0">=</span>&gt; 'on', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>,'sessions' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'Sessions explorer', uri <span class="sy0">=</span>&gt; 'http://manager.example.com/sessions.pl', description <span class="sy0">=</span>&gt; 'Explore WebSSO sessions', logo <span class="sy0">=</span>&gt; 'tools.png', display <span class="sy0">=</span>&gt; 'on', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>, <span class="br0">&#125;</span>,'Documentation' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'category', 'localdoc' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'Local documentation', uri <span class="sy0">=</span>&gt; 'http://manager.example.com/doc/', description <span class="sy0">=</span>&gt; 'Documentation supplied with LemonLDAP::NG', logo <span class="sy0">=</span>&gt; 'docs.png', display <span class="sy0">=</span>&gt; 'on', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>,'officialwebsite' <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> type <span class="sy0">=</span>&gt; 'application', options <span class="sy0">=</span>&gt; <span class="br0">&#123;</span> name <span class="sy0">=</span>&gt; 'Offical Website', uri <span class="sy0">=</span>&gt; 'http://wiki.lemonldap.objectweb.org/xwiki/bin/view/NG/Presentation', description <span class="sy0">=</span>&gt; 'Official LemonLDAP::NG Website', logo <span class="sy0">=</span>&gt; 'web.png', display <span class="sy0">=</span>&gt; 'on', <span class="br0">&#125;</span>, <span class="br0">&#125;</span>, <span class="br0">&#125;</span>, <span class="br0">&#125;</span>, <span class="br0">&#125;</span></span></pre>
<p>
<p><div class="noteimportant">You should now use the Manager to configure all <a href="../../documentation/1.0/portalmenu.html#categories_and_applications" class="wikilink1" title="documentation:1.0:portalmenu">applications and categories</a>, and then comment or remove the <code>applicationList</code> parameter from <code>/etc/lemonldap-ng/lemonldap-ng.ini</code>.
</div></p>
</p>
</div>
<!-- SECTION "Upgrade" [2126-4284] -->
<h3><a name="dns" id="dns">DNS</a></h3>
<div class="level3">
<p>
Configure your <acronym title="Domain Name System">DNS</acronym> server to resolve names with your server <acronym title="Internet Protocol">IP</acronym>.
</p>
<p>
<p><div class="notetip">
For tests with <code>example.com</code>, launch the following :
</p>
<pre class="code shell">cat /etc/lemonldap-ng/for_etc_hosts &gt;&gt; /etc/hosts</pre>
<p>
</div></p>
</p>
<p>
Follow the <a href="../../documentation/1.0/start.html#configuration" class="wikilink1" title="documentation:1.0:start">next steps</a>
</p>
</div>
<!-- SECTION "DNS" [4285-4557] -->
<h2><a name="file_location" id="file_location">File location</a></h2>
<div class="level2">
<ul>
......@@ -106,36 +244,20 @@ Then:
</ul>
</div>
<!-- SECTION "File location" [910-1364] -->
<h2><a name="enable_lemonldapng" id="enable_lemonldapng">Enable Lemonldap::NG</a></h2>
<!-- SECTION "File location" [4558-5012] -->
<h2><a name="build_your_packages" id="build_your_packages">Build your packages</a></h2>
<div class="level2">
<ul>
<li class="level1"><div class="li"> Enable Lemonldap::NG sites :</div>
</li>
</ul>
<pre class="code shell"># a2ensite portal-apache2.conf
# a2ensite manager-apache2.conf
# /etc/init.d/apache2 restart</pre>
<ul>
<li class="level1"><div class="li"> Configure your <acronym title="Domain Name System">DNS</acronym> server or for tests with example.com, lauch the following :</div>
</li>
</ul>
<pre class="code shell"># cat /etc/lemonldap-ng/for_etc_hosts &gt;&gt; /etc/hosts</pre>
<p>
Follow the <a href="../../documentation/1.0/start.html#configuration" class="wikilink1" title="documentation:1.0:start">next steps</a>
</p>
</div>
<!-- SECTION "Enable Lemonldap::NG" [1365-1749] -->
<h2><a name="tips_to_change_default_dns_domain" id="tips_to_change_default_dns_domain">Tips to change default DNS domain</a></h2>
<div class="level2">
<p>
You can also get the <a href="../../download.html" class="wikilink1" title="download">LemonLDAP::NG archive</a> and make the package yourself:
By default, <acronym title="Domain Name System">DNS</acronym> domain is <code>example.com</code>. You can change it quick with a sed command. For example, we change it to ow2.org:
</p>
<pre class="code shell"># sed -i 's/example\.com/ow2.org/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/* /var/lib/lemonldap-ng/test/*</pre>
<pre class="code">
tar xzf lemonldap-ng-*.tar.gz
cd lemonldap-ng-*
make debian-packages
</pre>
</div>
<!-- SECTION "Tips to change default DNS domain" [1750-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
<!-- SECTION "Build your packages" [5013-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
......@@ -27,12 +27,12 @@
</div>
<!-- SECTION "Installation on RedHat/CentOS" [1-45] -->
<h2><a name="rpms_organization" id="rpms_organization">RPMs organization</a></h2>
<h2><a name="organization" id="organization">Organization</a></h2>
<div class="level2">
<p>
LemonLDAP::NG provides many RPMs :
LemonLDAP::NG provides these packages:
</p>
<ul>
<li class="level1"><div class="li"> lemonldap-ng: meta-package, contains no file but dependencies on other packages</div>
......@@ -69,12 +69,12 @@ This schema shows the dependencies between modules:
</p>
</div>
<!-- SECTION "RPMs organization" [46-944] -->
<!-- SECTION "Organization" [46-943] -->
<h2><a name="get_the_packages" id="get_the_packages">Get the packages</a></h2>
<div class="level2">
</div>
<!-- SECTION "Get the packages" [945-974] -->
<!-- SECTION "Get the packages" [944-973] -->
<h3><a name="yum_repository" id="yum_repository">YUM repository</a></h3>
<div class="level3">
......@@ -95,6 +95,14 @@ gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OW2
</pre>
<p>
Run this to update packages cache:
</p>
<pre class="code">
yum update
</pre>
<p>
<p><div class="notewarning">
You must also install a repository for non-core dependencies. Example with EPEL:
......@@ -109,7 +117,7 @@ See <a href="../../documentation/1.0/prereq.html#yum" class="wikilink1" title="d
</p>
</div>
<!-- SECTION "YUM repository" [975-1556] -->
<!-- SECTION "YUM repository" [974-1617] -->
<h3><a name="manual_download" id="manual_download">Manual download</a></h3>
<div class="level3">
......@@ -119,7 +127,7 @@ RPMs are available on the <a href="../../download.html" class="wikilink1" title=
</p>
</div>
<!-- SECTION "Manual download" [1557-1639] -->
<!-- SECTION "Manual download" [1618-1700] -->
<h2><a name="package_gpg_signature" id="package_gpg_signature">Package GPG signature</a></h2>
<div class="level2">
......@@ -136,12 +144,12 @@ rpm --import rpm-gpg-key-ow2
</pre>
</div>
<!-- SECTION "Package GPG signature" [1640-1805] -->
<!-- SECTION "Package GPG signature" [1701-1866] -->
<h2><a name="install_packages" id="install_packages">Install packages</a></h2>
<div class="level2">
</div>
<!-- SECTION "Install packages" [1806-1835] -->
<!-- SECTION "Install packages" [1867-1896] -->
<h3><a name="with_yum" id="with_yum">With YUM</a></h3>
<div class="level3">
......@@ -168,7 +176,7 @@ yum localinstall lemonldap-ng-* perl-Lemonldap-NG-*
</pre>
</div>
<!-- SECTION "With YUM" [1836-2253] -->
<!-- SECTION "With YUM" [1897-2314] -->
<h3><a name="with_rpm" id="with_rpm">With RPM</a></h3>
<div class="level3">
......@@ -198,12 +206,12 @@ Install the package <code>lemonldap-ng-conf</code> only on the server which stor
</p>
</div>
<!-- SECTION "With RPM" [2254-2716] -->
<!-- SECTION "With RPM" [2315-2777] -->
<h2><a name="first_configuration_steps" id="first_configuration_steps">First configuration steps</a></h2>
<div class="level2">
</div>
<!-- SECTION "First configuration steps" [2717-2755] -->
<!-- SECTION "First configuration steps" [2778-2816] -->
<h3><a name="change_default_dns_domain" id="change_default_dns_domain">Change default DNS domain</a></h3>
<div class="level3">
......@@ -214,7 +222,7 @@ By default, <acronym title="Domain Name System">DNS</acronym> domain is <code>ex
<pre class="code shell">sed -i 's/example\.com/ow2.org/g' /etc/lemonldap-ng/* /var/lib/lemonldap-ng/conf/lmConf-1 /var/lib/lemonldap-ng/test/index.pl</pre>
</div>
<!-- SECTION "Change default DNS domain" [2756-3070] -->
<!-- SECTION "Change default DNS domain" [2817-3131] -->
<h3><a name="apache_virtual_host" id="apache_virtual_host">Apache virtual host</a></h3>
<div class="level3">
......@@ -236,7 +244,7 @@ Check Apache configuration and restart:
apachectl restart</pre>
</div>
<!-- SECTION "Apache virtual host" [3071-3465] -->
<!-- SECTION "Apache virtual host" [3132-3526] -->
<h3><a name="upgrade" id="upgrade">Upgrade</a></h3>
<div class="level3">
......@@ -270,7 +278,34 @@ The upgrade process will also have migrate old configuration files into <code>/e
</p>
</div>
<!-- SECTION "Upgrade" [3466-5975] -->
<!-- SECTION "Upgrade" [3527-6036] -->
<h3><a name="dns" id="dns">DNS</a></h3>
<div class="level3">
<p>
Configure your <acronym title="Domain Name System">DNS</acronym> server to resolve names with your server <acronym title="Internet Protocol">IP</acronym>.
</p>
<p>
<p><div class="notetip">
For tests with <code>example.com</code>, launch the following :
</p>
<pre class="code shell">cat /etc/lemonldap-ng/for_etc_hosts &gt;&gt; /etc/hosts</pre>
<p>
</div></p>
</p>
<p>
Follow the <a href="../../documentation/1.0/start.html#configuration" class="wikilink1" title="documentation:1.0:start">next steps</a>
</p>
</div>
<!-- SECTION "DNS" [6037-6309] -->
<h2><a name="file_location" id="file_location">File location</a></h2>
<div class="level2">
<ul>
......@@ -287,7 +322,7 @@ The upgrade process will also have migrate old configuration files into <code>/e
</ul>
</div>
<!-- SECTION "File location" [5976-6332] -->
<!-- SECTION "File location" [6310-6666] -->
<h2><a name="build_your_packages" id="build_your_packages">Build your packages</a></h2>
<div class="level2">
......@@ -321,4 +356,4 @@ rpmbuild -ta SOURCES/lemonldap-ng-VERSION.tar.gz
</pre>
</div>
<!-- SECTION "Build your packages" [6333-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
<!-- SECTION "Build your packages" [6667-] --></div><!-- closes <div class="dokuwiki export">-->
\ No newline at end of file
......@@ -55,7 +55,7 @@ Then go to build directory:
</p>
<pre class="code">
$ cd trunk/build/lemonldap-ng
cd trunk/build/lemonldap-ng
</pre>
<p>
......@@ -63,7 +63,7 @@ And run the “dist” target:
</p>
<pre class="code">
$ make dist
make dist
</pre>
<p>
......@@ -71,7 +71,7 @@ The generated tarball is in the current directory.
</p>
</div>
<!-- SECTION "Build the tarball from SVN" [389-718] -->
<!-- SECTION "Build the tarball from SVN" [389-714] -->
<h2><a name="extraction" id="extraction">Extraction</a></h2>
<div class="level2">
......@@ -81,11 +81,11 @@ Just run the tar command:
</p>
<pre class="code">
$ tar zxvf lemonldap-ng-*.tar.gz
tar zxvf lemonldap-ng-*.tar.gz
</pre>
</div>
<!-- SECTION "Extraction" [719-817] -->
<!-- SECTION "Extraction" [715-811] -->
<h2><a name="installation" id="installation">Installation</a></h2>
<div class="level2">
......@@ -98,11 +98,11 @@ First check and install the <a href="../../documentation/1.0/prereq.html" class=
For full install:
</p>
<pre class="code">
$ cd lemonldap-ng-*
$ make
$ make configure
$ make test
$ sudo make install
cd lemonldap-ng-*
make
make configure
make test
sudo make install
</pre>
<p>
......@@ -110,7 +110,7 @@ You can modify location of default storage configuration file in configure targe
</p>
<pre class="code">
$ sudo make configure STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini
sudo make configure STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini
</pre>
<p>
......@@ -163,7 +163,7 @@ You can also pass parameters to the make install command, with this syntax:
</p>
<pre class="code">
$ sudo make install PARAM=VALUE PARAM=VALUE ...
sudo make install PARAM=VALUE PARAM=VALUE ...
</pre>
<p>
......@@ -194,18 +194,38 @@ Available parameters are:
</li>
<li class="level1"><div class="li"> <strong>APACHEVERSION</strong>: Apache major version (default: 2)</div>
</li>
<li class="level1"><div class="li"> <strong>VHOSTLISTEN</strong>: how listen parameter is configured for virtual hosts in Apache (default: \*:80)</div>
<li class="level1"><div class="li"> <strong>VHOSTLISTEN</strong>: how listen parameter is configured for virtual hosts in Apache (default: *:80)</div>
</li>
</ul>
<p>
<p><div class="notetip">You can use “make debian-install” or “make ubuntu-install” for Debian/Ubuntu. To just build Debian/Ubuntu packages, use “make debian-packages”, they will be build in /tmp/
<p><div class="notetip">
For Debian/Ubuntu, you can use:
</p>
<pre class="code">
make debian-install
</pre>
<p>
or:
</p>
<pre class="code">
make ubuntu-install
</pre>
<p>
See also <a href="../../documentation/1.0/installdeb.html" class="wikilink1" title="documentation:1.0:installdeb">Debian/Ubuntu installation documentation</a>.
</div></p>
</p>
</div>
<!-- SECTION "Installation" [818-3158] -->
<!-- SECTION "Installation" [812-3139] -->
<h2><a name="link_apache_configuration" id="link_apache_configuration">Link Apache configuration</a></h2>
<div class="level2">
......@@ -223,12 +243,17 @@ By default, Apache configuration files will be installed in <code>/usr/local/lem
<ul>
<li class="level1"><div class="li"> You can also use symbolic links in <code>conf.d</code> Apache directory.</div>
</li>
<li class="level1"><div class="li"> If you&#039;ve install Debian packages, just use “a2ensite manager-apache2.conf” and “a2ensite portal-apache2.conf”.</div>
<li class="level1"><div class="li"> If you have run the Debian/Ubuntu install command, just use:</div>
</li>
</ul>
<pre class="code">
a2ensite manager-apache2.conf
a2ensite portal-apache2.conf
</pre>
<p>
</div></p>
</p>
......@@ -238,7 +263,7 @@ By default, Apache configuration files will be installed in <code>/usr/local/lem
</p>
</div>
<!-- SECTION "Link Apache configuration" [3159-3843] -->
<!-- SECTION "Link Apache configuration" [3140-3847] -->
<h2><a name="install_cron_jobs" id="install_cron_jobs">Install cron jobs</a></h2>
<div class="level2">