diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template index 7df7b387597b94db1657abe29f2f454464ff9453..7bf3c3abf7daa3c0a2e62baed317d178fd2640a6 100644 --- a/etc/daq-web-service.conf.template +++ b/etc/daq-web-service.conf.template @@ -28,8 +28,9 @@ numberOfProcessingThreads=3 defaultNumberOfRetries=3 defaultRetryWaitPeriodInSeconds=60 fileProcessor1=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin() -fileProcessor2=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin(dest=\ffdfdsf') #fileProcessor1=dm.common.processing.plugins.gridftpFileTransferPlugin.GridftpFileTransferPlugin() +#fileProcessor2=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin(dest=\ffdfdsf') +#fileProcessor2=dm.common.processing.plugins.mongoDbFileCatalogPlugin.MongoDbFileCatalogPlugin() fileProcessor2=dm.daq_web_service.service.impl.dsProcessFileNotificationPlugin.DsProcessFileNotificationPlugin() [DsRestApiFactory] diff --git a/etc/ds-web-service.conf.template b/etc/ds-web-service.conf.template index 91ec602b2682df8a45bbd5bf0a14c9fbfe92179f..5b8978723e5984bfb840b3437002533a7a1ba30e 100644 --- a/etc/ds-web-service.conf.template +++ b/etc/ds-web-service.conf.template @@ -13,6 +13,7 @@ principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://dm [ExperimentManager] storageDirectory=DM_STORAGE_DIR +storageId=xstor manageStoragePermissions=True #platformUtility=dm.common.utility.linuxUtility.LinuxUtility() platformUtility=dm.common.utility.ldapLinuxPlatformUtility.LdapLinuxPlatformUtility('ldaps://dmid-vm.xray.aps.anl.gov:636', 'uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', 'DM_INSTALL_DIR/etc/DM_SYSTEM_UNIX_ACCOUNT.ldap.passwd', groupDnFormat='cn=%s,ou=DM,ou=Group,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', minGidNumber=66000) @@ -32,10 +33,10 @@ mongoDbPasswordFile=DM_INSTALL_DIR/etc/DM_DB_NAME.db.passwd numberOfProcessingThreads=3 defaultNumberOfRetries=3 defaultRetryWaitPeriodInSeconds=60 -#fileProcessor1=dm.ds_web_service.service.impl.mongoDbFileCatalogPlugin.MongoDbFileCatalogPlugin() -#fileProcessor2=dm.ds_web_service.service.impl.sddsParameterProcessingPlugin.SddsParameterProcessingPlugin() -#fileProcessor3=dm.ds_web_service.service.impl.scriptProcessingPlugin.ScriptProcessingPlugin() -#fileProcessor4=dm.ds_web_service.service.impl.sgeJobSubmissionPlugin.SgeJobSubmissionPlugin('/opt/sge') +#fileProcessor1=dm.common.processing.plugins.mongoDbFileCatalogPlugin.MongoDbFileCatalogPlugin() +#fileProcessor2=dm.common.processing.plugins.sddsParameterProcessingPlugin.SddsParameterProcessingPlugin() +#fileProcessor3=dm.common.processing.plugins.scriptProcessingPlugin.ScriptProcessingPlugin() +#fileProcessor4=dm.common.processing.plugins.sgeJobSubmissionPlugin.SgeJobSubmissionPlugin('/opt/sge') # Available logger levels: debug, info, warn, error, critical [ConsoleLogging]