fix: new app will be correctly generated

gerard2perez · Sep 18, 2017 · fba7774 · fba7774
1 parent 1779e8b
commit fba7774
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/commands/new.js b/src/commands/new.js
@@ -28,6 +28,7 @@ const setupConfig = async function setupConfig (app) {
 	utils.render(TemplatePath('config/inflections.js'), Project('config/inflections.js'));
 	utils.render(TemplatePath('config/security.js'), Project('config/security.js'));
 	utils.render(TemplatePath('config/server.js'), Project('config/server.js'), {
+		name: application,
 		key: `'${(await secret(48)).toString('hex')}'`
 	});
 	utils.render(TemplatePath('config/static.js'), Project('config/static.js'));

diff --git a/src/functions/nginx.js b/src/functions/nginx.js
@@ -51,8 +51,8 @@ export async function buildNginx () {
 	}
 
 	nginxConf = compile(nginxConf, {
-		hostname: scfg.host,
-		port: scfg.port,
+		hostname: configuration.server.host,
+		port: configuration.server.port,
 		protocol: listen ? 'https' : 'http'
 	});
 	let childsubdomains = glob('koaton_modules/**/config/server.js').map((c) => {
@@ -63,8 +63,8 @@ export async function buildNginx () {
 	for (const idx in allsubdomains) {
 		nginxConf += compile(serverTemplate, {
 			subdomain: allsubdomains[idx],
-			hostname: scfg.host,
-			port: scfg.port,
+			hostname: configuration.server.host,
+			port: configuration.server.port,
 			listen: listen || 'listen 80',
 			client_max_body_size: (configuration.server.client_max_body_size || '1M'),
 			protocol: listen ? 'https' : 'http'

diff --git a/templates/app.js b/templates/app.js
@@ -1,10 +1,9 @@
 'use strict';
 
-const koaton = require('koaton');
+const koaton = require('koaton').default;
 
 koaton.use(koaton.localization);
-koaton.use(koaton.detectsubdomain);
-koaton.use(koaton.conditional);
+koaton.use(koaton.cached);
 koaton.use(koaton.helmet);
 koaton.use(koaton.bodyparser);
 koaton.use(koaton.jsurl);
@@ -13,6 +12,7 @@ koaton.use(koaton.session(koaton));
 koaton.use(koaton.passport.initialize());
 koaton.use(koaton.passport.session());
 koaton.use(koaton.oAuth2Server);
+koaton.use(koaton.i18nHelper);
 koaton.use(koaton.views);
 koaton.use(koaton.subdomainrouter);
 // ============================================

diff --git a/templates/config/server.js b/templates/config/server.js
@@ -1,12 +1,12 @@
 'use strict';
 
 exports.default = {
-	name: 'koaton',
+	name: '{{name}}',
 	client_max_body_size: '1M',
 	bodyParser: {
 		formLimit: '1mb'
 	},
-	hhtps: {
+	https: {
 		dev: {
 			key: undefined,
 			cert: undefined
@@ -25,8 +25,7 @@ exports.default = {
 		serchTerm: 'search'
 	},
 	subdomains: [
-		'www',
-		'origin'
+		'www'
 	],
 	host: {
 		dev: 'localhost',
@@ -38,7 +37,7 @@ exports.default = {
 	error: {
 		layout: 'error.handlebars',
 		data: {
-			support_email: 'gerard2perez@outlook.com',
+			support_email: 'support@{{name}}.com',
 			description: 'Oops! - looks like something went completely wrong.'
 		}
 	},