partial merge of 9a0dd2381f

This commit is contained in:
AJ ONeal 2016-08-11 10:49:36 -06:00
parent 605565559c
commit bb3d9842dd
1 changed files with 3 additions and 0 deletions

View File

@ -6,6 +6,7 @@ var PromiseA = require('bluebird');
var leCore = require('letiny-core'); var leCore = require('letiny-core');
var merge = require('./lib/common').merge; var merge = require('./lib/common').merge;
var tplCopy = require('./lib/common').tplCopy; var tplCopy = require('./lib/common').tplCopy;
var isValidDomain = require('./lib/common').isValidDomain;
var LE = module.exports; var LE = module.exports;
LE.productionServerUrl = leCore.productionServerUrl; LE.productionServerUrl = leCore.productionServerUrl;
@ -15,6 +16,7 @@ LE.logsDir = leCore.logsDir;
LE.workDir = leCore.workDir; LE.workDir = leCore.workDir;
LE.acmeChallengPrefix = leCore.acmeChallengPrefix; LE.acmeChallengPrefix = leCore.acmeChallengPrefix;
LE.knownEndpoints = leCore.knownEndpoints; LE.knownEndpoints = leCore.knownEndpoints;
LE.isValidDomain = isValidDomain;
LE.privkeyPath = ':config/live/:hostname/privkey.pem'; LE.privkeyPath = ':config/live/:hostname/privkey.pem';
LE.fullchainPath = ':config/live/:hostname/fullchain.pem'; LE.fullchainPath = ':config/live/:hostname/fullchain.pem';
@ -128,6 +130,7 @@ LE.create = function (defaults, handlers, backend) {
le = { le = {
backend: backend backend: backend
, isValidDomain: isValidDomain
, pyToJson: function (pyobj) { , pyToJson: function (pyobj) {
if (!pyobj) { if (!pyobj) {
return null; return null;