Skip to content

Commit

Permalink
Merge branch 'release/3.1.51'
Browse files Browse the repository at this point in the history
  • Loading branch information
rachelekm committed Nov 6, 2024
2 parents a55376d + c4ef13c commit 047ef8d
Show file tree
Hide file tree
Showing 10 changed files with 16,453 additions and 43 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Development Installation
3. (Optional) Generate a graph file with (takes approx 3 hours) `docker-compose run --rm otp otp --build /var/otp` in the deployment/graph directory.
4. Copy `deployment/ansible/group_vars/development_template` to `deployment/ansible/group_vars/development`
5. Change into the `src/` folder and run `npm install` to install the node modules on the host machine
6. Run `vagrant up`. You can choose to change the Virtualbox shared folder type for the `app` VM from its default NFS by:
6. Run `vagrant up`. You can choose to change the Virtualbox shared folder type for the `app` VM from its default VirtualBox by:
```
CAC_APP_SHARED_FOLDER_TYPE=virtualbox vagrant up
CAC_APP_SHARED_FOLDER_TYPE=nfs vagrant up
```
7. See the app at http://localhost:8024! See OpenTripPlanner at http://localhost:9090.
8. Running `./scripts/serve-js-dev.sh` on the host will rebuild the front-end app on file change (the browser must be reloaded manually to pick up the change). Alternatively, `cd /opt/app/src && npm run gulp-development` can be run manually in the VM to pick up changes to the static files.
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end

config.vm.define "app" do |app|
CAC_APP_SHARED_FOLDER_TYPE = ENV.fetch("CAC_APP_SHARED_FOLDER_TYPE", "nfs")
CAC_APP_SHARED_FOLDER_TYPE = ENV.fetch("CAC_APP_SHARED_FOLDER_TYPE", "virtualbox")

if CAC_APP_SHARED_FOLDER_TYPE == "nfs"
if Vagrant::Util::Platform.linux? then
Expand Down
6 changes: 3 additions & 3 deletions deployment/ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ postgres_password: "cac_tripplanner"
postgres_host: "192.168.56.25"

postgresql_support_psycopg2_version: "2.9.*"
'postgis_version': [3, 0, 1]
'postgis_version': [3, 5, 0]

packer_version: "1.5.4"

Expand All @@ -29,8 +29,8 @@ papertrail_log_files:
- "/var/log/event-feed.log"
- "/var/log/upstart/otp.log"

postgresql_version: "12"
postgresql_package_version: "12.*.pgdg20.04+1"
postgresql_version: "14"
postgresql_package_version: "14.*.pgdg20.04+1"
postgresql_support_libpq_version: "*"

postgresql_listen_addresses: "*"
Expand Down
3 changes: 0 additions & 3 deletions deployment/ansible/roles.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
- src: azavea.opentripplanner
version: 2.0.1

- src: azavea.nodejs
version: 0.4.0

- src: azavea.packer
version: 0.2.0

Expand Down
1 change: 0 additions & 1 deletion deployment/ansible/roles/cac-tripplanner.app/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
dependencies:
- { role: "azavea.git" }
- { role: "azavea.nodejs" }
- { role: "azavea.packer" }
- { role: "cac-tripplanner.nginx" }
- { role: "cac-tripplanner.papertrail", when: production }
Expand Down
2 changes: 2 additions & 0 deletions deployment/ansible/roles/cac-tripplanner.app/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
- libpq-dev
- libproj-dev
- libjpeg-dev
- nodejs
- npm

- name: Install pip packages for app
pip: requirements={{ root_app_dir }}/requirements.txt executable=/usr/bin/pip3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ server {
proxy_pass http://127.0.0.1:8000;
}

location ^~ /admin/ {
location ^~ /admin/? {
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_redirect off;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
---
# postgresql defaults copied from azavea.postgresql
postgresql_version: "12"
postgresql_package_version: "12.*.*"
postgresql_listen_addresses: localhost
postgresql_port: 5432
postgresql_data_directory: /var/lib/postgresql/{{ postgresql_version }}/main
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
args:
chdir: "/tmp/postgis-{{ postgis_version | join('.') }}"
with_items:
- ./configure
- ./configure --without-protobuf
- make
- make install
- ldconfig
Expand Down
Loading

0 comments on commit 047ef8d

Please sign in to comment.