Ticket #1774: install_mapproxy.patch

bin/install_mapproxy.sh

@@ -16 +16 @@
 USER_HOME="/home/$USER_NAME"
 
 BIN="/usr/local/bin"
-TMP="/tmp/build_mapproxy"
-MAPPROXY_VERSION="1.8.2"
-MAPPROXY_DOCS_FILE="MapProxy-docs-1.8.0.tar.gz"
-MAPPROXY_DOCS_URL="http://mapproxy.org/static/rel/$MAPPROXY_DOCS_FILE"
 MAPPROXY_DIR="/usr/local/share/mapproxy"
 
-apt-get install --yes python-mapproxy
+apt-get install --yes mapproxy mapproxy-doc
 
-mkdir -p "$TMP"
-cd "$TMP"
-
-echo "Downloading: $MAPPROXY_DOCS_URL"
-wget --timestamping --continue --progress=dot:mega "$MAPPROXY_DOCS_URL"
-if [ $? -ne 0 ] ; then
-   echo "ERROR: download failed"
-   exit 1
-fi
-
-mkdir -p $MAPPROXY_DIR/docs
-echo "Extracting docs: $MAPPROXY_DOCS_FILE"
-tar -xz --strip-components 1 -C "$MAPPROXY_DIR"/docs -f "$MAPPROXY_DOCS_FILE"
-if [ $? -ne 0 ] ; then
-   echo "ERROR: docs install failed"
-   exit 1
-fi
-ln -sf "$MAPPROXY_DIR/docs" /var/www/html/mapproxy
+ln -sf /usr/share/doc/mapproxy/html /var/www/html/mapproxy
 
 echo "Creating Scripts/Links"
 # Create startup script for MapProxy Server
@@ -114 +93 @@
         fax: +49(0)000-000000-0
         email: info@omniscale.de
       access_constraints:
-        This service is intended for private and evaluation use only.
-        The data is licensed as Creative Commons Attribution-Share Alike 2.0
-        (http://creativecommons.org/licenses/by-sa/2.0/)
+        Insert license and copyright information for this service.
       fees: 'None'
 
 layers:
@@ -266 +243 @@
 chmod g+w "$MAPPROXY_DIR/mapproxy.yaml"
 adduser "$USER_NAME" users
 
-#snafu'd ownership
-chown -R root.root "$MAPPROXY_DIR/docs/"
-
 
 ####
 "$BUILD_DIR"/diskspace_probe.sh "`basename $0`" end