From ef9a7040e8e920ae1968021d6242982008c4f0bf Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sun, 24 Dec 2017 15:12:18 -0500
Subject: [PATCH] if config file doesn't exist, create it from config sample

---
 config-sample.ini     |  2 +-
 services/config.js    | 13 ++++++++++++-
 services/migration.js |  1 -
 views/setup.ejs       |  3 +++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config-sample.ini b/config-sample.ini
index c706efea0..b5b8e798d 100644
--- a/config-sample.ini
+++ b/config-sample.ini
@@ -1,5 +1,5 @@
 [Network]
-port=80
+port=8080
 # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 https=false
 # path to certificate (run "bash generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
diff --git a/services/config.js b/services/config.js
index fc3fd3649..d7d04c5eb 100644
--- a/services/config.js
+++ b/services/config.js
@@ -3,7 +3,18 @@
 const ini = require('ini');
 const fs = require('fs');
 const dataDir = require('./data_dir');
+const path = require('path');
 
-const config = ini.parse(fs.readFileSync(dataDir.TRILIUM_DATA_DIR + '/config.ini', 'utf-8'));
+const configSampleFilePath = path.resolve(__dirname, "..", "config-sample.ini");
+
+const configFilePath = dataDir.TRILIUM_DATA_DIR + '/config.ini';
+
+if (!fs.existsSync(configFilePath)) {
+    const configSample = fs.readFileSync(configSampleFilePath).toString('utf8');
+
+    fs.writeFileSync(configFilePath, configSample);
+}
+
+const config = ini.parse(fs.readFileSync(configFilePath, 'utf-8'));
 
 module.exports = config;
\ No newline at end of file
diff --git a/services/migration.js b/services/migration.js
index 3bd9192c4..ea60769e6 100644
--- a/services/migration.js
+++ b/services/migration.js
@@ -3,7 +3,6 @@ const sql = require('./sql');
 const options = require('./options');
 const fs = require('fs-extra');
 const log = require('./log');
-const app_info = require('./app_info');
 const path = require('path');
 
 const MIGRATIONS_DIR = path.resolve(__dirname, "..", "migrations");
diff --git a/views/setup.ejs b/views/setup.ejs
index 06e3e51a6..416a9fd00 100644
--- a/views/setup.ejs
+++ b/views/setup.ejs
@@ -11,6 +11,9 @@
     <div class="alert alert-warning" id="alert" style="display: none;">
     </div>
 
+    <p>You're almost done with the setup. That last thing is to choose username and password using which you'll login to the application.
+    This password is also used for generating encryption key which encrypts protected notes.</p>
+
     <form id="setup-form">
         <div class="form-group">
             <label for="username">Username</label>