fix mot new urls

Author: OriHoch

HTTP_PROXY.md

@@ -0,0 +1,18 @@
+# HTTP Proxy
+
+We use an HTTP Proxy to access the SIRI data from MOT allowed IP
+
+The proxy is running on server hasadna-proxy1 (see hasadna-iac for terraform configuration setting it up and to get access)
+
+To access from local PC you need to create an SSH tunnel to this server:
+
+```
+ssh hasadna-proxy1 -L 9999:172.16.0.5:9999 -N
+```
+
+Then set the HTTP_PROXY and HTTPS_PROXY environment variables to point to the local end of the tunnel:
+
+```
+export HTTP_PROXY=http://localhost:9999
+export HTTPS_PROXY=http://localhost:9999
+```

SSH_TUNNEL.md

@@ -14,7 +14,7 @@
 
 
 REQUEST_URL_TEMPLATE = "https://moran.mot.gov.il/Channels/HTTPChannel/SmQuery/2.8/json?Key={Key}&MonitoringRef=AllActiveTripsFilter&StopVisitDetailLevel=normal"
-ALT_REQUEST_URL_TEMPLATE = REQUEST_URL_TEMPLATE  # need to get the new backup url
+ALT_REQUEST_URL_TEMPLATE = "https://moran-t.mot.gov.il/Channels/HTTPChannel/SmQuery/2.8/json?Key={Key}&MonitoringRef=AllActiveTripsFilter&StopVisitDetailLevel=normal"
 
 
 @contextlib.contextmanager
@@ -73,7 +73,8 @@ def _request(use_alt=False):
     with start_ssh_tunnel() as proxies:
         try:
             res = requests.get(
-                request_url, proxies=proxies, timeout=config.OPEN_BUS_REQUESTER_TIMEOUT_SECONDS
+                request_url, proxies=proxies, timeout=config.OPEN_BUS_REQUESTER_TIMEOUT_SECONDS,
+                verify=False
             )
         except:
             traceback.print_exc()