From 64c779d90491406c603eb45aaa6f90f6b659f688 Mon Sep 17 00:00:00 2001 From: Julian Hochstetter <julian.hochstetter@mni.thm.de> Date: Fri, 14 Sep 2012 07:51:06 +0200 Subject: [PATCH] Revert "Remove config file and put contents into config example" This reverts commit 04bd827498a75d0c8e841880133144423630bcdd. --- src/main/webapp/config.properties | 19 +++++++++++++++++++ src/main/webapp/config.properties.example | 15 +-------------- 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 src/main/webapp/config.properties diff --git a/src/main/webapp/config.properties b/src/main/webapp/config.properties new file mode 100644 index 000000000..5042b97f5 --- /dev/null +++ b/src/main/webapp/config.properties @@ -0,0 +1,19 @@ +security.arsnova-url=http://localhost:8080 +security.cas-server-url=https://cas.thm.de/cas + +security.facebook.key=318531508227494 +security.facebook.secret=e3f38cfc72bb63e35641b637081a6177 + +security.twitter.key=PEVtidSG0HzSrxVRPpsCXw +security.twitter.secret=mC0HOvxiEgqwdDWCcDoy3q75nUQPu1bYRp1ncHWGd0 + +security.google.key=110959746118.apps.googleusercontent.com +security.google.secret=CkzUJZswY8rjWCCYnHVovyGA + +security.ssl=false +security.keystore=/etc/arsnova.thm.de.jks +security.storepass=arsnova + +couchdb.host=localhost +couchdb.port=5984 +couchdb.name=arsnova \ No newline at end of file diff --git a/src/main/webapp/config.properties.example b/src/main/webapp/config.properties.example index 5042b97f5..761946583 100644 --- a/src/main/webapp/config.properties.example +++ b/src/main/webapp/config.properties.example @@ -1,19 +1,6 @@ -security.arsnova-url=http://localhost:8080 +security.arsnova-url=http://localhost:8080/arsnova-war security.cas-server-url=https://cas.thm.de/cas -security.facebook.key=318531508227494 -security.facebook.secret=e3f38cfc72bb63e35641b637081a6177 - -security.twitter.key=PEVtidSG0HzSrxVRPpsCXw -security.twitter.secret=mC0HOvxiEgqwdDWCcDoy3q75nUQPu1bYRp1ncHWGd0 - -security.google.key=110959746118.apps.googleusercontent.com -security.google.secret=CkzUJZswY8rjWCCYnHVovyGA - -security.ssl=false -security.keystore=/etc/arsnova.thm.de.jks -security.storepass=arsnova - couchdb.host=localhost couchdb.port=5984 couchdb.name=arsnova \ No newline at end of file -- GitLab