From 3c1c9deb9a5adcb2d79ca4ae6039d65e83429cb0 Mon Sep 17 00:00:00 2001 From: JPHammonds <JPHammonds@anl.gov> Date: Tue, 20 Aug 2019 12:40:41 -0500 Subject: [PATCH] Switch setup of ldapLinuxPlatformUtility to use environment variales that are swapped out during deployment. These are changed by defining environment variables in dm.deploy.conf or in dm_dev.deploy.conf. NOTE: When working with a standalone developer instance you can replace the ldapLinuxPlatformUtility with NoopPlatformUtility once it is deployed. --- etc/ds-web-service.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ds-web-service.conf.template b/etc/ds-web-service.conf.template index da1d2246..74a09b4d 100644 --- a/etc/ds-web-service.conf.template +++ b/etc/ds-web-service.conf.template @@ -18,7 +18,7 @@ recycleDirectory=DM_STORAGE_DIR/recycle storageId=extrepid manageStoragePermissions=True #platformUtility=dm.common.utility.linuxUtility.LinuxUtility() -platformUtility=dm.common.utility.ldapLinuxPlatformUtility.LdapLinuxPlatformUtility(LDAP_SERVER_URL, 'LDAP_UTIL_ADMIN_DN', 'LDAP_UTIL_ADMIN_PASSWD_FILE', groupDnFormat='LDAP_UTIL_GROUP_DN_FORMAT', minGidNumber=LDAP_UTIL_MIN_GID_NUMBER) +platformUtility=dm.common.utility.ldapLinuxPlatformUtility.LdapLinuxPlatformUtility('LDAP_SERVER_URL', 'LDAP_UTIL_ADMIN_DN', 'LDAP_UTIL_ADMIN_PASSWD_FILE', groupDnFormat='LDAP_UTIL_GROUP_DN_FORMAT', minGidNumber=LDAP_UTIL_MIN_GID_NUMBER) [LdapLinuxPlatformUtility] refreshAuthFilesCommand= -- GitLab