Merge branch 'get_rid_of_PAC' into 'master'

Use example.org in nginx_note.conf_example

See merge request bde/nk20!34
This commit is contained in:
Pierre-antoine Comby 2020-03-07 17:37:14 +01:00
commit 448929b900
2 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@ server {
# the port your site will be served on # the port your site will be served on
listen 80; listen 80;
# the domain name it will serve for # the domain name it will serve for
server_name note.comby.xyz; # substitute your machine's IP address or FQDN server_name note.example.org; # substitute your machine's IP address or FQDN
charset utf-8; charset utf-8;
# max upload size # max upload size

View File

@ -51,4 +51,4 @@ SESSION_COOKIE_AGE = 60 * 60 * 3
# CAS Client settings # CAS Client settings
# Can be modified in secrets.py # Can be modified in secrets.py
CAS_SERVER_URL = "https://note.comby.xyz/cas/" CAS_SERVER_URL = "http://localhost:8000/cas/"