Skip to content
Snippets Groups Projects
Commit 999a1b1a authored by gnaegi's avatar gnaegi
Browse files

non-jira: cleanup

parent 4c56488b
No related branches found
No related tags found
No related merge requests found
...@@ -469,8 +469,8 @@ allow.cross.origin.domain.values=*,www.frentix.com ...@@ -469,8 +469,8 @@ allow.cross.origin.domain.values=*,www.frentix.com
# <string>Database update</string><boolean>true</boolean> # <string>Database update</string><boolean>true</boolean>
auto.upgrade.database=true auto.upgrade.database=true
db.vendor=mysql db.vendor=mysql
db.vendor.values=mysql,postgresql db.vendor.values=mysql,postgresql,oracle
db.vendor.values.comment=supported vendors currently include "mysql" and "postgresql", Hsqldb is used for development db.vendor.values.comment=supported vendors currently include "mysql", "postgresql" and "oracle"
# The local data source works out of the box with the c3p0 database connection pool. However, we stronlgy # The local data source works out of the box with the c3p0 database connection pool. However, we stronlgy
# recommend using a jndi container managed data source for better stability and realibility. The local data source # recommend using a jndi container managed data source for better stability and realibility. The local data source
...@@ -620,12 +620,12 @@ search.indexing.cronjob.expression=0 0 3 * * ? ...@@ -620,12 +620,12 @@ search.indexing.cronjob.expression=0 0 3 * * ?
# REST API # REST API
######################################################################## ########################################################################
#enable/disable the rest api # enable/disable the rest api
restapi.enable=false restapi.enable=false
restapi.enable.values=true,values restapi.enable.values=true,values
#Access to the /restapi/system without authentication if the IP # Access to the /restapi/system without authentication if the IP
# of the client is in the list of IPs separated by comma # of the client is in the list of IPs separated by comma. This is used for monitoring purpos
restapi.ips.system= restapi.ips.system=
restapi.ips.system.values=192.168.1.200,192.168.1.201 restapi.ips.system.values=192.168.1.200,192.168.1.201
...@@ -733,15 +733,15 @@ ldap.dateFormat=yyyyMMddHHmmss'Z' ...@@ -733,15 +733,15 @@ ldap.dateFormat=yyyyMMddHHmmss'Z'
ldap.dateFormat.values=yyyyMMddHHmmss'Z',yyyyMMddHHmmss'.0Z' ldap.dateFormat.values=yyyyMMddHHmmss'Z',yyyyMMddHHmmss'.0Z'
# The LDAP Provider from the Oracle's JDKs (standard and JRockit) allows the use of multiple LDAP servers. # The LDAP Provider from the Oracle's JDKs (standard and JRockit) allows the use of multiple LDAP servers.
# Write the URLs of all the servers with a space as separator and a trailing slash. # Write the URLs of all the servers with a space as separator and a trailing slash.
ldap.ldapUrl=ldap://ldap.olat.org:389 ldap.ldapUrl=ldap://ldap.openolat.org:389
ldap.ldapUrl.values=ldap://ldap1.olat.org:389/ ldap://ldap2.olat.org:389/ ldap://ldap3.olat.org:389/ ldap.ldapUrl.values=ldap://ldap1.openolat.org:389/ ldap://ldap2.openolat.org:389/ ldap://ldap3.openolat.org:389/
# Connection timeout in milliseconds # Connection timeout in milliseconds
ldap.connectionTimeout=15000 ldap.connectionTimeout=15000
# System user: used for getting all users and connection testing # System user: used for getting all users and connection testing
ldap.ldapSystemDN=CN=Frentix,OU=Benutzer,DC=olat,DC=ch ldap.ldapSystemDN=CN=Frentix,OU=Benutzer,DC=openolat,DC=org
ldap.ldapSystemPW=ldap4olat ldap.ldapSystemPW=ldap4olat
# List of bases where to find users. To use multiple bases you must edit the config file manually # List of bases where to find users. To use multiple bases you must edit the config file manually
ldap.ldapBases=OU=Students,DC=olat,DC=ch ldap.ldapBases=OU=Students,DC=openolat,DC=org
# SSL configuration for LDAP # SSL configuration for LDAP
ldap.sslEnabled=false ldap.sslEnabled=false
ldap.trustStoreLocation=/usr/lib/j2sdk1.5-sun/jre/lib/security/cacerts ldap.trustStoreLocation=/usr/lib/j2sdk1.5-sun/jre/lib/security/cacerts
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment