diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example index 5042b97f53891874e9de056924dbaef1330a124f..21afb054ffcea1ffba14f1f79b0a1701ffc03488 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 21afb054ffcea1ffba14f1f79b0a1701ffc03488..0000000000000000000000000000000000000000 --- 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