Move hasIPv6 into sysinfo

This commit is contained in:
Girish Ramakrishnan
2019-07-25 11:26:53 -07:00
parent c30ac5f927
commit 6a77a58489
5 changed files with 38 additions and 15 deletions

View File

@@ -52,6 +52,7 @@ var acme2 = require('./cert/acme2.js'),
rimraf = require('rimraf'),
safe = require('safetydance'),
shell = require('./shell.js'),
sysinfo = require('./sysinfo.js'),
users = require('./users.js'),
util = require('util');
@@ -388,7 +389,7 @@ function writeAdminNginxConfig(bundle, configFileName, vhost, callback) {
sourceDir: path.resolve(__dirname, '..'),
adminOrigin: config.adminOrigin(),
vhost: vhost, // if vhost is empty it will become the default_server
hasIPv6: config.hasIPv6(),
hasIPv6: sysinfo.hasIPv6(),
endpoint: 'admin',
certFilePath: bundle.certFilePath,
keyFilePath: bundle.keyFilePath,
@@ -451,7 +452,7 @@ function writeAppNginxConfig(app, bundle, callback) {
sourceDir: sourceDir,
adminOrigin: config.adminOrigin(),
vhost: app.fqdn,
hasIPv6: config.hasIPv6(),
hasIPv6: sysinfo.hasIPv6(),
port: app.httpPort,
endpoint: endpoint,
certFilePath: bundle.certFilePath,
@@ -481,7 +482,7 @@ function writeAppRedirectNginxConfig(app, fqdn, bundle, callback) {
sourceDir: path.resolve(__dirname, '..'),
vhost: fqdn,
redirectTo: app.fqdn,
hasIPv6: config.hasIPv6(),
hasIPv6: sysinfo.hasIPv6(),
endpoint: 'redirect',
certFilePath: bundle.certFilePath,
keyFilePath: bundle.keyFilePath,