From 40b42f7075e5007d914304c87e8e520489137128 Mon Sep 17 00:00:00 2001
From: Julian Hochstetter <julian.hochstetter@mni.thm.de>
Date: Wed, 19 Sep 2012 20:24:20 +0200
Subject: [PATCH] use right config file and delete the old one

---
 src/test/resources/arsnova.properties.example |  5 ++++-
 src/test/resources/config.properties          | 22 -------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 src/test/resources/config.properties

diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 5042b97f..21afb054 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -16,4 +16,7 @@ security.storepass=arsnova
 
 couchdb.host=localhost
 couchdb.port=5984
-couchdb.name=arsnova
\ No newline at end of file
+couchdb.name=arsnova
+
+# minutes, after which the feedback is deleted
+feedback.cleanup=10
\ No newline at end of file
diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties
deleted file mode 100644
index 21afb054..00000000
--- a/src/test/resources/config.properties
+++ /dev/null
@@ -1,22 +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
-
-# minutes, after which the feedback is deleted
-feedback.cleanup=10
\ No newline at end of file
-- 
GitLab