From 22dda3f327566cd58fb2dc1e0dedbb46124f7e4c Mon Sep 17 00:00:00 2001 From: Yarmo Mackenbach Date: Fri, 14 Aug 2020 20:39:08 +0200 Subject: [PATCH] Allow custom domain --- guides/encrypt.md | 2 +- guides/verify.md | 2 +- index.js | 1 + template.env | 5 +++++ views/faq.pug | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/guides/encrypt.md b/guides/encrypt.md index 7bfe1c9..19384b7 100644 --- a/guides/encrypt.md +++ b/guides/encrypt.md @@ -14,7 +14,7 @@ If you already have a public key (or its fingerprint) you would like to use to e ## Encrypt a message -Open the [keyoxide.org/encrypt](/encrypt) page and paste the fingerprint in the **Email / key id / fingerprint** field. +Open the [/encrypt](/encrypt) page and paste the fingerprint in the **Email / key id / fingerprint** field. Write a message in the **Message** field. Scroll down and press the **ENCRYPT MESSAGE** button. diff --git a/guides/verify.md b/guides/verify.md index f57b873..ffd88e5 100644 --- a/guides/verify.md +++ b/guides/verify.md @@ -36,7 +36,7 @@ Copy the above signature. ## Verify the signature -Open the [keyoxide.org/verify](/verify) page and paste the signature in the corresponding field. Scroll down and press the **VERIFY SIGNATURE** button. +Open the [/verify](/verify) page and paste the signature in the corresponding field. Scroll down and press the **VERIFY SIGNATURE** button. Keyoxide lets you know the signature was verified and signed by a certain person. diff --git a/index.js b/index.js index 48e5fc5..e92b884 100644 --- a/index.js +++ b/index.js @@ -41,6 +41,7 @@ md.use(require('markdown-it-title')); app.set('view engine', 'pug'); app.set('port', process.env.PORT || 3000); +app.set('domain', process.env.DOMAIN || "keyoxide.org"); app.use('/favicon.svg', express.static('favicon.svg')); diff --git a/template.env b/template.env index 4262212..af846aa 100644 --- a/template.env +++ b/template.env @@ -2,6 +2,10 @@ # Defaults to: 3000 #PORT= +# Domain of Keyoxide instance +# Defaults to: keyoxide.org +#PORT= + # Domain for XMPP vCard fetch server # Code for the server can be found here https://codeberg.org/keyoxide/node-xmpp-vcard # Defaults to: "xmpp-vcard.keyoxide.org" @@ -10,4 +14,5 @@ # Twitter API bearer code # Documentation: https://developer.twitter.com/en/docs/basics/authentication/oauth-2-0 # Expected format: "XXXXXXXXXXXXXXXXXXXXX" +# If none is provided (default), Twitter accounts are not verified #TWITTER_API_AUTH= diff --git a/views/faq.pug b/views/faq.pug index 85fef48..30540f7 100644 --- a/views/faq.pug +++ b/views/faq.pug @@ -93,7 +93,7 @@ block content | Can I get a sweet profile page? p | That, we can help you with! Just append your fingerprint to the domain (like so: - a(href='/9F0048AC0B23301E1F77E994909F6BD6F80F485D') https://keyoxide.org/9F0048AC0B23301E1F77E994909F6BD6F80F485D + a(href=`https:/${settings.domain}/9F0048AC0B23301E1F77E994909F6BD6F80F485D`) https://#{settings.domain}/9f0048ac0b23301e1f77e994909f6bd6f80f485d | ) to generate a profile page. h3#where-is-the-app a(href='#where-is-the-app') #