Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' into 3.9-SNAPSHOT-stable
# Conflicts: # build.sh # common.bash
Showing
45 changed files
with
3,207 additions
and
2,815 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
demo/complex/grouper_data/container_files/conf/grouper-loader.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| ################################# | ||
| ## LDAP connections | ||
| ################################# | ||
| # specify the ldap connection with user, pass, url | ||
| # the string after "ldap." is the ID of the connection, and it should not have | ||
| # spaces or other special chars in it. In this case is it "personLdap" | ||
|
|
||
| #note the URL should start with ldap: or ldaps: if it is SSL. | ||
| #It should contain the server and port (optional if not default), and baseDn, | ||
| #e.g. ldaps://ldapserver.school.edu:636/dc=school,dc=edu | ||
| ldap.demo.url = ldap://directory:389/dc=internet2,dc=edu | ||
|
|
||
| #optional, if authenticated | ||
| ldap.demo.user = cn=admin,dc=internet2,dc=edu | ||
| #ldap.demo.user = cn=admin | ||
|
|
||
| #optional, if authenticated note the password can be stored encrypted in an external file | ||
| #ldap.demo.pass = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')} | ||
| ldap.demo.pass = password | ||
|
|
||
| #optional, if you are using tls, set this to true. Generally you will not be using an SSL URL to use TLS... | ||
| ldap.demo.tls = false | ||
|
|
||
| #optional, if using sasl | ||
| #ldap.personLdap.saslAuthorizationId = | ||
| #ldap.personLdap.saslRealm = | ||
|
|
||
| #optional (note, time limit is for search operations, timeout is for connection timeouts), | ||
| #most of these default to vt-ldap defaults. times are in millis | ||
| #validateOnCheckout defaults to true if all other validate methods are false | ||
| #ldap.personLdap.batchSize = | ||
| #ldap.personLdap.countLimit = | ||
| #ldap.personLdap.timeLimit = | ||
| #ldap.personLdap.timeout = | ||
| #ldap.personLdap.minPoolSize = | ||
| #ldap.personLdap.maxPoolSize = | ||
| #ldap.personLdap.validateOnCheckIn = | ||
| #ldap.personLdap.validateOnCheckOut = | ||
| #ldap.personLdap.validatePeriodically = | ||
| #ldap.personLdap.validateTimerPeriod = | ||
| #ldap.personLdap.pruneTimerPeriod = | ||
| #if connections expire after a certain amount of time, this is it, in millis, defaults to 300000 (5 minutes) | ||
| #ldap.personLdap.expirationTime = | ||
|
|
||
| #make the paths fully qualified and not relative to the loader group. | ||
| loader.ldap.requireTopStemAsStemFromConfigGroup=false | ||
|
|
||
| ##################################### | ||
| ## Messaging integration with change log | ||
| ##################################### | ||
| changeLog.consumer.rabbitMqMessagingSample.quartzCron = 0 * * * * ? | ||
|
|
||
| # note, change "messagingSample" in key to be the name of the consumer. e.g. changeLog.consumer.someNameAnyName.class | ||
| changeLog.consumer.rabbitMqMessagingSample.class = edu.internet2.middleware.grouper.changeLog.esb.consumer.EsbConsumer | ||
|
|
||
| changeLog.consumer.rabbitMqMessagingSample.publisher.class = edu.internet2.middleware.grouper.changeLog.esb.consumer.EsbMessagingPublisher | ||
| changeLog.consumer.rabbitMqMessagingSample.publisher.messagingSystemName = rabbitmq | ||
| # note, routingKey property is valid only for rabbitmq. For other messaging systems, it is ignored. | ||
| changeLog.consumer.rabbitMqMessagingSample.publisher.routingKey = | ||
| ## queue or topic | ||
| changeLog.consumer.rabbitMqMessagingSample.publisher.messageQueueType = queue | ||
| changeLog.consumer.rabbitMqMessagingSample.publisher.queueOrTopicName = sampleQueue | ||
| ## this is optional if not using "id" for subjectId, need to be a subject attribute in the sources.xml | ||
| #changeLog.consumer.rabbitMqMessagingSample.publisher.addSubjectAttributes = email |
Oops, something went wrong.