Permalink
Browse files

configuration changes

  • Loading branch information...
1 parent 41239f2 commit 575ea23989cce7994261e3f03e8df7197fc024dc @lennartkoopmann lennartkoopmann committed Oct 1, 2013
View
@@ -15,7 +15,7 @@ dist
/.settings
.ecltarget
-conf/development.conf
+conf/graylog2-web-interface.conf
.target
.DS_Store
View
@@ -135,6 +135,13 @@ protected void configure() {
@Override
public Configuration onLoadConfig(Configuration configuration, File file, ClassLoader classLoader) {
+ /*
+ *
+ * This is merging the standard bundled application.conf with our graylog2-web-interface.conf.
+ * The application.conf must always be empty when packaged so there is nothing hidden from the user.
+ * We are merging, because the Configuration object alreay contains some information the web-interface needs.
+ *
+ */
return new Configuration(
ConfigFactory.parseFileAnySyntax(new File("conf/graylog2-web-interface.conf"))
.withFallback(configuration.getWrappedConfiguration().underlying())
@@ -38,7 +38,8 @@ public void onSuccess(AuthenticationToken token, AuthenticationInfo info) {
@Override
public void onFailure(AuthenticationToken token, AuthenticationException ae) {
- // TODO keep metric of failed logins. maybe log to some graylog instance
+ final Http.Session session = Http.Context.current().session();
+ session.remove("sessionid");
}
@Override
@@ -1,8 +1,9 @@
-# graylog2-server REST URIs (one or more, comma separated)
-graylog2-server.uris="http://127.0.0.1:12900/,http://127.0.0.1:12910/"
+# graylog2-server REST URIs (one or more, comma separated) For example: "http://127.0.0.1:12900/,http://127.0.0.1:12910/"
+graylog2-server.uris=""
# Secret key
# ~~~~~
# The secret key is used to secure cryptographics functions. Set this to a long and randomly generated string.
# If you deploy your application to several instances be sure to use the same key!
-application.secret=""
+# Generate for example with: pwgen -s 96
+application.secret=""

0 comments on commit 575ea23

Please sign in to comment.