Skip to content

Commit

Permalink
Merge pull request #516 from ucb-rit/develop
Browse files Browse the repository at this point in the history
Upgrade PostgreSQL; fix bugs
  • Loading branch information
matthew-li authored Apr 4, 2023
2 parents 4c6d3df + 27dea9b commit e07e6bf
Show file tree
Hide file tree
Showing 30 changed files with 610 additions and 203 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/django_testing_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

services:
postgres: # Set up a database container with the following specifications
image: postgres:9.6.24-alpine3.15
image: postgres:15.2-alpine3.17
env:
POSTGRES_DB: cf_brc_db
POSTGRES_PASSWORD: test
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,6 @@ which can be done with:
- Any custom Django settings can be applied by modifying `dev_settings.py`.
Note that running the Ansible playbook will overwrite these.
- It may be convenient to add the following to `/home/vagrant/.bashrc`:
```
# Upon login, navigate to the ColdFront directory and source the virtual environment.
cd /vagrant/coldfront_app/coldfront
source /vagrant/coldfront_app/venv/bin/activate
# Restart Apache with a keyword.
alias reload="sudo service httpd restart"
```
#### Emails
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Vagrant.configure("2") do |config|
config.vm.provision "ansible_local" do |ansible|
ansible.playbook = "coldfront_app/coldfront/bootstrap/ansible/playbook.yml"
ansible.galaxy_role_file = "coldfront_app/coldfront/bootstrap/ansible/requirements.yml"
ansible.galaxy_roles_path = "/home/vagrant/.ansible"
ansible.galaxy_roles_path = "/home/vagrant/.ansible/roles"
# https://github.com/hashicorp/vagrant/issues/10958#issuecomment-724431455
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"
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"
end

config.vm.network :forwarded_port, host: 8880, guest: 80
Expand Down
Loading

0 comments on commit e07e6bf

Please sign in to comment.