Mercurial > dive4elements > river
changeset 4889:8118f9b0ee7b
Fixed config files.
* backend-db: fixed connection string.
* make-release: Fixed mapserver url and added sed command to replace mapserver
url in rivermap.xml
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Mon, 28 Jan 2013 16:33:05 +0100 |
| parents | 3f0c8ef42b7a |
| children | bf38ea4cb0f7 |
| files | contrib/make_flys_release/confs/backend-db.xml contrib/make_flys_release/confs/rivermap.xml contrib/make_flys_release/make_release.sh |
| diffstat | 3 files changed, 38 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/make_flys_release/confs/backend-db.xml Mon Jan 28 16:30:46 2013 +0100 +++ b/contrib/make_flys_release/confs/backend-db.xml Mon Jan 28 16:33:05 2013 +0100 @@ -5,7 +5,7 @@ <password>flys293</password> <dialect>org.hibernate.dialect.PostgreSQLDialect</dialect> <driver>org.postgresql.Driver</driver> - <url>jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys29</url> + <url>jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys293</url> <!-- <user>flys27</user>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/make_flys_release/confs/rivermap.xml Mon Jan 28 16:33:05 2013 +0100 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--// configuration fragment for static river WMS //--> +<rivermap> + <mapserver> + <server path="http://example.com/cgi-bin/"/> + <mapfile path="${artifacts.config.dir}/../rivers.map"/> + <templates path="${artifacts.config.dir}/mapserver/"/> + <map-template path="river-mapfile.vm"/> + </mapserver> + + <velocity> + <logfile path="${artifacts.config.dir}/../rivermap_velocity.log"/> + </velocity> + + <river name="Saar"> + <srid value="31467"/> + <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar"/> + <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/> + </river> + <river name="Mosel"> + <srid value="31467"/> + <river-wms url="http://example.com/cgi-bin/river-wms" layers="Mosel"/> + <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/> + </river> + <river name="Elbe"> + <srid value="31467"/> + <river-wms url="http://example.com/cgi-bin/river-wms" layers="Elbe"/> + <background-wms url="http://osm.intevation.de/mapcache/?" layers="flys-wms"/> + </river> +</rivermap>
--- a/contrib/make_flys_release/make_release.sh Mon Jan 28 16:30:46 2013 +0100 +++ b/contrib/make_flys_release/make_release.sh Mon Jan 28 16:33:05 2013 +0100 @@ -17,7 +17,7 @@ ARTIFACT_PORT=${ARTIFACT_PORT:-9002} TOMCAT_PORT=${TOMCAT_PORT:-8005} -MAPSERVER_URL=${MAPSERVER_URL:-czech-republic.intevation.de} +MAPSERVER_URL=${MAPSERVER_URL:-czech-republic.atlas.intevation.de} echo "INFO: create server directories" mkdir -p $DIRECTORY/server/bin/lib/own @@ -102,11 +102,15 @@ confs/rest-server.xml \ > $DIRECTORY/server/conf/rest-server.xml -sed -e "s@http://czech-republic.intevation.de/@http://${MAPSERVER_URL}/@g" \ - -e "s@flys-default@flys-${RELEASE}@g" \ +sed -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \ confs/floodmap.xml \ > $DIRECTORY/server/conf/floodmap.xml +sed -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \ + confs/rivermap.xml \ + > $DIRECTORY/server/conf/rivermap.xml + + sed "s@/tmp/flys-server-default.log@/tmp/flys-server-${RELEASE}.log" \ confs/log4j.properties \ > $DIRECTORY/server/conf/log4j.properties