Merge pull request #4339 from hove-io/gormun_v2

Use Gormun v2 for journeys and route_schedules APIs

docker/apache/jormungandr.default.conf

@@ -23,6 +23,13 @@
      RewriteRule ^/(.*route_schedules.*) %{ENV:GORMUNGANDR_URL}/$1 [P]
      ProxyPassReverse / %{ENV:GORMUNGANDR_URL}/
 
+     RewriteCond %{ENV:GORMUNGANDR_VERSION} 2
+     RewriteCond %{REQUEST_URI} ".*journeys.*"
+     RewriteCond %{QUERY_STRING} "from="
+     RewriteCond %{QUERY_STRING} "to="
+     RewriteRule ^/(.*) %{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

@@ -10,10 +10,11 @@ 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)
+    -v      Optional: gormungandr version API : route_schedules(1), route_schedules and journeys(2)
 EOF
 }
 
-while getopts "m:r:c:g:h" opt; do
+while getopts "m:r:c:g:v:h" opt; do
     case $opt in
         m) monitor_processes=$OPTARG
             ;;
@@ -23,6 +24,8 @@ while getopts "m:r:c:g:h" opt; do
             ;;
         g) gormungandr_url=$OPTARG
             ;;
+        v) gormungandr_version=$OPTARG
+            ;;
         h|\?)
             show_help
             exit 1
@@ -50,9 +53,10 @@ fi
 
 jormungandr_cache2="name=jormungandr,items=${jormun_cache_items}"
 
-if [[ ! -z $gormungandr_url ]]
+if [[ ! -z $gormungandr_url ]] && [[ ! -z $gormungandr_version ]];
 then
   echo "export GORMUNGANDR_URL=$gormungandr_url" >> /etc/apache2/envvars
+  echo "export GORMUNGANDR_VERSION=$gormungandr_version" >> /etc/apache2/envvars
 fi
 # run apache2
 service apache2 start