Merge branch 'release/2.7.0'

Author: flibbertigibbet

Vagrantfile

@@ -4,23 +4,6 @@
 Vagrant.require_version ">= 2.0"
 require "yaml"
 
-CAC_SHARED_FOLDER_TYPE = ENV.fetch("CAC_SHARED_FOLDER_TYPE", "nfs")
-CAC_NFS_VERSION =  ENV.fetch("CAC_NFS_VERSION_3", true) ? 'vers=3': 'vers=4'
-
-if CAC_SHARED_FOLDER_TYPE == "nfs"
-  if Vagrant::Util::Platform.linux? then
-    CAC_MOUNT_OPTIONS = ['rw', CAC_NFS_VERSION, 'tcp', 'nolock', 'actimeo=1']
-  else
-    CAC_MOUNT_OPTIONS = [CAC_NFS_VERSION, 'udp', 'actimeo=1']
-  end
-else
-  if ENV.has_key?("CAC_MOUNT_OPTIONS")
-    CAC_MOUNT_OPTIONS = ENV.fetch("CAC_MOUNT_OPTIONS").split
-  else
-    CAC_MOUNT_OPTIONS = ["rw"]
-  end
-end
-
 if ENV['CAC_TRIPPLANNER_MEMORY'].nil?
   # OpenTripPlanner needs > 1GB to build and run
   CAC_MEMORY_MB = "8192"
@@ -88,7 +71,7 @@ VAGRANT_PROXYCONF_ENDPOINT = ENV["VAGRANT_PROXYCONF_ENDPOINT"]
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "bento/ubuntu-16.04"
 
   # Wire up the proxy if:
   #
@@ -132,12 +115,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "app" do |app|
     app.vm.hostname = "app"
     app.vm.network "private_network", ip: "192.168.8.24"
-
-    if testing?
-        app.vm.synced_folder ".", "/opt/app"
-    else
-      app.vm.synced_folder ".", "/opt/app", type: CAC_SHARED_FOLDER_TYPE, mount_options: CAC_MOUNT_OPTIONS
-    end
+    app.vm.synced_folder ".", "/opt/app"
 
     # Web
     app.vm.network "forwarded_port", guest: 443, host: 8024

deployment/ansible/group_vars/all

@@ -11,10 +11,12 @@ postgres_host: "192.168.8.25"
 
 packer_version: "1.0.2"
 
+python_version: "2.7.*"
+
 nodejs_version: 10.16.0
-nodejs_npm_version: 6.9.0
+nodejs_npm_version: 6.10.2
 
-pip_version: 19.1.*
+pip_version: 19.2.*
 virtualenv_version: 16.5.0
 
 otp_router: "default"

deployment/ansible/group_vars/development_template

@@ -26,8 +26,9 @@ default_admin_username: 'admin'
 default_admin_password: 'admin'
 default_admin_email: '[email protected]'
 
-postgresql_version: "9.4"
-postgresql_package_version: "9.4.*.pgdg14.04+1"
+postgresql_version: "9.5"
+postgresql_package_version: "9.5.*"
+postgresql_support_libpq_version: "*"
 
 postgresql_listen_addresses: "*"
 postgresql_hba_mapping:

deployment/ansible/group_vars/test

@@ -5,8 +5,9 @@ production: false
 
 postgis_version: [2, 1, 8]
 
-postgresql_version: "9.4"
-postgresql_package_version: "9.4.*.pgdg14.04+1"
+postgresql_version: "9.5"
+postgresql_package_version: "9.5.*"
+postgresql_support_libpq_version: "*"
 
 postgresql_listen_addresses: "*"
 postgresql_hba_mapping:

deployment/ansible/otp.yml

@@ -7,4 +7,4 @@
       apt: update_cache=yes
 
   roles:
-    - { role: "cac-tripplanner.otp-data"}
+    - {role: "cac-tripplanner.otp-data"}

deployment/ansible/roles.yml

@@ -1,5 +1,5 @@
 - src: azavea.opentripplanner
-  version: 1.2.0
+  version: 2.0.0
 
 - src: azavea.nginx
   version: 0.3.1
@@ -23,7 +23,7 @@
   version: 0.1.0
 
 - src: azavea.postgresql-support
-  version: 0.3.2
+  version: 0.4.0
 
 - src: azavea.postgresql
-  version: 0.5.0
+  version: 1.0.0

deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml

@@ -6,26 +6,9 @@ app_sass_version: "3.4.22"
 
 app_log: "/var/log/cac-tripplanner-app.log"
 
+gunicorn_app_name: "cac-tripplanner-app"
 root_app_dir: "/opt/app/python/cac_tripplanner"
 root_conf_dir: "/etc/cac_tripplanner.d"
 root_src_dir: "/opt/app/src"
 root_static_dir: "/srv/cac"
 root_media_dir: "/media/cac"
-
-cac_python_dependencies:
-    - { name: 'base58', version: '1.0.3' }
-    - { name: 'boto', version: '2.49.0' }
-    - { name: 'django', version: '1.11.21' }
-    - { name: 'django-ckeditor', version: '5.7.1' }
-    - { name: 'django-image-cropping', version: '1.2.0' }
-    - { name: 'django-extensions', version: '1.9.9' }
-    - { name: 'django-storages', version: '1.7.1' }
-    - { name: 'easy-thumbnails', version: '2.6.0' }
-    - { name: 'gunicorn', version: '19.9.0' }
-    - { name: 'Pillow', version: '6.0.0' }
-    - { name: 'psycopg2-binary', version: '2.8.3' }
-    - { name: 'pytz', version: '2019.1' }
-    - { name: 'troposphere', version: '1.8.1' }
-    - { name: 'majorkirby', version: '0.2.1' }
-    # Note: django-wpadmin is installed manually to work around the fact that ansible-pip
-    # ignores editable=False

