From 0617f8168917ff6b7fe559bef386a225d0c75721 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 2 Dec 2015 11:53:41 +0000
Subject: [PATCH] remove applySettings hook and allow credentials.json to be
 part of core

---
 .gitignore             | 1 +
 settings.json.template | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 52d60dca7..46773455a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ npm-debug.log
 *.crt
 *.key
 bin/etherpad-1.deb
+credentials.json
diff --git a/settings.json.template b/settings.json.template
index f29bcbc0e..ceb9efb31 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -2,6 +2,9 @@
   This file must be valid JSON. But comments are allowed
 
   Please edit settings.json, not settings.json.template
+
+  To still commit settings without credentials you can 
+  store any credential settings in credentials.json
 */
 {
   // Name your instance!