Skip to content

Commit

Permalink
Merge b81c3dd into 530ca91
Browse files Browse the repository at this point in the history
  • Loading branch information
Iulia Chiriac committed Apr 20, 2017
2 parents 530ca91 + b81c3dd commit 6771048
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
14 changes: 8 additions & 6 deletions gemet/local_settings.py.docker
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ DATABASES = {
# sql_mode is set for DATABASES to stop a MySQL Strict Mode warning(mysql.W002)

# Use the line below in order to run django in a subpath (http://example.com/gemet)
# FORCE_SCRIPT_NAME = '/gemet'
if 'FORCE_SCRIPT_NAME' in os.environ:
FORCE_SCRIPT_NAME = os.environ['FORCE_SCRIPT_NAME']

# TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

Expand All @@ -60,14 +61,15 @@ DATABASES = {
# ]
#
# Fill in the gemet.rdf.gz file path in order to serve it at http://example.com/gemet/gemet.rdf.gz
# GEMET_RDFGZ_PATH = '/path/to/gemet.rdf.gz'
if 'GEMET_RDFGZ_PATH' in os.environ:
GEMET_RDFGZ_PATH = os.environ['GEMET_RDFGZ_PATH']

ZOPE_URL = 'http://www.eionet.europa.eu'
GEMET_URL = ZOPE_URL + '/gemet'
ZOPE_URL = os.environ.get('ZOPE_URL', 'http://www.eionet.europa.eu')
GEMET_URL = ZOPE_URL + os.environ.get('GEMET_URL', '/gemet')

# Fill in the following settings to enable LDAP authentication
AUTH_LDAP_SERVER_URI = "ldap://ldap3.eionet.europa.eu"
AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=Users,o=EIONET,l=Europe"
AUTH_LDAP_SERVER_URI = os.environ.get('AUTH_LDAP_SERVER_URI', 'ldap://ldap3.eionet.europa.eu')
AUTH_LDAP_USER_DN_TEMPLATE = os.environ.get('AUTH_LDAP_USER_DN_TEMPLATE', 'uid=%(user)s,ou=Users,o=EIONET,l=Europe')
AUTH_LDAP_START_TLS = True
AUTH_LDAP_USER_ATTR_MAP = {
"first_name": "givenName",
Expand Down
13 changes: 13 additions & 0 deletions settings.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ZOPE_URL=http://www.eionet.europa.eu

GEMET_URL=/gemet

# FORCE_SCRIPT_NAME=/gemet

# Fill in the gemet.rdf.gz file path in order to serve it at http://example.com/gemet/gemet.rdf.gz
# GEMET_RDFGZ_PATH=/path/to/gemet.rdf.gz


# Fill in the following settings to enable LDAP authentication
AUTH_LDAP_SERVER_URI=ldap://ldap3.eionet.europa.eu
AUTH_LDAP_USER_DN_TEMPLATE=uid=%(user)s,ou=Users,o=EIONET,l=Europe

0 comments on commit 6771048

Please sign in to comment.