deployment/ansible/roles/cac-tripplanner.app/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Restart cac-tripplanner-app
-  service: name=cac-tripplanner-app state=restarted
+  service: name=cac-tripplanner-app use=sysv state=restarted
 
 - name: Restart nginx
-  service: name=nginx state=restarted
+  service: name=nginx use=sysv state=restarted

deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml

@@ -2,24 +2,23 @@
 # # Note bzip2 only installed here as workaround for unresolved but closed phantomjs
 # install issue: https://github.com/Medium/phantomjs/issues/659
 - name: Install packages
-  apt: name={{ item }} state=present
-  with_items:
-    - binutils
-    - bzip2
-    - gdal-bin
-    - libpq-dev
-    - libproj-dev
-    - python-dev
-    - libjpeg-dev
+  apt:
+    state: present
+    pkg:
+      - binutils
+      - bzip2
+      - gdal-bin
+      - libpq-dev
+      - libproj-dev
+      - python-dev
+      - python3-pip
+      - libjpeg-dev
 
-- name: Install pip packages
-  pip: name={{ item.name }} version={{ item.version }}
-  with_items: "{{ cac_python_dependencies }}"
+- name: Install pip packages to python3 for deployment
+  pip: requirements={{ root_app_dir }}/deployment_requirements.txt executable=/usr/bin/pip3
 
-  # Putting 'editable: false' in the entry in cac_python_dependencies should make it install
-  # non-editable, but it's getting ignored
-- name: Install django-wpadmin manually to work around ansible bug
-  command: pip install --upgrade 'git+https://github.com/azavea/[email protected]#egg=django-wpadmin'
+- name: Install pip packages
+  pip: requirements={{ root_app_dir }}/requirements.txt
 
 - name: Touch log file and set permissions
   file: path={{ app_log }} state=touch owner={{ app_username }} group={{ app_username }} mode=0664
@@ -41,25 +40,27 @@
 - name: Write secrets file
   template: src=cac_secrets.j2 dest=/etc/cac_secrets
   when: develop or production
-  notify: Restart cac-tripplanner-app
+  notify: Restart {{ gunicorn_app_name }}
 
 - name: Configure Gunicorn settings
   template: src=gunicorn-cac-tripplanner.py.j2 dest={{ root_conf_dir }}/gunicorn.py
-  notify: Restart cac-tripplanner-app
+  notify: Restart {{ gunicorn_app_name }}
 
 - name: Configure service definition
-  template: src=upstart-cac-tripplanner-app.conf.j2 dest=/etc/init/cac-tripplanner-app.conf
-  notify: Restart cac-tripplanner-app
+  template: src=systemd-{{ gunicorn_app_name }}.conf.j2
+            dest=/etc/systemd/system/{{ gunicorn_app_name }}.service
+  notify: Restart {{ gunicorn_app_name }}
 
-- name: Run migrations
-  django_manage: command=migrate
-                 app_path=/opt/app/python/cac_tripplanner
-  notify: Restart cac-tripplanner-app
-  when: develop or test
+- name: Enable gunicorn service
+  systemd:
+    name: "{{ gunicorn_app_name }}.service"
+    enabled: yes
+    daemon_reload: yes
 
-- name: Run collectstatic
-  django_manage: command=collectstatic
-                 app_path=/opt/app/python/cac_tripplanner
+- name: Enable nginx service
+  systemd:
+    name: "nginx.service"
+    enabled: yes
 
 - name: Copy media assets
   copy: src=../../python/cac_tripplanner/default_media
@@ -68,6 +69,16 @@
         group={{ app_username }}
   when: develop or test
 
+- name: Run migrations
+  django_manage: command=migrate
+                 app_path="{{ root_app_dir }}"
+  notify: Restart {{ gunicorn_app_name }}
+  when: develop or test
+
+- name: Run collectstatic
+  django_manage: command=collectstatic
+                 app_path="{{ root_app_dir }}"
+
 - name: Copy nginx config
   template: src=nginx-default.j2 dest=/etc/nginx/sites-available/default
   notify: Restart nginx

deployment/ansible/roles/cac-tripplanner.app/templates/systemd-cac-tripplanner-app.conf.j2

@@ -0,0 +1,23 @@
+[Unit]
+Description = {{ gunicorn_app_name }}
+After = network-online.target
+
+[Service]
+PermissionsStartOnly = true
+User = {{ app_username }}
+Group = {{ app_username }}
+WorkingDirectory = {{ root_app_dir }}
+ExecStart = /usr/bin/env gunicorn --config {{ root_conf_dir }}/gunicorn.py --timeout {{ otp_session_timeout_s }} cac_tripplanner.wsgi
+ExecReload = /bin/kill -s HUP $MAINPID
+ExecStop = /bin/kill -s TERM $MAINPID
+PrivateTmp = true
+StandardOutput = syslog
+StandardError = syslog
+SyslogIdentifier = {{ gunicorn_app_name }}
+
+[Install]
+{% if develop or test -%}
+WantedBy = opt-app.mount
+{% else %}
+WantedBy = network-online.target
+{% endif %}