From 9eae4703c97c50e82d959a3e0859fe1553889b15 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Tue, 15 Feb 2022 22:14:03 +0100
Subject: feat: add HTTP security headers

I also renamed and changed the format of some environment variables so
I can reuse them inside the CSP security header.
---
 src/utils/config.ts      | 4 ++--
 src/utils/helpers/rss.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/config.ts b/src/utils/config.ts
index 07d42a3..86701fe 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -14,10 +14,10 @@ export const settings = {
     supported: ['en', 'fr'],
   },
   matomo: {
-    urlBase: process.env.NEXT_PUBLIC_MATOMO_URL || '',
+    urlBase: `https://${process.env.NEXT_PUBLIC_MATOMO_DOMAIN}` || '',
     siteId: process.env.NEXT_PUBLIC_MATOMO_SITE_ID || '0',
   },
   postsPerPage: 10,
   twitterId: '@ArmandPhilippot',
-  url: process.env.NEXT_PUBLIC_FRONTEND_URL,
+  url: `${process.env.NEXT_PUBLIC_APP_PROTOCOL}://${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
 };
diff --git a/src/utils/helpers/rss.ts b/src/utils/helpers/rss.ts
index 8a1c801..e10c7f3 100644
--- a/src/utils/helpers/rss.ts
+++ b/src/utils/helpers/rss.ts
@@ -15,10 +15,10 @@ const getAllPosts = async (): Promise<ArticlePreview[]> => {
 };
 
 export const generateFeed = async () => {
-  const websiteUrl = process.env.FRONTEND_URL ? process.env.FRONTEND_URL : '';
+  const websiteUrl = `${process.env.NEXT_PUBLIC_APP_PROTOCOL}://${process.env.NEXT_PUBLIC_APP_DOMAIN}`;
   const author = {
     name: settings.name,
-    email: process.env.AUTHOR_EMAIL,
+    email: process.env.APP_AUTHOR_EMAIL,
     link: websiteUrl,
   };
   const copyright = `${settings.name} CC BY SA ${settings.copyright.startYear} - ${settings.copyright.endYear}`;
@@ -27,7 +27,7 @@ export const generateFeed = async () => {
   const feed = new Feed({
     author,
     copyright,
-    description: process.env.FEED_DESCRIPTION,
+    description: process.env.APP_FEED_DESCRIPTION,
     feedLinks: {
       json: `${websiteUrl}/feed/json`,
       atom: `${websiteUrl}/feed/atom`,
-- 
cgit v1.2.3