Commit b7442443 authored by NGPixel's avatar NGPixel

Use existing values during configure mode

parent 4f1c37a3
This source diff could not be displayed because it is too large. You can view the blob instead.
'use strict' 'use strict'
/* global appconfig */
import jQuery from 'jquery' import jQuery from 'jquery'
import _ from 'lodash' import _ from 'lodash'
import Vue from 'vue' import Vue from 'vue'
...@@ -43,14 +45,14 @@ jQuery(document).ready(function ($) { ...@@ -43,14 +45,14 @@ jQuery(document).ready(function ($) {
results: [] results: []
}, },
conf: { conf: {
title: 'Wiki', title: appconfig.title || 'Wiki',
host: 'http://', host: appconfig.host || 'http://',
port: 80, port: appconfig.port || 80,
lang: 'en', lang: appconfig.lang || 'en',
db: 'mongodb://localhost:27017/wiki', db: appconfig.db || 'mongodb://localhost:27017/wiki',
pathData: './data', pathData: './data',
pathRepo: './repo', pathRepo: './repo',
gitUseRemote: true, gitUseRemote: (appconfig.git !== false),
gitUrl: '', gitUrl: '',
gitBranch: 'master', gitBranch: 'master',
gitAuthType: 'ssh', gitAuthType: 'ssh',
...@@ -108,6 +110,27 @@ jQuery(document).ready(function ($) { ...@@ -108,6 +110,27 @@ jQuery(document).ready(function ($) {
return perc return perc
} }
}, },
mounted: function () {
if (appconfig.paths) {
this.conf.pathData = appconfig.paths.data || './data'
this.conf.pathRepo = appconfig.paths.repo || './repo'
}
if (appconfig.git !== false && _.isPlainObject(appconfig.git)) {
this.conf.gitUrl = appconfig.git.url || ''
this.conf.gitBranch = appconfig.git.branch || 'master'
if (_.isPlainObject(appconfig.git.auth)) {
this.conf.gitAuthType = appconfig.git.auth.type || 'ssh'
this.conf.gitAuthSSHKey = appconfig.git.auth.privateKey || ''
this.conf.gitAuthUser = appconfig.git.auth.username || ''
this.conf.gitAuthPass = appconfig.git.auth.password || ''
this.conf.gitAuthSSL = (appconfig.git.auth.sslVerify !== false)
}
if (_.isPlainObject(appconfig.git.signature)) {
this.conf.gitSignatureName = appconfig.git.signature.name || ''
this.conf.gitSignatureEmail = appconfig.git.signature.email || ''
}
}
},
methods: { methods: {
proceedToWelcome: function (ev) { proceedToWelcome: function (ev) {
this.state = 'welcome' this.state = 'welcome'
......
...@@ -94,15 +94,6 @@ auth: ...@@ -94,15 +94,6 @@ auth:
sessionSecret: 1234567890abcdefghijklmnopqrstuvxyz sessionSecret: 1234567890abcdefghijklmnopqrstuvxyz
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Administrator email
# ---------------------------------------------------------------------
# An admin account will be created using the email specified here.
# The password is set to "admin123" by default. Change it immediately
# upon login!!!
admin: admin@company.com
# ---------------------------------------------------------------------
# Database Connection String # Database Connection String
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# You can also use an ENV variable by using $ENV_VAR_NAME as the value # You can also use an ENV variable by using $ENV_VAR_NAME as the value
......
...@@ -323,7 +323,6 @@ module.exports = (port, spinner) => { ...@@ -323,7 +323,6 @@ module.exports = (port, spinner) => {
} else { } else {
conf.auth = { local: { enabled: true } } conf.auth = { local: { enabled: true } }
} }
conf.admin = req.body.adminEmail
conf.db = req.body.db conf.db = req.body.db
if (req.body.gitUseRemote === false) { if (req.body.gitUseRemote === false) {
conf.git = false conf.git = false
......
...@@ -10,6 +10,8 @@ html(data-logic='configure') ...@@ -10,6 +10,8 @@ html(data-logic='configure')
link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png') link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
// JS / CSS // JS / CSS
script(type='text/javascript').
var appconfig = !{JSON.stringify(conf)};
script(type='text/javascript', src='/js/configure.min.js') script(type='text/javascript', src='/js/configure.min.js')
body body
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment