4 files changed, 9 insertions, 5 deletions
diff --git a/lib/config/default.js b/lib/config/default.js
index 5a7ae0a0..9e401f38 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -151,5 +151,5 @@ module.exports = {
   allowEmailRegister: true,
   allowGravatar: true,
   allowPDFExport: true,
-  openID: true
+  openID: false
 }
diff --git a/lib/config/environment.js b/lib/config/environment.js
index a57fe0db..fc757cf1 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -14,7 +14,7 @@ module.exports = {
   useSSL: toBooleanConfig(process.env.CMD_USESSL),
   hsts: {
     enable: toBooleanConfig(process.env.CMD_HSTS_ENABLE),
-    maxAgeSeconds: process.env.CMD_HSTS_MAX_AGE,
+    maxAgeSeconds: toIntegerConfig(process.env.CMD_HSTS_MAX_AGE),
     includeSubdomains: toBooleanConfig(process.env.CMD_HSTS_INCLUDE_SUBDOMAINS),
     preload: toBooleanConfig(process.env.CMD_HSTS_PRELOAD)
   },
diff --git a/lib/config/hackmdEnvironment.js b/lib/config/hackmdEnvironment.js
index e1c11569..bc20e58a 100644
--- a/lib/config/hackmdEnvironment.js
+++ b/lib/config/hackmdEnvironment.js
@@ -10,7 +10,7 @@ module.exports = {
   useSSL: toBooleanConfig(process.env.HMD_USESSL),
   hsts: {
     enable: toBooleanConfig(process.env.HMD_HSTS_ENABLE),
-    maxAgeSeconds: process.env.HMD_HSTS_MAX_AGE,
+    maxAgeSeconds: toIntegerConfig(process.env.HMD_HSTS_MAX_AGE),
     includeSubdomains: toBooleanConfig(process.env.HMD_HSTS_INCLUDE_SUBDOMAINS),
     preload: toBooleanConfig(process.env.HMD_HSTS_PRELOAD)
   },
diff --git a/lib/config/index.js b/lib/config/index.js
index c1005b0b..e5d02dc1 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -101,6 +101,10 @@ config.serverURL = (function getserverurl () {
   return url
 })()
 
+if (config.serverURL === '') {
+  logger.warn('Neither \'domain\' nor \'CMD_DOMAIN\' is configured. This can cause issues with various components.\nHint: Make sure \'protocolUseSSL\' and \'urlAddPort\' or \'CMD_PROTOCOL_USESSL\' and \'CMD_URL_ADDPORT\' are configured properly.')
+}
+
 config.Environment = Environment
 
 // auth method
@@ -124,7 +128,7 @@ if (config.gitlab && config.gitlab.version !== 'v4' && config.gitlab.version !==
   config.gitlab.version = 'v4'
 }
 // If gitlab scope is api, enable snippets Export/import
-config.isGitlabSnippetsEnable = (!config.gitlab.scope || config.gitlab.scope === 'api')
+config.isGitlabSnippetsEnable = (!config.gitlab.scope || config.gitlab.scope === 'api') && config.isGitLabEnable
 
 // Only update i18n files in development setups
 config.updateI18nFiles = (env === Environment.development)
@@ -161,7 +165,7 @@ if (config.sessionSecret === 'secret') {
 
 // Validate upload upload providers
 if (['filesystem', 's3', 'minio', 'imgur', 'azure'].indexOf(config.imageUploadType) === -1) {
-  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio", "azure" or "imgur". Defaulting to "imgur"')
+  logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio", "azure" or "imgur". Defaulting to "filesystem"')
   config.imageUploadType = 'filesystem'
 }