# HG changeset patch
# User Andre Heinecke <aheinecke@intevation.de>
# Date 1363170188 -3600
# Node ID df7028d0cb93c937ed6255f912d470049222e1cd
# Parent  9245f4b434b30550dbb9a1aad297bbb41b650637
Add LOG_DIR to make release to configure a logging directory. And
configure this directory also in the mapfile templates.
Default: /var/log/flys

diff -r 9245f4b434b3 -r df7028d0cb93 contrib/make_flys_release/README
--- a/contrib/make_flys_release/README	Wed Mar 13 10:34:29 2013 +0100
+++ b/contrib/make_flys_release/README	Wed Mar 13 11:23:08 2013 +0100
@@ -8,6 +8,7 @@
 TOMCAT_PORT
 MAPSERVER_URL
 WIKI_URL
+LOG_DIR
 DEVELOPER
 DEFAULT_WD
 
diff -r 9245f4b434b3 -r df7028d0cb93 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Wed Mar 13 10:34:29 2013 +0100
+++ b/contrib/make_flys_release/make_release.sh	Wed Mar 13 11:23:08 2013 +0100
@@ -79,6 +79,7 @@
 BACKENDUSER=${BACKENDUSER:-flys_dami}
 BACKENDPASS=${BACKENDPASS:-flys_dami}
 INITSQLS=${INITSQLS:-}
+LOG_DIR=/var/log/flys
 
 OPTS=`getopt -o ?w:,t,o \
      -l help,oracle \
@@ -173,7 +174,7 @@
        -e "s@http://localhost:8888@http://localhost:$TOMCAT_PORT@g" \
     $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/web.xml
 
-sed -i -e "s@/tmp/flys-client.log@/var/log/flys/client-${VERSION}.log@g" \
+sed -i -e "s@/tmp/flys-client.log@${LOG_DIR}/client-${VERSION}.log@g" \
     $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/log4j.properties
 
 find $FLYS_SOURCE_DIR/flys/flys-artifacts/src/main/resources/ -name messages_\*.properties \
@@ -238,7 +239,13 @@
 sed -i -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \
     $WORK_DIR/server/conf/rivermap.xml
 
-sed "s@/tmp/flys-server-default.log@/var/log/flys/server-${VERSION}.log@" \
+sed -i -e "s@/tmp/flys-rivers-wms.log/@${LOG_DIR}/rivers-wms-${VERSION}.log@g" \
+    $WORK_DIR/server/conf/mapserver/river-mapfile.vm
+
+sed -i -e "s@/tmp/flys-user-wms.log/@${LOG_DIR}/user-wms-${VERSION}.log@g" \
+    $WORK_DIR/server/conf/mapserver/mapfile.vm
+
+sed "s@/tmp/flys-server-default.log@${LOG_DIR}/server-${VERSION}.log@" \
     $SCRIPT_DIR/confs/log4j.properties \
     > $WORK_DIR/server/conf/log4j.properties