From d1dc0237d314a8a443037c2f007795ab8d737e5b Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Fri, 29 Jun 2012 16:28:05 +0200
Subject: [PATCH] Remove settings.json.template_windows

Use settings.json.template
---
 bin/buildForWindows.sh         |  2 +-
 bin/installOnWindows.bat       |  2 +-
 settings.json.template_windows | 48 ----------------------------------
 3 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 settings.json.template_windows

diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
index 6e46e29a1..99f9bb08a 100755
--- a/bin/buildForWindows.sh
+++ b/bin/buildForWindows.sh
@@ -41,7 +41,7 @@ echo "do a normal unix install first..."
 bin/installDeps.sh || exit 1
 
 echo "copy the windows settings template..."
-cp settings.json.template_windows settings.json
+cp settings.json.template settings.json
 
 echo "resolve symbolic links..."
 cp -rL node_modules node_modules_resolved
diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
index 0e3e20996..f015a5440 100644
--- a/bin/installOnWindows.bat
+++ b/bin/installOnWindows.bat
@@ -32,7 +32,7 @@ del /S var\minified*
 
 echo _
 echo Setting up settings.json...
-IF NOT EXIST settings.json copy settings.json.template_windows settings.json
+IF NOT EXIST settings.json copy settings.json.template settings.json
 
 echo _
 echo Installed Etherpad-lite!
\ No newline at end of file
diff --git a/settings.json.template_windows b/settings.json.template_windows
deleted file mode 100644
index 35b54d8da..000000000
--- a/settings.json.template_windows
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-  This file must be valid JSON. But comments are allowed
-
-  Please edit settings.json, not settings.json.template
-*/
-{
-  //Ip and port which etherpad should bind at
-  "ip": "0.0.0.0",
-  "port" : 9001,
-  
-  //The Type of the database. You can choose between sqlite and mysql
-  "dbType" : "dirty",
-  //the database specific settings
-  "dbSettings" : {
-                   "filename" : "var/dirty.db"
-                 },
-                 
-  /* An Example of MySQL Configuration
-   "dbType" : "mysql",
-   "dbSettings" : {
-                    "user"    : "root", 
-                    "host"    : "localhost", 
-                    "password": "", 
-                    "database": "store"
-                  },
-  */
-  
-  //the default text of a pad
-  "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
-  
-  /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
-  "requireSession" : false,
-
-  /* Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. */
-  "editOnly" : false,
-  
-  /* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly, 
-     but makes it impossible to debug the javascript/css */
-  "minify" : false,
-  
-  /* This is the path to the Abiword executable. Setting it to null, disables abiword.
-     Abiword is needed to enable the import/export of pads*/  
-  "abiword" : null,
-
-  /* cache 6 hours = 1000*60*60*6 */
-  "maxAge": 21600000
-
-}