aboutsummaryrefslogtreecommitdiff
path: root/id/server/data/deploy
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-08-19 15:23:07 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-08-19 15:23:07 +0200
commit9331771b24160e0ee04324576d9f35caf6ac4d79 (patch)
tree45adefb70891e266849c65626ccbdee6927be6e0 /id/server/data/deploy
parenta3e490800378eaaa4d9189bc1d1d606caa8fb41d (diff)
downloadmoa-id-spss-9331771b24160e0ee04324576d9f35caf6ac4d79.tar.gz
moa-id-spss-9331771b24160e0ee04324576d9f35caf6ac4d79.tar.bz2
moa-id-spss-9331771b24160e0ee04324576d9f35caf6ac4d79.zip
Update handbook, demo-configuration and history.txt
Diffstat (limited to 'id/server/data/deploy')
-rw-r--r--id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties2
-rw-r--r--id/server/data/deploy/conf/moa-id/moa-id.properties1
2 files changed, 3 insertions, 0 deletions
diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index db158ed23..7c71fadcb 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -13,6 +13,8 @@ general.defaultlanguage=de
general.ssl.certstore=certs/certstore
general.ssl.truststore=certs/truststore
+general.moaconfig.key=ConfigurationEncryptionKey
+
##Mail
general.mail.host=smtp.localhost...
#general.mail.host.port=
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index e8a75c348..4290b1985 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -17,6 +17,7 @@ protocols.pvp2.assertion.encryption.active=false
##General MOA-ID 2.0 operations
#MOA-ID 2.0 session information encryption key (PassPhrase)
configuration.moasession.key=SessionEncryptionKey
+configuration.moaconfig.key=ConfigurationEncryptionKey
#MOA-ID 2.0 Monitoring Servlet
configuration.monitoring.active=false