Add --config-path parameter (for default templates and apps)

Author: dmitrizagidulin

.gitignore

@@ -10,6 +10,8 @@ profile
 inbox
 .acl
 config.json
+config/templates
+config/apps
 settings
 .db/
 .nyc_output

bin/lib/options.js

@@ -46,6 +46,12 @@ module.exports = [
     default: '/',
     prompt: true
   },
+  {
+    name: 'config-path',
+    question: 'Path to the config directory (for example: /etc/solid-server)',
+    default: './config',
+    prompt: true
+  },
   {
     name: 'db-path',
     question: 'Path to the server metadata db directory (for users/apps etc)',

config/defaults.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   'auth': 'tls',
+  'configPath': './config',
   'dbPath': './.db',
   'port': 8443,
   'serverUri': 'https://localhost:8443',

lib/create-app.js

@@ -35,11 +35,14 @@ const corsSettings = cors({
 })
 
 function createApp (argv = {}) {
+  // Override default configs (defaults) with passed-in params (argv)
   argv = Object.assign({}, defaults, argv)
 
   argv.host = SolidHost.from({ port: argv.port, serverUri: argv.serverUri })
 
-  argv.templates = initTemplates()
+  let configPath = initConfigPath(argv)
+
+  argv.templates = initTemplateDirs(configPath)
 
   let ldp = new LDP(argv)
   let app = express()
@@ -103,15 +106,22 @@ function createApp (argv = {}) {
   return app
 }
 
-function initTemplates () {
-  let accountTemplatePath = ensureTemplateCopiedTo(
-    '../default-templates/new-account',
-    '../config/account-template'
+function initConfigPath (argv) {
+  let configPath = path.resolve(argv.configPath)
+  fs.mkdirp(configPath)
+
+  return configPath
+}
+
+function initTemplateDirs (configPath) {
+  let accountTemplatePath = ensureDirCopy(
+    './default-templates/new-account',
+    path.join(configPath, 'templates', 'new-account')
   )
 
-  let emailTemplatesPath = ensureTemplateCopiedTo(
-    '../default-templates/emails',
-    '../config/email-templates'
+  let emailTemplatesPath = ensureDirCopy(
+    './default-templates/emails',
+    path.join(configPath, 'templates', 'emails')
   )
 
   return {
@@ -121,29 +131,25 @@ function initTemplates () {
 }
 
 /**
- * Ensures that a template directory has been initialized in `config/` from
- * default templates.
+ * Ensures that a directory has been copied / initialized. Used to ensure that
+ * account templates, email templates and default apps have been copied from
+ * their defaults to the customizable config directory, at server startup.
  *
- * @param defaultTemplateDir {string} Path to a default template directory,
- *   relative to `lib/`. For example, '../default-templates/emails' contains
- *   various email templates pre-defined by the Solid dev team.
+ * @param fromDir {string} Path to copy from (defaults)
  *
- * @param configTemplateDir {string} Path to a template directory customized
- *   to this particular installation (relative to `lib/`). Server operators
- *   are encouraged to override/customize these templates in the `config/`
- *   directory.
+ * @param toDir {string} Path to copy to (customizable config)
  *
- * @return {string} Returns the absolute path to the customizable template copy
+ * @return {string} Returns the absolute path for `toDir`
  */
-function ensureTemplateCopiedTo (defaultTemplateDir, configTemplateDir) {
-  let configTemplatePath = path.join(__dirname, configTemplateDir)
-  let defaultTemplatePath = path.join(__dirname, defaultTemplateDir)
+function ensureDirCopy (fromDir, toDir) {
+  fromDir = path.resolve(fromDir)
+  toDir = path.resolve(toDir)
 
-  if (!fs.existsSync(configTemplatePath)) {
-    fs.copySync(defaultTemplatePath, configTemplatePath)
+  if (!fs.existsSync(toDir)) {
+    fs.copySync(fromDir, toDir)
   }
 
-  return configTemplatePath
+  return toDir
 }
 
 /**

lib/ldp.js

@@ -84,6 +84,8 @@ class LDP {
     }
 
     debug.settings('Auth method: ' + this.auth)
+    debug.settings('Db path: ' + this.dbPath)
+    debug.settings('Config path: ' + this.configPath)
     debug.settings('Suffix Acl: ' + this.suffixAcl)
     debug.settings('Suffix Meta: ' + this.suffixMeta)
     debug.settings('Filesystem Root: ' + this.root)