From 04bd827498a75d0c8e841880133144423630bcdd Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de> Date: Thu, 13 Sep 2012 18:06:11 +0200 Subject: [PATCH] Remove config file and put contents into config example --- src/main/webapp/config.properties | 19 ------------------- src/main/webapp/config.properties.example | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 src/main/webapp/config.properties diff --git a/src/main/webapp/config.properties b/src/main/webapp/config.properties deleted file mode 100644 index 5042b97f5..000000000 --- a/src/main/webapp/config.properties +++ /dev/null @@ -1,19 +0,0 @@ -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 761946583..5042b97f5 100644 --- a/src/main/webapp/config.properties.example +++ b/src/main/webapp/config.properties.example @@ -1,6 +1,19 @@ -security.arsnova-url=http://localhost:8080/arsnova-war +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 -- GitLab