From 1b749e7bf297f005954ed736e19c9eda98ad3916 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 12 Jan 2020 13:23:01 -0500 Subject: [PATCH] fix: letsencrypt maintainerEmail --- client/static/svg/icon-cancel-dotted.svg | 1 + client/static/svg/icon-tree-structure-dotted.svg | 1 + client/static/svg/icon-user-menu-male-dotted.svg | 1 + client/static/svg/icon-venn-diagram.svg | 1 + config.sample.yml | 2 +- dev/build/config.yml | 2 +- server/app/data.yml | 1 + server/core/letsencrypt.js | 4 ++-- 8 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 client/static/svg/icon-cancel-dotted.svg create mode 100644 client/static/svg/icon-tree-structure-dotted.svg create mode 100644 client/static/svg/icon-user-menu-male-dotted.svg create mode 100644 client/static/svg/icon-venn-diagram.svg diff --git a/client/static/svg/icon-cancel-dotted.svg b/client/static/svg/icon-cancel-dotted.svg new file mode 100644 index 00000000..47e60297 --- /dev/null +++ b/client/static/svg/icon-cancel-dotted.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/static/svg/icon-tree-structure-dotted.svg b/client/static/svg/icon-tree-structure-dotted.svg new file mode 100644 index 00000000..2bef896d --- /dev/null +++ b/client/static/svg/icon-tree-structure-dotted.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/static/svg/icon-user-menu-male-dotted.svg b/client/static/svg/icon-user-menu-male-dotted.svg new file mode 100644 index 00000000..5c3d34ff --- /dev/null +++ b/client/static/svg/icon-user-menu-male-dotted.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/client/static/svg/icon-venn-diagram.svg b/client/static/svg/icon-venn-diagram.svg new file mode 100644 index 00000000..beb04114 --- /dev/null +++ b/client/static/svg/icon-venn-diagram.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config.sample.yml b/config.sample.yml index d3073231..64f56696 100644 --- a/config.sample.yml +++ b/config.sample.yml @@ -80,7 +80,7 @@ ssl: # ++++++ For letsencrypt only ++++++ domain: wiki.yourdomain.com - maintainerEmail: admin@example.com + subscriberEmail: admin@example.com # --------------------------------------------------------------------- # Database Pool Options diff --git a/dev/build/config.yml b/dev/build/config.yml index ca082f64..93395f1a 100644 --- a/dev/build/config.yml +++ b/dev/build/config.yml @@ -14,5 +14,5 @@ ssl: port: 3443 provider: letsencrypt domain: $(LETSENCRYPT_DOMAIN) - maintainerEmail: $(LETSENCRYPT_EMAIL) + subscriberEmail: $(LETSENCRYPT_EMAIL) logLevel: info diff --git a/server/app/data.yml b/server/app/data.yml index b7864e13..f0dfbf47 100644 --- a/server/app/data.yml +++ b/server/app/data.yml @@ -66,6 +66,7 @@ defaults: origin: true search: maxHits: 100 + maintainerEmail: security@requarks.io localeNamespaces: - admin - auth diff --git a/server/core/letsencrypt.js b/server/core/letsencrypt.js index f3c67e95..bbad33da 100644 --- a/server/core/letsencrypt.js +++ b/server/core/letsencrypt.js @@ -35,7 +35,7 @@ module.exports = { try { WIKI.logger.info(`(LETSENCRYPT) Initializing Let's Encrypt client...`) this.acme = ACME.create({ - maintainerEmail: WIKI.config.ssl.maintainerEmail, + maintainerEmail: WIKI.config.maintainerEmail, packageAgent: `wikijs/${WIKI.version}`, notify: (ev, msg) => { if (_.includes(['warning', 'error'], ev)) { @@ -54,7 +54,7 @@ module.exports = { WIKI.logger.info(`(LETSENCRYPT) Setting up account for the first time...`) const accountKeypair = await Keypairs.generate({ kty: 'EC', format: 'jwk' }) const account = await this.acme.accounts.create({ - subscriberEmail: WIKI.config.ssl.maintainerEmail, + subscriberEmail: WIKI.config.ssl.subscriberEmail, agreeToTerms: true, accountKey: accountKeypair.private })