Merge pull request #4304 from hove-io/redirect_route_schedules

Redirect route_schedules

docker/apache/jormungandr.default.conf

@@ -19,6 +19,10 @@
     RewriteCond %{REQUEST_URI} ^(.*)//(.*)$
     RewriteRule . %1/%2  [L,PT]
 
+     RewriteCond %{ENV:GORMUNGANDR_URL} ^[a-zA-Z].* [NC]
+     RewriteRule ^/(.*route_schedules.*) %{ENV:GORMUNGANDR_URL}/$1 [P]
+     ProxyPassReverse / %{ENV:GORMUNGANDR_URL}/
+
     AddOutputFilterByType DEFLATE application/json
 
     CustomLog /var/log/apache2/access.log vhost_combined_timetaken

docker/run_jormungandr.sh

@@ -9,17 +9,20 @@ function show_help() {
 Usage: ${0##*/} -m monitor-process -r max-requests
     -m      [0|1] activate monitor-process
     -r      max-requests before reload for jormungandr worker
+    -g      Optional: gormungandr url for route_schedules API (Example: http://gormungandr)
 EOF
 }
 
-while getopts "m:r:c:h" opt; do
+while getopts "m:r:c:g:h" opt; do
     case $opt in
         m) monitor_processes=$OPTARG
             ;;
         r) app_max_requests=$OPTARG
             ;;
         c) jormun_cache_items=$OPTARG
             ;;
+        g) gormungandr_url=$OPTARG
+            ;;
         h|\?)
             show_help
             exit 1
@@ -47,6 +50,10 @@ fi
 
 jormungandr_cache2="name=jormungandr,items=${jormun_cache_items}"
 
+if [[ ! -z $gormungandr_url ]]
+then
+  echo "export GORMUNGANDR_URL=$gormungandr_url" >> /etc/apache2/envvars
+fi
 # run apache2
 service apache2 start
 if [ $? == 1 ]