Commit 812a1bb4 authored by David Haynes's avatar David Haynes 🙆

Merge branch 'master' into 2.1_release

parents 784792b9 c62235fc
Pipeline #637 passed with stage
in 1 minute and 35 seconds
......@@ -93,7 +93,7 @@ Vagrant.configure(2) do |config|
email_domain: "@masonlive.gmu.edu",
requirements_path: "/vagrant/requirements.txt",
venv_path: "/vagrant/venv",
cas_url: "https://nanderson.me/cas/",
cas_url: "https://cas.srct.gmu.edu/",
app_path: "/vagrant/go",
settings_path: "/vagrant/go/settings",
superuser: "dhaynes3"
......@@ -126,7 +126,7 @@ Vagrant.configure(2) do |config|
email_domain: "@masonlive.gmu.edu",
requirements_path: "/vagrant/requirements.txt",
venv_path: "/vagrant/venv",
cas_url: "https://nanderson.me/cas",
cas_url: "https://cas.srct.gmu.edu/",
app_path: "/vagrant/go",
settings_path: "/vagrant/go/settings",
superuser: "dhaynes3"
......
......@@ -14,7 +14,7 @@ services:
- debug=True
- host=*
- email_domain=@masonlive.gmu.edu
- cas_url=https://nanderson.me/cas/
- cas_url=https://cas.srct.gmu.edu/
- superuser=dhaynes3
# - SECRET_KEY=much-secret
- DB_NAME=go
......@@ -34,4 +34,3 @@ services:
MYSQL_DATABASE: go
MYSQL_USER: go
MYSQL_PASSWORD: go
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment