From 333c6b7881b92600011bc2fd4bb9026e61660792 Mon Sep 17 00:00:00 2001
From: Andrew Dunkman <andrew.dunkman@gsa.gov>
Date: Thu, 9 Apr 2020 17:24:32 -0400
Subject: [PATCH] Include FQDN in canonical URLs, show full page URL

---
 Rakefile            | 9 +++++++--
 _includes/meta.html | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Rakefile b/Rakefile
index 91f5c804a..16c6364f2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,6 +6,11 @@ require_relative './htmlproofer/target_blank_checks.rb'
 desc 'Run HTMLProofer w/ custom plugins'
 task :htmlproof do
 
-  HTMLProofer.check_directory("./_site",
-                              {:empty_alt_ignore => true}).run
+  HTMLProofer.check_directory("./_site", {
+    empty_alt_ignore: true,
+    url_swap: {
+      # treat urls to faq.coronavirus.gov as local
+      'https://faq.coronavirus.gov' => ''
+    }
+  }).run
 end
diff --git a/_includes/meta.html b/_includes/meta.html
index 8e716451e..9a99abe7d 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -36,8 +36,8 @@
   <meta property="og:image:width" content="1200">
   <meta property="og:image:height" content="800">
   <meta property="og:image:alt" content="Coronavirus FAQ">
-  <link rel="canonical" href="{{site.baseurl}}/">
-  <meta property="og:url" content="{{site.baseurl}}/">
+  <link rel="canonical" href="{{ site.url }}{{ site.baseurl }}{{ page.url }}">
+  <meta property="og:url" content="{{ site.url }}{{ site.baseurl }}{{ page.url }}">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700&display=swap" rel="stylesheet">
   <!-- Favicons
     ================================================== -->
@@ -48,4 +48,4 @@
     ================================================== -->
 
   {% asset index.scss %}
-</head>
\ No newline at end of file
+</head>