This is an automated email from the git hooks/post-receive script. New commit to branch feature/6511 in repository echobase. See http://git.codelutin.com/echobase.git commit d21a2db8ec19e6ec8cdac223bfe87817d0fc115c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 11 14:30:21 2015 +0200 refs #6511 : mise à jour de la documentation d'installation de lizmap --- .../config/EchoBaseConfigurationOption.java | 8 +-- src/site/rst/install.rst.vm | 69 ++++++++++++++++++---- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index a662ae0..9eb621e 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -115,13 +115,9 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.projects.directory.description"), "${echobase.gis.directory}/projects", File.class), - LIZMAP_APPLICATION_VERSION("echobase.lizmap.application.version", - n("echobase.config.lizmap.application.version.description"), - "", - Version.class), LIZMAP_APPLICATION_BASEDIR("echobase.lizmap.application.basedir", n("echobase.config.lizmap.application.basedir.description"), - "/var/www/lizmap-web-client-${echobase.lizmap.application.version}", + "/var/www/echobase-map", File.class), LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", n("echobase.config.lizmap.application.config.file.description"), @@ -129,7 +125,7 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { File.class), LIZMAP_APPLICATION_MAP_URL("echobase.lizmap.application.map.url", n("echobase.config.lizmap.application.map.url.description"), - "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/map", + "http://localhost/echobase-map/lizmap/www/index.php/view/map", String.class), LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", n("echobase.config.lizmap.application.jdbc.url.description"), diff --git a/src/site/rst/install.rst.vm b/src/site/rst/install.rst.vm index e7bebac..562f3ec 100644 --- a/src/site/rst/install.rst.vm +++ b/src/site/rst/install.rst.vm @@ -152,8 +152,6 @@ Pour utiliser une nouvelle version de l'application, c'est très simple. cp /var/local/echobase/echobase.war /var/lib/tomcat7/webapps Tomcat va redéployer l'application et elle sera disponible d'ici peu à l'adresse -:: - http://localhost:8080/echobase Divers @@ -199,9 +197,29 @@ Pour installer Qgis map server : :: - apt-get install qgis-server libapache2-mod-fcgid - a2enmod cgid - service apache2 restart + sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable + sudo apt-get update + sudo apt-get install qgis-server libapache2-mod-fcgid qgis + sudo apt-get install apache2 + sudo a2enmod cgid + sudo service apache2 restart + + +L'url : http://localhost/cgi-bin/qgis_mapserv.fcgi?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities +doit renvoyer un fichier XML de description des couches disponibles. + +Création du groupe d'utilisateur +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +:: + + addgroup echobase + adduser wwww-data echobase + adduser tomcat7 echobase + cd /var/local/echobase + chown -R tomcat7:echobase . + chmod g+w -R . + Lizmap ~~~~~~ @@ -210,28 +228,55 @@ Nous utilisons pour le moment la version ${lizmapVersion}. Installation Lizmap:: + apt-get install php5 curl php5-curl php5-sqlite php5-gd cd /var/www/ - VERSION=${lizmapVersion} - wget https://github.com/3liz/lizmap-web-client/archive/$VERSION.zip - unzip $VERSION.zip - rm $VERSION.zip + wget https://github.com/3liz/lizmap-web-client/archive/${lizmapVersion}.zip + unzip ${lizmapVersion}.zip + rm ${lizmapVersion}.zip + mv lizmap-web-client-${lizmapVersion} echobase-map + +**Note** + +Dans les nouvelles conventions d'Apache2, le repetoire de partage n'est plus **/var/wwww** mais **/var/www/html** . +Dans ce cas, il faudrat modifier la configuration d'echobase comme suit :: + + echobase.lizmap.application.basedir=/var/www/html/echobase-map -On obtient alors un répertoire **lizmap-web-client-${lizmapVersion}**. Il faut ensuite installer le style adapté pour EchoBase:: - cd /var/www/lizmap-web-client-${lizmapVersion}/lizmap + cd /var/www/echobase-map/lizmap wget http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/echobase/echobase-ui/${project.version}/echobase-ui-${project.version}-lizmap.zip unzip echobase-ui-${project.version}-lizmap.zip rm -rf echobase-ui-${project.version}-lizmap.zip cd .. - chown -R o+wr . + chown -R wwww-data:echobase . + chmod g+w -R . + +Pour tester le server lizmap utilisez l'url : http://localhost/echobase-map/lizmap/www + Configuration des répertoires ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Il est possible de modifier la configuration de ces différents répertoires dans la configuration (voir le `détail des options disponibles`_). +Il peut être necessaire de redefinir l'addresse public du serveur lizmap +:: + + echobase.lizmap.application.map.url=http://<serveur>/echobase-map/lizmap/www/index.php/view/map + + +Finalisation +~~~~~~~~~~~~ + +Il est nécessaire de redemarer les services +:: + + sudo service apache2 restart + sudo service tomvcat7 restart + + .. _créer une base travail: ./db.html#creation-d-une-base-postgresql .. _détail des options disponibles: ./config-report.html .. _Qgis map server: http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.