fix: letsencrypt maintainerEmail

client/static/svg/icon-venn-diagram.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="96px" height="96px"><linearGradient id="AqlBogUJrrMJkaHfojlpXa" x1="32" x2="32" y1="10.447" y2="37.324" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6dc7ff"/><stop offset="1" stop-color="#e6abff"/></linearGradient><path fill="url(#AqlBogUJrrMJkaHfojlpXa)" d="M38.629,26.457C38.746,25.906,39,24.469,39,23c0-5.499-2.776-10.347-7-13.227	c-4.224,2.88-7,7.728-7,13.227c0,1.469,0.254,2.906,0.371,3.457c-4.51,2.06-7.9,6.141-8.989,11.098C18.401,38.474,20.637,39,23,39	c3.339,0,6.436-1.024,8.999-2.774c-3.312-2.259-5.726-5.73-6.617-9.774c0,0,0,0,0,0c-0.001-0.003-0.001-0.004-0.001-0.006	c0,0.002,0.001,0.004,0.002,0.006c0.042-0.019,0.084-0.038,0.127-0.057C27.495,25.51,29.685,25,32,25s4.505,0.51,6.492,1.396	c0.042,0.019,0.084,0.037,0.127,0.057c0-0.002,0.001-0.004,0.002-0.006c-0.001,0.003-0.001,0.004-0.001,0.006c0,0,0,0,0,0	c-0.891,4.044-3.305,7.515-6.617,9.774C34.564,37.976,37.661,39,41,39c2.363,0,4.599-0.526,6.618-1.445	C46.529,32.598,43.139,28.517,38.629,26.457z"/><linearGradient id="AqlBogUJrrMJkaHfojlpXb" x1="32" x2="32" y1="9.936" y2="57.327" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1a6dff"/><stop offset="1" stop-color="#c822ff"/></linearGradient><path fill="url(#AqlBogUJrrMJkaHfojlpXb)" d="M58,23c0-9.374-7.626-17-17-17c-3.307,0-6.386,0.964-9,2.604C29.386,6.964,26.307,6,23,6	C13.626,6,6,13.626,6,23c0,6.584,3.769,12.292,9.256,15.115C15.094,39.054,15,40.015,15,41c0,9.374,7.626,17,17,17s17-7.626,17-17	c0-0.984-0.102-1.943-0.263-2.881C54.228,35.297,58,29.587,58,23z M32,11.028c3.635,2.74,6,7.079,6,11.972	c0,0.696-0.065,1.376-0.158,2.047C36.019,24.376,34.054,24,32,24c-2.055,0-4.017,0.385-5.842,1.056C26.065,24.382,26,23.699,26,23	C26,18.108,28.365,13.768,32,11.028z M43,41c0,6.065-4.935,11-11,11s-11-4.935-11-11c0-0.376,0.023-0.753,0.061-1.128	C21.698,39.947,22.342,40,23,40c3.303,0,6.378-0.962,8.99-2.598C34.603,39.045,37.691,40,41,40c0.658,0,1.302-0.053,1.939-0.128	C42.977,40.247,43,40.624,43,41z M24.263,25.881c-2.882,1.481-5.273,3.77-6.91,6.553C14.072,30.462,12,26.873,12,23	c0-6.065,4.935-11,11-11c1.517,0,2.969,0.317,4.337,0.908C25.244,15.733,24,19.222,24,23C24,23.984,24.102,24.943,24.263,25.881z M24.725,27.893c0.984,3.268,2.934,6.114,5.506,8.231C28.087,37.315,25.624,38,23,38c-1.923,0-3.755-0.377-5.446-1.039	C18.644,33.073,21.266,29.82,24.725,27.893z M27.244,28.913c-0.262-0.609-0.496-1.233-0.677-1.879C28.254,26.375,30.082,26,32,26	c1.917,0,3.744,0.373,5.429,1.032c-0.182,0.646-0.39,1.282-0.652,1.891C33.731,27.722,30.294,27.718,27.244,28.913z M35.851,30.697	c-0.999,1.662-2.311,3.115-3.852,4.28c-1.541-1.164-2.846-2.62-3.844-4.283C30.626,29.778,33.384,29.78,35.851,30.697z M41,38	c-2.619,0-5.079-0.679-7.222-1.865c2.573-2.115,4.511-4.972,5.496-8.239c3.453,1.929,6.071,5.182,7.159,9.07	C44.746,37.625,42.918,38,41,38z M39.737,25.876C39.898,24.939,40,23.982,40,23c0-3.78-1.245-7.271-3.34-10.097	C38.025,12.318,39.502,12,41,12c6.065,0,11,4.935,11,11c0,3.867-2.051,7.441-5.357,9.425C45.006,29.644,42.617,27.357,39.737,25.876	z M15.724,36.107C11.123,33.542,8,28.631,8,23c0-8.271,6.729-15,15-15c2.619,0,5.08,0.678,7.225,1.862	c-0.549,0.451-1.065,0.939-1.553,1.453C26.916,10.463,24.965,10,23,10c-7.168,0-13,5.832-13,13c0,4.62,2.493,8.899,6.435,11.215	C16.166,34.83,15.921,35.457,15.724,36.107z M32,56c-8.271,0-15-6.729-15-15c0-0.7,0.049-1.388,0.142-2.062	c0.633,0.233,1.288,0.418,1.952,0.579C19.038,40.009,19,40.505,19,41c0,7.168,5.832,13,13,13s13-5.832,13-13	c0-0.495-0.038-0.99-0.094-1.483c0.659-0.159,1.308-0.342,1.936-0.573C46.935,39.618,47,40.301,47,41C47,49.271,40.271,56,32,56z M48.275,36.107c-0.196-0.65-0.44-1.278-0.709-1.892C51.538,31.885,54,27.613,54,23c0-7.168-5.832-13-13-13	c-1.969,0-3.904,0.472-5.663,1.326c-0.491-0.518-1.01-1.01-1.562-1.464C35.92,8.678,38.381,8,41,8c8.271,0,15,6.729,15,15	C56,28.632,52.877,33.543,48.275,36.107z"/></svg>

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

dev/build/config.yml

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

server/app/data.yml

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

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