Merge branch '1.3.0' of github.com:nasa-gibs/onearth into 1.3.0

nasa-gibs · May 6, 2017 · 8405dcb · 8405dcb
2 parents f98aac2 + 707cc2a
commit 8405dcb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/deploy/onearth/onearth.spec b/deploy/onearth/onearth.spec
@@ -1,6 +1,6 @@
 Name:		onearth
 Version:	1.3.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Installation packages for OnEarth
 
 License:	ASL 2.0+
@@ -286,6 +286,7 @@ make WEB_HOST=localhost/onearth/demo-twms
 mv %{_datadir}/onearth/apache/kml/kmlgen.cgi \
    %{_datadir}/onearth/demo/twms-geo
 mkdir %{_datadir}/onearth/demo/wms/epsg4326
+mkdir %{_datadir}/onearth/demo/data/EPSG3857
 ln -s %{_datadir}/onearth/apache/wms.cgi %{_datadir}/onearth/demo/wms/epsg4326
 ln -s %{_datadir}/onearth/demo/ol/* %{_datadir}/onearth/demo/wms/
 ln -s %{_datadir}/onearth/demo/ol/* %{_datadir}/onearth/demo/wmts-geo/

diff --git a/src/demo/onearth-demo.conf b/src/demo/onearth-demo.conf
@@ -19,6 +19,10 @@ SSLProxyEngine on
 ProxyPass /outside https://gibs.earthdata.nasa.gov/
 ProxyPassReverse /outside https://gibs.earthdata.nasa.gov/
 
+# Optional reproject configs
+# Include /usr/share/onearth/demo/data/EPSG3857/onearth-reproject-twms.conf
+# Include /usr/share/onearth/demo/data/EPSG3857/onearth-reproject-wmts.conf
+
 ScriptAlias /onearth/wms/epsg4326 /usr/share/onearth/demo/wms/epsg4326
 Alias /onearth/wmts/epsg4326 /usr/share/onearth/demo/wmts-geo
 Alias /onearth/twms/epsg4326 /usr/share/onearth/demo/twms-geo

diff --git a/src/layer_config/conf/environment_webmercator.xml b/src/layer_config/conf/environment_webmercator.xml
@@ -33,8 +33,8 @@ limitations under the License.
     <MapfileConfigLocation basename="EPSG3857">/etc/onearth/config/mapserver/</MapfileConfigLocation>
     <ReprojectEndpoint service="wmts">/onearth/wmts/epsg3857</ReprojectEndpoint>
     <ReprojectEndpoint service="twms">/onearth/twms/epsg3857</ReprojectEndpoint>
-    <ApacheConfigLocation service="wmts" basename="onearth-reproject-wmts">/etc/httpd/conf.d/</ApacheConfigLocation>
-    <ApacheConfigLocation service="twms" basename="onearth-reproject-twms">/etc/httpd/conf.d/</ApacheConfigLocation>
+    <ApacheConfigLocation service="wmts" basename="onearth-reproject-wmts">/usr/share/onearth/demo/data/EPSG3857/</ApacheConfigLocation>
+    <ApacheConfigLocation service="twms" basename="onearth-reproject-twms">/usr/share/onearth/demo/data/EPSG3857/</ApacheConfigLocation>
     <ApacheConfigHeaderLocation service="twms" basename="webmerc-reproject-twms">/etc/onearth/config/reproject/</ApacheConfigHeaderLocation>
     <ApacheConfigHeaderLocation service="wmts" basename="webmerc-reproject-wmts">/etc/onearth/config/reproject/</ApacheConfigHeaderLocation>
 </EnvironmentConfiguration>