Jelajahi Sumber

fix: letsencrypt maintainerEmail

NGPixel 5 tahun lalu
induk
melakukan
1b749e7bf2

File diff ditekan karena terlalu besar
+ 0 - 0
client/static/svg/icon-cancel-dotted.svg


File diff ditekan karena terlalu besar
+ 0 - 0
client/static/svg/icon-tree-structure-dotted.svg


File diff ditekan karena terlalu besar
+ 0 - 0
client/static/svg/icon-user-menu-male-dotted.svg


File diff ditekan karena terlalu besar
+ 0 - 0
client/static/svg/icon-venn-diagram.svg


+ 1 - 1
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

+ 1 - 1
dev/build/config.yml

@@ -14,5 +14,5 @@ ssl:
   port: 3443
   provider: letsencrypt
   domain: $(LETSENCRYPT_DOMAIN)
-  maintainerEmail: $(LETSENCRYPT_EMAIL)
+  subscriberEmail: $(LETSENCRYPT_EMAIL)
 logLevel: info

+ 1 - 0
server/app/data.yml

@@ -66,6 +66,7 @@ defaults:
       origin: true
     search:
       maxHits: 100
+    maintainerEmail: security@requarks.io
 localeNamespaces:
   - admin
   - auth

+ 2 - 2
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
         })

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini