refaktor take 4

smartemission · Apr 26, 2016 · 3d42791 · 3d42791
1 parent 0392df2
commit 3d42791
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/...ms/sld/meas_audio_level_range_smartem.sld → ...er/sld/meas_audio_level_range_smartem.sld b/...ms/sld/meas_audio_level_range_smartem.sld → ...er/sld/meas_audio_level_range_smartem.sld
diff --git a/services/wms/sld/meas_co2_smartem.sld → services/geoserver/sld/meas_co2_smartem.sld b/services/wms/sld/meas_co2_smartem.sld → services/geoserver/sld/meas_co2_smartem.sld
diff --git a/services/wms/sld/meas_co_smartem.sld → services/geoserver/sld/meas_co_smartem.sld b/services/wms/sld/meas_co_smartem.sld → services/geoserver/sld/meas_co_smartem.sld
diff --git a/.../wms/sld/meas_no2_color_range_smartem.sld → ...rver/sld/meas_no2_color_range_smartem.sld b/.../wms/sld/meas_no2_color_range_smartem.sld → ...rver/sld/meas_no2_color_range_smartem.sld
diff --git a/...s/wms/sld/meas_o3_color_range_smartem.sld → ...erver/sld/meas_o3_color_range_smartem.sld b/...s/wms/sld/meas_o3_color_range_smartem.sld → ...erver/sld/meas_o3_color_range_smartem.sld
diff --git a/services/wms/sld/meteo_smartem.sld → services/geoserver/sld/meteo_smartem.sld b/services/wms/sld/meteo_smartem.sld → services/geoserver/sld/meteo_smartem.sld
diff --git a/services/wms/sld/stations-smartem.sld → services/geoserver/sld/stations-smartem.sld b/services/wms/sld/stations-smartem.sld → services/geoserver/sld/stations-smartem.sld
diff --git a/services/web/config/sites-enabled/000-default.conf b/services/web/config/sites-enabled/000-default.conf
@@ -4,7 +4,7 @@
     ServerAlias api.test.smartemission.nl
     ServerAlias api.local.smartemission.nl
 
-    DocumentRoot /opt/geonovum/smartem/git/services/sosrest
+    DocumentRoot /opt/geonovum/smartem/git/services/web/api/sosrest
     ServerAdmin just@justobjects.nl
 
     DirectoryIndex index.html index.jsp index.cgi index.fcgi
@@ -13,13 +13,13 @@
 #    WSGIDaemonProcess smartem_sosemu user=sadmin group=sadmin processes=4 threads=4
 #	WSGIProcessGroup smartem_sosemu
 #   	WSGIApplicationGroup %{GLOBAL}
-    WSGIScriptAlias /sosemu /opt/geonovum/smartem/git/services/sosrest/index.py
+    WSGIScriptAlias /sosemu /opt/geonovum/smartem/git/services/web/api/sosrest/index.py
 
 #    WSGIScriptAlias /istsos /opt/istsos/latest/application.py
 #    Alias /istsos/admin /opt/istsos/latest/interface/admin
 #    Alias /istsos/modules /opt/istsos/latest/interface/modules
 
-    <Directory /opt/geonovum/smartem/git/services/sosrest/>
+    <Directory /opt/geonovum/smartem/git/services/web/api/sosrest/>
          Require all granted
     </Directory>
 
@@ -42,19 +42,19 @@
     ServerAlias test.smartemission.nl
     ServerAlias local.smartemission.nl
 
-    DocumentRoot /opt/geonovum/smartem/git/www/site
+    DocumentRoot /opt/geonovum/smartem/git/web/site
     ServerAdmin just@justobjects.nl
 
-   ScriptAlias /cgi-bin/ /opt/geonovum/smartem/git/www/cgi-bin/
-    <Directory "/opt/geonovum/smartem/git/www/cgi-bin">
+   ScriptAlias /cgi-bin/ /opt/geonovum/smartem/git/web/cgi-bin/
+    <Directory "/opt/geonovum/smartem/git/web/cgi-bin">
          AllowOverride None
          Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
          Require all granted
     </Directory>
 
     DirectoryIndex index.html
 
-    <Directory /opt/geonovum/smartem/git/www/site/>
+    <Directory /opt/geonovum/smartem/git/web/site/>
          Require all granted
     </Directory>
 

diff --git a/services/web/run-apache2.sh → services/web/run-web.sh b/services/web/run-apache2.sh → services/web/run-web.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 #
-# Run the Apache2 server with mapping to local config
+# Run the Apache2 webserver with mapping to local config
 #
 
 GIT="/opt/geonovum/smartem/git"
-WWW="${GIT}/www"
-CONFIG="${GIT}/services/apache2"
+CONFIG="${GIT}/services/web"
 LOG="/var/smartem/log"
-NAME="apache2"
+NAME="web"
 IMAGE="geonovum/apache2"
 
 VOL_MAP="-v ${CONFIG}/sites-enabled:/etc/apache2/sites-enabled -v ${GIT}:${GIT} -v ${LOG}/apache2:/var/log/apache2"