Mercurial > dive4elements > river
changeset 7778:35a7c05b5cd4
Remove FLYS-specific stuff from config.yaml and allow to give a custom file in release script.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 04 Mar 2014 18:34:24 +0100 |
| parents | c7abf983d41b |
| children | abf3cb9cb6c4 |
| files | contrib/make_flys_release/make_release.sh gwt-client/src/main/webapp/WEB-INF/config.yaml |
| diffstat | 2 files changed, 6 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh Tue Mar 04 17:58:10 2014 +0100 +++ b/contrib/make_flys_release/make_release.sh Tue Mar 04 18:34:24 2014 +0100 @@ -215,6 +215,10 @@ find $FLYS_SOURCE_DIR/river/ -name \*.properties -o -name \*.xsl | \ xargs sed -i "s@https://flys-intern.intevation.de@${WIKI_URL}@g"; +if [ -r "$CONFIG_YAML" ]; then + cp "$CONFIG_YAML" $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/config.yaml +fi + sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \ $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/config.yaml
--- a/gwt-client/src/main/webapp/WEB-INF/config.yaml Tue Mar 04 17:58:10 2014 +0100 +++ b/gwt-client/src/main/webapp/WEB-INF/config.yaml Tue Mar 04 18:34:24 2014 +0100 @@ -60,7 +60,7 @@ - 2000000 - 4000000 -outputFilename: 'flys-${date}.pdf' +outputFilename: 'd4e-${date}.pdf' #=========================================================================== # the list of allowed hosts @@ -69,26 +69,11 @@ - !localMatch dummy: true - !dnsMatch - host: wsvmapserv.ilmenau.baw.de - port: 80 - - !dnsMatch host: www.pegelonline.wsv.de port: 80 - !dnsMatch - host: gdz.bkg.bund.de - port: 80 - - !dnsMatch - host: ims3.bkg.bund.de - port: 80 - - !dnsMatch host: tile.openstreetmap.org port: 80 - - !dnsMatch - host: wsvmapserv.wsv.bund.de - port: 80 - - !dnsMatch - host: geo4.service24.rlp.de - port: 80 # Catch all #- !dnsMatch # host: #regex that catches host plus path @@ -96,15 +81,6 @@ - !dnsMatch host: osm.intevation.de port: 80 - - !dnsMatch - host: osm.wheregroup.com - port: 80 - - !dnsMatch - host: geoportal.bafg.de - port: 80 - - !dnsMatch - host: wsvmapserv.wsv.bvbs.bund.de - port: 80 # We need a font with unicode support the defaults only # have latin1 @@ -117,7 +93,7 @@ #=========================================================================== metaData: title: '${mapTitle}' - author: 'Flusshydrologische Software' + author: 'Dive4Elements River' subject: 'Kartendruck' keywords: 'map,print' creator: 'd4e-river'