Skip to content

Commit e07e6bf

Browse files
authored
Merge pull request #516 from ucb-rit/develop
Upgrade PostgreSQL; fix bugs
2 parents 4c6d3df + 27dea9b commit e07e6bf

File tree

30 files changed

+610
-203
lines changed

30 files changed

+610
-203
lines changed

.github/workflows/django_testing_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
services:
2121
postgres: # Set up a database container with the following specifications
22-
image: postgres:9.6.24-alpine3.15
22+
image: postgres:15.2-alpine3.17
2323
env:
2424
POSTGRES_DB: cf_brc_db
2525
POSTGRES_PASSWORD: test

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@ which can be done with:
118118
119119
- Any custom Django settings can be applied by modifying `dev_settings.py`.
120120
Note that running the Ansible playbook will overwrite these.
121-
- It may be convenient to add the following to `/home/vagrant/.bashrc`:
122-
```
123-
# Upon login, navigate to the ColdFront directory and source the virtual environment.
124-
cd /vagrant/coldfront_app/coldfront
125-
source /vagrant/coldfront_app/venv/bin/activate
126-
# Restart Apache with a keyword.
127-
alias reload="sudo service httpd restart"
128-
```
129121
130122
#### Emails
131123

Vagrantfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Vagrant.configure("2") do |config|
1414
config.vm.provision "ansible_local" do |ansible|
1515
ansible.playbook = "coldfront_app/coldfront/bootstrap/ansible/playbook.yml"
1616
ansible.galaxy_role_file = "coldfront_app/coldfront/bootstrap/ansible/requirements.yml"
17-
ansible.galaxy_roles_path = "/home/vagrant/.ansible"
17+
ansible.galaxy_roles_path = "/home/vagrant/.ansible/roles"
1818
# https://github.com/hashicorp/vagrant/issues/10958#issuecomment-724431455
19-
ansible.galaxy_command = "ansible-galaxy collection install --requirements-file %{role_file} --collections-path %{roles_path}/collections --force && ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force"
19+
ansible.galaxy_command = "ansible-galaxy collection install --requirements-file %{role_file} --collections-path /home/vagrant/.ansible/collections --force && ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force"
2020
end
2121

2222
config.vm.network :forwarded_port, host: 8880, guest: 80

0 commit comments

Comments
 (0)