diff --git a/app-conf/mapserver/mapserver.conf b/app-conf/mapserver/mapserver.conf index 72f0c7b4..8a218584 100644 --- a/app-conf/mapserver/mapserver.conf +++ b/app-conf/mapserver/mapserver.conf @@ -1,6 +1,7 @@ CONFIG ENV - MS_MAP_PATTERN "^\/usr\/local\/((\.\/)?|([^\.][-_A-Za-z0-9\.]*\/{1}))*([-_A-Za-z0-9\.]+\.(map))$" + # allow Mapfiles from any location but they must end with .map + MS_MAP_PATTERN ".*/.*\.map$" MS_MAP_BAD_PATTERN "[/\\]{2}|[/\\]?\.{2,}[/\\]|," OGCAPI_HTML_TEMPLATE_DIRECTORY "/usr/share/mapserver/ogcapi/templates/html-plain/" END diff --git a/bin/install_mapserver.sh b/bin/install_mapserver.sh index ed329801..c8fa2ca8 100755 --- a/bin/install_mapserver.sh +++ b/bin/install_mapserver.sh @@ -59,7 +59,7 @@ MS_DEMO_VERSION="1.2" MS_DOCS_VERSION="8-2" wget -c --progress=dot:mega \ - "http://download.osgeo.org/livedvd/data/mapserver/mapserver-$MS_DOCS_VERSION-html-docs.zip" + "https://download.osgeo.org/livedvd/data/mapserver/mapserver-$MS_DOCS_VERSION-html-docs.zip" wget -c --progress=dot:mega \ "https://github.com/mapserver/mapserver-demo/archive/v$MS_DEMO_VERSION.zip" @@ -146,6 +146,8 @@ EOF cp /usr/share/applications/mapserver.desktop "$USER_HOME/Desktop/" chown "$USER_NAME:$USER_NAME" "$USER_HOME/Desktop/mapserver.desktop" +# allow Mapfiles to be read from /home/user +chmod o+rx "$USER_HOME" # share data with the rest of the disc ln -s /usr/local/share/mapserver/demos/itasca/data \