Merge branch 'release/3.0.5'

deployment/ansible/group_vars/all

@@ -10,11 +10,11 @@ postgres_password: "cac_tripplanner"
 postgres_host: "192.168.8.25"
 
 postgresql_support_psycopg2_version: "2.8.*"
-'postgis_version': [2, 5, 2]
+'postgis_version': [3, 0, 1]
 
-packer_version: "1.4.4"
+packer_version: "1.5.4"
 
-nodejs_version: 12.14.1
+nodejs_version: 12.16.1
 nodejs_npm_version: 6.13.4
 
 otp_router: "default"
@@ -28,3 +28,12 @@ papertrail_log_files:
     - "/var/log/cac-tripplanner-app.log"
     - "/var/log/event-feed.log"
     - "/var/log/upstart/otp.log"
+
+postgresql_version: "9.6"
+postgresql_package_version: "9.6.*"
+postgresql_support_libpq_version: "*"
+
+postgresql_listen_addresses: "*"
+postgresql_hba_mapping:
+  - { type: "host", database: "all", user: "all", address: "0.0.0.0/0", method: "md5" }
+  - { type: "host", database: "all", user: "all", address: "127.0.0.1/32", method: "md5" }

deployment/ansible/group_vars/development_template

@@ -9,7 +9,6 @@ otp_process_mem: 5G
 # for cac_secrets
 allowed_hosts: ['127.0.0.1', 'localhost']
 internal_ips: ['0.0.0.0', '127.0.0.1']
-postgis_version: [2, 5, 2]
 aws_access_key_id: ''
 aws_secret_access_key: ''
 aws_storage_bucket_name: ''
@@ -25,12 +24,3 @@ use_s3_storage: false
 default_admin_username: 'admin'
 default_admin_password: 'admin'
 default_admin_email: '[email protected]'
-
-postgresql_version: "9.6"
-postgresql_package_version: "9.6.*"
-postgresql_support_libpq_version: "*"
-
-postgresql_listen_addresses: "*"
-postgresql_hba_mapping:
-  - { type: "host", database: "all", user: "all", address: "0.0.0.0/0", method: "md5" }
-  - { type: "host", database: "all", user: "all", address: "127.0.0.1/32", method: "md5" }

deployment/ansible/group_vars/test

@@ -2,16 +2,4 @@
 test: true
 develop: false
 production: false
-
-postgis_version: [2, 5, 2]
-
-postgresql_version: "9.6"
-postgresql_package_version: "9.6.*"
-postgresql_support_libpq_version: "*"
-
-postgresql_listen_addresses: "*"
-postgresql_hba_mapping:
-  - { type: "host", database: "all", user: "all", address: "0.0.0.0/0", method: "md5" }
-  - { type: "host", database: "all", user: "all", address: "127.0.0.1/32", method: "md5" }
-
 otp_process_mem: 3G

deployment/packer/cac.json

@@ -73,13 +73,13 @@
     {
       "type": "shell",
       "inline": [
-        "sleep 20",
-        "sudo apt-get update",
         "sleep 60",
+        "sudo apt-get update",
+        "sleep 120",
         "mkdir -p {{user `ansible_staging_directory`}}",
         "mkdir -p {{user `intermediate_directory`}}",
         "sudo apt-get -y install python3-dev python3-pip git",
-        "sudo -H pip3 install ansible==2.8"
+        "sudo -H pip3 install ansible==2.9"
       ]
     },
     {

deployment/packer/cac_packer.py

@@ -21,7 +21,7 @@ def get_ubuntu_ami(region, creds):
       creds (Dict): Dictionary containing AWS credentials
     """
 
-    response = urllib.urlopen('http://cloud-images.ubuntu.com/query/xenial/'
+    response = urllib.urlopen('http://cloud-images.ubuntu.com/query/bionic/'
                               'server/released.current.txt').readlines()
     response = [x.decode('utf-8') for x in response]
     fieldnames = ['version', 'version_type', 'release_status', 'date',

python/cac_tripplanner/cac_tripplanner/custom_storages.py

@@ -2,10 +2,10 @@
 import urllib.parse
 import urllib.error
 
-from storages.backends.s3boto import S3BotoStorage
+from storages.backends.s3boto3 import S3Boto3Storage
 
 
-class PublicS3BotoStorage(S3BotoStorage):
+class PublicS3BotoStorage(S3Boto3Storage):
     """
     Override of S3BotoStorage that strips authentication parameters for use with public buckets
 

python/cac_tripplanner/cac_tripplanner/settings.py

@@ -24,6 +24,9 @@
 # because it loads jquery for gis.admin.OSMGeoAdmin
 IMAGE_CROPPING_JQUERY_URL = '/static/admin/js/vendor/jquery/jquery.js'
 
+# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html
+# inherit the bucket's ACL
+AWS_DEFAULT_ACL = None
 
 try:
     secrets = yaml.safe_load(open('/etc/cac_secrets', 'r'))

python/cac_tripplanner/deployment_requirements.txt

@@ -1,5 +1,5 @@
 boto==2.49.0
 PyYAML==5.3
 majorkirby==1.0.0
-requests==2.22.0
-troposphere==2.5.3
+requests==2.23.0
+troposphere==2.6.0

python/cac_tripplanner/requirements.txt

@@ -1,16 +1,16 @@
 base58==2.0.0
-boto==2.49.0
-Django==2.2.9
-django-ckeditor==5.8.0
+boto3==1.12.14
+Django==2.2.11
+django-ckeditor==5.9.0
 django-image-cropping==1.3.0
-django-extensions==2.2.6
-django-storages==1.8
+django-extensions==2.2.8
+django-storages==1.9
 easy-thumbnails==2.7
 gunicorn==20.0.4
 Pillow==7.0.0
 psycopg2-binary==2.8.4
 pytz==2019.3
 PyYAML==5.3
-requests==2.22.0
+requests==2.23.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
-virtualenv==16.7.9
+virtualenv==20.0.7

src/app/scripts/cac/map/cac-map-overlays.js

@@ -38,7 +38,7 @@ CAC.Map.OverlaysControl = (function ($, cartodb, L, Utils) {
 
     function bikeRoutesOverlay(map) {
         var layerGroup = cartodb.L.featureGroup([]);
-        var url = 'https://cac-tripplanner.carto.com/api/v2/viz/c57728a5-55b6-41f9-af4f-6d982dc346b4/viz.json';
+        var url = 'https://cac-tripplanner.carto.com/api/v2/viz/aca1808b-b8f0-465d-b8b4-e2fdbca78568/viz.json';
         cartodb.createLayer(map, url).on('done', function(layer) {
             layerGroup.addLayer(layer);
             // Wait until layer has loaded to bring it to front.  Otherwise, it loads behind