Merge branch 'release/3.0.4'

azavea · Jan 27, 2020 · d1ef7ee · d1ef7ee
2 parents 8d85b89 + 0d5af2a
commit d1ef7ee
Show file tree

Hide file tree

Showing 8 changed files with 314 additions and 195 deletions.
diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
@@ -2,7 +2,7 @@
   version: 2.0.1
 
 - src: azavea.nginx
-  version: 0.3.1
+  version: 1.0.0
 
 - src: azavea.nodejs
   version: 0.4.0
@@ -14,4 +14,4 @@
   version: 2.0.0
 
 - src: azavea.postgresql
-  version: 1.0.0
+  version: 2.0.0
diff --git a/deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml
@@ -5,6 +5,7 @@
     pkg:
       - binutils
       - chromium-browser
+      - dh-autoreconf
       - g++
       - gdal-bin
       - libpq-dev

diff --git a/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml b/deployment/ansible/roles/cac-tripplanner.otp-data/tasks/main.yml
@@ -3,7 +3,11 @@
   file: path={{ otp_data_dir }} state=directory owner={{ otp_user }}
 
 - name: Install AuthBind (for serving OTP on port 80)
-  apt: pkg=authbind state=present
+  apt:
+    state: present
+    pkg:
+      - authbind
+      - dh-autoreconf
 
 - name: Touch AuthBind file if it does not exist
   file: path=/etc/authbind/byport/80 state=touch

diff --git a/deployment/cloudformation/app.py b/deployment/cloudformation/app.py
@@ -452,7 +452,7 @@ def set_up_stack(self):
                 AlarmActions=[Ref(autoscaling_policy_remove)],
                 Statistic='Average',
                 Period=300,
-                Threshold='2000000',
+                Threshold='4000000',
                 EvaluationPeriods=3,
                 ComparisonOperator='LessThanThreshold',
                 MetricName='NetworkOut',

diff --git a/python/cac_tripplanner/deployment_requirements.txt b/python/cac_tripplanner/deployment_requirements.txt
@@ -1,5 +1,5 @@
 boto==2.49.0
-PyYAML==5.2
+PyYAML==5.3
 majorkirby==1.0.0
 requests==2.22.0
 troposphere==2.5.3
diff --git a/python/cac_tripplanner/requirements.txt b/python/cac_tripplanner/requirements.txt
@@ -1,16 +1,16 @@
-base58==1.0.3
+base58==2.0.0
 boto==2.49.0
 Django==2.2.9
 django-ckeditor==5.8.0
 django-image-cropping==1.3.0
-django-extensions==2.2.5
+django-extensions==2.2.6
 django-storages==1.8
 easy-thumbnails==2.7
 gunicorn==20.0.4
 Pillow==7.0.0
 psycopg2-binary==2.8.4
 pytz==2019.3
-PyYAML==5.2
+PyYAML==5.3
 requests==2.22.0
 git+https://github.com/azavea/[email protected]#egg=django-wpadmin
 virtualenv==16.7.9