update sslDir handling

This commit is contained in:
LosslessBot
2016-07-13 12:09:34 +02:00
parent a7525184ef
commit d06a2cee2f
6 changed files with 20 additions and 12 deletions

View File

@@ -7,5 +7,6 @@ export let leShConfig = plugins.path.join(__dirname,"assets/leshconfig.json");
export let letsencryptSh = plugins.path.join(__dirname,"assets/letsencrypt.sh");
//dirs
export let certDir = plugins.path.join(__dirname,"/assets/certs");
export let assetDir = plugins.path.join(__dirname,"/assets/");
export let certDir = plugins.path.join(__dirname,"assets/certs");
export let defaultSslDir = plugins.path.join(__dirname,"assets/defaultSslDir");
export let assetDir = plugins.path.join(__dirname,"assets/");

View File

@@ -1,10 +1,10 @@
import * as plugins from "./cert.plugins";
import * as paths from "./cert.paths";
export interface CertConstructorOptions {
export interface ICertConstructorOptions {
cfEmail: string,
cfKey: string,
sslDir: string,
sslDir?: string,
gitOriginRepo?: string,
testMode?: boolean
};
@@ -17,7 +17,7 @@ export class Cert {
private _testMode: boolean
certificatesPresent: Certificate[];
certificatesValid: Certificate[];
constructor(optionsArg:CertConstructorOptions) {
constructor(optionsArg:ICertConstructorOptions) {
this._cfEmail = optionsArg.cfEmail;
this._cfKey = optionsArg.cfKey;
this._sslDir = optionsArg.sslDir;
@@ -32,6 +32,8 @@ export class Cert {
JSON.stringify(config),
plugins.path.join(__dirname, "assets/config.json")
);
// setup sslDir
if (!this._sslDir) this._sslDir = paths.defaultSslDir;
// setup Git
if (this._gitOriginRepo) {
plugins.smartgit.init(this._sslDir);