From e4e363ecb00196bc20cca6bcfcb9ba789425d2e5 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 12 Apr 2017 17:31:55 +0000
Subject: [PATCH] adding proc service config template
---
etc/proc-web-service.conf.template | 41 ++++++++++++++++++++++++++++++
src/python/dm/__init__.py | 2 +-
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 etc/proc-web-service.conf.template
diff --git a/etc/proc-web-service.conf.template b/etc/proc-web-service.conf.template
new file mode 100644
index 00000000..6ef96825
--- /dev/null
+++ b/etc/proc-web-service.conf.template
@@ -0,0 +1,41 @@
+[WebService]
+serviceHost=0.0.0.0
+servicePort=55536
+sslCertFile=DM_INSTALL_DIR/etc/ssl/cat-web-service.crt
+sslKeyFile=DM_INSTALL_DIR/etc/ssl/cat-web-service.key
+sslCaCertFile=DM_INSTALL_DIR/etc/ssl/cacert.pem
+stationName=DM_STATION_NAME
+
+[AuthorizationPrincipalManager]
+principalRetriever=dm.ds_web_service.service.auth.dsAuthPrincipalRetriever.DsAuthPrincipalRetriever()
+#principalRetriever=DbPrincipalRetriever()
+#principalRetriever=NoOpPrincipalRetriever()
+principalAuthenticator1=CryptedPasswordPrincipalAuthenticator()
+principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://phoebusldap.aps.anl.gov:636', dnFormat='uid=%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov')
+
+[MongoDbManager]
+mongoDbName=dm
+mongoDbUri=mongodb://localhost:27017
+mongoDbUser=dm
+mongoDbPasswordFile=DM_INSTALL_DIR/etc/dm.db.passwd
+
+[DsRestApiFactory]
+username=DM_SYSTEM_USER
+passwordFile=DM_INSTALL_DIR/etc/DM_SYSTEM_USER.system.passwd
+host=DM_DS_WEB_SERVICE_HOST
+port=DM_DS_WEB_SERVICE_PORT
+protocol=DM_WEB_SERVICE_PROTOCOL
+
+# Available logger levels: debug, info, warn, error, critical
+[ConsoleLogging]
+handler=ConsoleLoggingHandler(sys.stdout,)
+level=debug
+format=%(asctime)s,%(msecs)003d %(levelname)s %(filename)s:%(lineno)d %(process)d: %(message)s
+dateFormat=%Y/%m/%d %H:%M:%S
+
+[FileLogging]
+handler=TimedRotatingFileLoggingHandler('DM_INSTALL_DIR/var/log/proc-web-service.log')
+level=debug
+format=%(asctime)s,%(msecs)003d %(levelname)s %(filename)s:%(lineno)d %(process)d: %(message)s
+dateFormat=%Y/%m/%d %H:%M:%S
+
diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py
index f4bbd36e..17a60e3c 100644
--- a/src/python/dm/__init__.py
+++ b/src/python/dm/__init__.py
@@ -1 +1 @@
-__version__ = "1.1 (2017.03.22)"
+__version__ = "1.1 (2017.04.12)"
--
GitLab