Skip to content

Commit

Permalink
Merge pull request #87 from SBU-BMI/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ebremer authored Aug 30, 2021
2 parents e71ad89 + 904ab20 commit e109353
Show file tree
Hide file tree
Showing 15 changed files with 148 additions and 18 deletions.
3 changes: 3 additions & 0 deletions config/authorization.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
authorization_message: false
_core:
default_config_hash: 0LVjTKjBHu6HtfMSyDhY1YvcW4QpX-UzW7-387jblBk
7 changes: 7 additions & 0 deletions config/core.extension.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module:
action: 0
authorization: 0
auto_entitylabel: 0
automated_cron: 0
ban: 0
Expand Down Expand Up @@ -41,6 +42,11 @@ module:
key: 0
layout_builder: 0
layout_discovery: 0
ldap_authentication: 0
ldap_authorization: 0
ldap_query: 0
ldap_servers: 0
ldap_user: 0
link: 0
menu_ui: 0
moderated_content_bulk_publish: 0
Expand Down Expand Up @@ -81,6 +87,7 @@ module:
views_ui: 0
workflows: 0
menu_link_content: 1
externalauth: 10
views: 10
tac_lite: 100
standard: 1000
Expand Down
2 changes: 1 addition & 1 deletion config/field.storage.node.imageid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ field_name: imageid
entity_type: node
type: string
settings:
max_length: 16
max_length: 64
is_ascii: false
case_sensitive: false
module: core
Expand Down
23 changes: 23 additions & 0 deletions config/ldap_authentication.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
sids: { }
authenticationMode: mixed
loginUIUsernameTxt: ''
loginUIPasswordTxt: ''
ldapUserHelpLinkUrl: ''
ldapUserHelpLinkText: ''
emailOption: disable
emailUpdate: update_notify
emailTemplateHandling: none
emailTemplate: '@[email protected]'
emailTemplateUsageResolveConflict: false
emailTemplateUsageNeverUpdate: false
emailTemplateUsagePromptUser: false
emailTemplateUsageRedirectOnLogin: false
emailTemplateUsagePromptRegex: '.*@example\\.com'
passwordOption: hide
allowOnlyIfTextInDn: { }
excludeIfTextInDn: { }
excludeIfNoAuthorizations: null
skipAdministrators: true
langcode: en
_core:
default_config_hash: 9DgabkLztscclWQDjei_mAOpxP6xdbp_Iu5L5z6Nsbg
38 changes: 38 additions & 0 deletions config/ldap_servers.server.tciabeta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
uuid: 34472877-3614-4c14-9a6e-f88f1e445bd9
langcode: en
status: true
dependencies: { }
id: tciabeta
label: TCIABETA
type: default
account_name_attr: cn
address: 144.30.1.70
basedn:
- ''
bind_method: service_account
binddn: 'cn=reader,ou=users,dc=cancerimagingarchive,dc=net'
bindpw: Just4TCIA2021!
encryption: none
grp_derive_from_dn_attr: ''
grp_derive_from_dn: false
grp_memb_attr_match_user_attr: dn
grp_memb_attr: uniquemember
grp_nested: true
grp_object_cat: groupofuniquenames
grp_test_grp_dn_writeable: ''
grp_test_grp_dn: 'cn=cip-staff,ou=groups,dc=cancerimagingarchive,dc=net'
grp_unused: false
grp_user_memb_attr_exists: false
grp_user_memb_attr: ''
mail_attr: mail
mail_template: ''
picture_attr: ''
port: 1389
testing_drupal_user_dn: ''
testing_drupal_username: ebremer
timeout: 10
unique_persistent_attr_binary: false
unique_persistent_attr: dn
user_attr: cn
user_dn_expression: 'cn=%username,ou=users,dc=cancerimagingarchive,dc=net'
weight: null
3 changes: 3 additions & 0 deletions config/ldap_servers.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
watchdog_detail: false
_core:
default_config_hash: DgA06EZeCFji0LQ9WiDc1Dv-jeNGx8sxhaISyZcThHY
19 changes: 19 additions & 0 deletions config/ldap_user.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
drupalAcctProvisionServer: tciabeta
ldapEntryProvisionServer: null
drupalAcctProvisionTriggers:
- drupal_on_login
ldapEntryProvisionTriggers: { }
userUpdateCronQuery: none
userUpdateCronInterval: daily
orphanedDrupalAcctBehavior: ldap_user_orphan_email
orphanedDrupalAcctReportingInbox: ''
orphanedCheckQty: 100
orphanedAccountCheckInterval: weekly
userConflictResolve: resolve
manualAccountConflict: conflict_reject
acctCreation: ldap_behaviour
ldapUserSyncMappings:
drupal: { }
_core:
default_config_hash: xGaDFlyXTmhzluhiRhEx58v_3Fu-nMhCzEBF8K4eqHU
disableAdminPasswordField: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
uuid: a3ec7b14-64dd-472b-88a2-ff94f09e9ec2
langcode: en
status: true
dependencies:
module:
- bulk_update_fields
id: bulk_update_fields_on_authorization_profile
label: 'Bulk Update Authorization profile Fields'
type: authorization_profile
plugin: bulk_update_fields_action_base
configuration: { }
11 changes: 11 additions & 0 deletions config/system.action.bulk_update_fields_on_ldap_query_entity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
uuid: d9749188-1959-416c-89e7-02e03d0a78d9
langcode: en
status: true
dependencies:
module:
- bulk_update_fields
id: bulk_update_fields_on_ldap_query_entity
label: 'Bulk Update LDAP Queries Fields'
type: ldap_query_entity
plugin: bulk_update_fields_action_base
configuration: { }
11 changes: 11 additions & 0 deletions config/system.action.bulk_update_fields_on_ldap_server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
uuid: cc9ff1de-e298-4221-a14f-0c6a61205e69
langcode: en
status: true
dependencies:
module:
- bulk_update_fields
id: bulk_update_fields_on_ldap_server
label: 'Bulk Update LDAP Server Fields'
type: ldap_server
plugin: bulk_update_fields_action_base
configuration: { }
Binary file modified mysql.tgz
Binary file not shown.
12 changes: 6 additions & 6 deletions quip/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions quip/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -9466,23 +9466,23 @@
},
{
"name": "seld/phar-utils",
"version": "1.1.1",
"version_normalized": "1.1.1.0",
"version": "1.1.2",
"version_normalized": "1.1.2.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/phar-utils.git",
"reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
"reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
"reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
"url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
"reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
"shasum": ""
},
"require": {
"php": ">=5.3"
},
"time": "2020-07-07T18:42:57+00:00",
"time": "2021-08-19T21:01:38+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand All @@ -9509,6 +9509,10 @@
"keywords": [
"phar"
],
"support": {
"issues": "https://github.com/Seldaek/phar-utils/issues",
"source": "https://github.com/Seldaek/phar-utils/tree/1.1.2"
},
"install-path": "../seld/phar-utils"
},
{
Expand Down
6 changes: 3 additions & 3 deletions quip/vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -2002,12 +2002,12 @@
'dev_requirement' => true,
),
'seld/phar-utils' => array(
'pretty_version' => '1.1.1',
'version' => '1.1.1.0',
'pretty_version' => '1.1.2',
'version' => '1.1.2.0',
'type' => 'library',
'install_path' => __DIR__ . '/../seld/phar-utils',
'aliases' => array(),
'reference' => '8674b1d84ffb47cc59a101f5d5a3b61e87d23796',
'reference' => '749042a2315705d2dfbbc59234dd9ceb22bf3ff0',
'dev_requirement' => true,
),
'shama/baton' => array(
Expand Down
4 changes: 2 additions & 2 deletions quip/vendor/seld/phar-utils/src/Timestamps.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public function __construct($file)
*
* The PHAR signature can then be produced in a reproducible manner.
*
* @param int|DateTime|string $timestamp Date string or DateTime or unix timestamp to use
* @param int|\DateTimeInterface|string $timestamp Date string or DateTime or unix timestamp to use
*/
public function updateTimestamps($timestamp = null)
{
if ($timestamp instanceof \DateTime) {
if ($timestamp instanceof \DateTime || $timestamp instanceof \DateTimeInterface) {
$timestamp = $timestamp->getTimestamp();
} elseif (is_string($timestamp)) {
$timestamp = strtotime($timestamp);
Expand Down

0 comments on commit e109353

Please sign in to comment.