templates: change canonical domain to xeiaso.net

Signed-off-by: Xe Iaso <me@christine.website>

8 files changed, 37 insertions, 42 deletions

diff --git a/templates/blog_atom.rs.xml b/templates/blog_atom.rs.xml
index 73c78a0..b0c567f 100644
--- a/templates/blog_atom.rs.xml
+++ b/templates/blog_atom.rs.xml
@@ -5,22 +5,22 @@
 
 <?xml version='1.0' encoding='UTF-8'?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <id>https://christine.website/blog.atom</id>
+  <id>https://xeiaso.net/blog.atom</id>
   <title>Xe's Blog</title>
   <updated>@Utc::now().to_rfc3339()</updated>
   <author>
     <name>Xe Iaso</name>
     <email>me@@christine.website</email>
   </author>
-  <link href="https://christine.website/blog.atom" rel="self"/>
-  <link href="https://christine.website/blog" rel="alternate"/>
+  <link href="https://xeiaso.net/blog.atom" rel="self"/>
+  <link href="https://xeiaso.net/blog" rel="alternate"/>
   <generator uri="@env!("CARGO_PKG_REPOSITORY")" version="@env!("CARGO_PKG_VERSION")">@env!("CARGO_PKG_NAME")</generator>
   @for post in posts {
     <entry>
-      <id>https://christine.website/@post.link</id>
+      <id>https://xeiaso.net/@post.link</id>
       <title>@post.front_matter.title</title>
       <published>@post.date.to_rfc3339()</published>
-      <link href="https://christine.website/@post.link" rel="alternate"/>
+      <link href="https://xeiaso.net/@post.link" rel="alternate"/>
     </entry>
   }
 </feed>
diff --git a/templates/blog_rss.rs.xml b/templates/blog_rss.rs.xml
index 0b42b8e..16616a4 100644
--- a/templates/blog_rss.rs.xml
+++ b/templates/blog_rss.rs.xml
@@ -6,15 +6,15 @@
 <rss version="2.0">
     <channel>
         <title>Xe's Blog</title>
-        <link>https://christine.website/blog</link>
+        <link>https://xeiaso.net/blog</link>
         <description>Tech, philosophy and more</description>
         <generator>@APP https://github.com/Xe/site</generator>
         <ttl>1440</ttl>
         @for post in posts {
             <item>
-                <guid>https://christine.website/@post.link</guid>
+                <guid>https://xeiaso.net/@post.link</guid>
                 <title>@post.front_matter.title</title>
-                <link>https://christine.website/@post.link</link>
+                <link>https://xeiaso.net/@post.link</link>
                 <description><![CDATA[@Html(post.body_html)]]></description>
                 <pubDate>@post.date.to_rfc2822()</pubDate>
             </item>
diff --git a/templates/blogindex.rs.html b/templates/blogindex.rs.html
index 111da9e..f565fd0 100644
--- a/templates/blogindex.rs.html
+++ b/templates/blogindex.rs.html
@@ -75,7 +75,7 @@
     </blockquote>
 </p>
 
-<h3><a href="https://christine.website/blog/templeos-2-god-the-rng-2019-05-30">TempleOS: 2 - <code>god</code>, the Random Number Generator</a> </h3>
+<h3><a href="https://xeiaso.net/blog/templeos-2-god-the-rng-2019-05-30">TempleOS: 2 - <code>god</code>, the Random Number Generator</a> </h3>
 
 <p>
     <blockquote>
diff --git a/templates/blogpost.rs.html b/templates/blogpost.rs.html
index d8b9ab0..725bb60 100644
--- a/templates/blogpost.rs.html
+++ b/templates/blogpost.rs.html
@@ -19,10 +19,12 @@
 
 <!-- Description -->
 <meta name="description" content="@post.front_matter.title - Xe's Blog" />
-<meta name="author" content="Xe Iaso">
+<meta name="author" content="Xe Iaso" />
 
 @if post.front_matter.redirect_to.is_none() {
-  <link rel="canonical" href="https://christine.website/@post.link">
+  <link rel="canonical" href="https://xeiaso.net/@post.link" />
+} else {
+  <link rel="canonical" href="@post.front_matter.redirect_to.as_ref().unwrap()" />
 }
 
 <script type="module" src="/static/js/conversation.js"></script>
@@ -32,22 +34,20 @@
      "@@context": "http://schema.org",
      "@@type": "Article",
      "headline": "@post.front_matter.title",
-     "image": "https://christine.website/static/img/avatar.png",
-     "url": "https://christine.website/@post.link",
+     "image": "https://xeiaso.net/static/img/avatar.png",
+     "url": "https://xeiaso.net/@post.link",
      "datePublished": "@post.date.format("%Y-%m-%d")",
      "mainEntityOfPage": @{
          "@@type": "WebPage",
-         "@@id": "https://christine.website/@post.link"
+         "@@id": "https://xeiaso.net/@post.link"
          @},
      "author": @{
          "@@type": "Person",
-         "name": "Xe Iaso",
-         "alternateName": "Christine Dodrill"
+         "name": "Xe Iaso"
          @},
      "publisher": @{
          "@@type": "Person",
-         "name": "Xe Iaso",
-         "alternateName": "Christine Dodrill"
+         "name": "Xe Iaso"
          @}
      @}
 </script>
diff --git a/templates/gallerypost.rs.html b/templates/gallerypost.rs.html
index 12d2289..4c9f58e 100644
--- a/templates/gallerypost.rs.html
+++ b/templates/gallerypost.rs.html
@@ -20,29 +20,27 @@
 <meta name="description" content="@post.front_matter.title - Xe's Blog" />
 <meta name="author" content="Xe Iaso">
 
-<link rel="canonical" href="https://christine.website/@post.link">
+<link rel="canonical" href="https://xeiaso.net/@post.link" />
 
 <script type="application/ld+json">
  @{
    "@@context": "http://schema.org",
    "@@type": "Article",
    "headline": "@post.front_matter.title",
-   "image": "https://christine.website/static/img/avatar.png",
-   "url": "https://christine.website/@post.link",
+   "image": "https://xeiaso.net/static/img/avatar.png",
+   "url": "https://xeiaso.net/@post.link",
    "datePublished": "@post.date.format("%Y-%m-%d")",
    "mainEntityOfPage": @{
        "@@type": "WebPage",
-       "@@id": "https://christine.website/@post.link"
+       "@@id": "https://xeiaso.net/@post.link"
    @},
    "author": @{
        "@@type": "Person",
        "name": "Xe Iaso",
-       "alternateName": "Christine Dodrill"
    @},
    "publisher": @{
        "@@type": "Person",
        "name": "Xe Iaso",
-       "alternateName": "Christine Dodrill"
    @}
  @}
 </script>
diff --git a/templates/header.rs.html b/templates/header.rs.html
index 7e27006..8ec5cf8 100644
--- a/templates/header.rs.html
+++ b/templates/header.rs.html
@@ -62,8 +62,8 @@ la budza pu cusku lu
         @if Utc::now().month() == 12 || Utc::now().month() == 1 || Utc::now().month() == 2 { <link rel="stylesheet" href="/css/snow.css?snowfix=20211201" /> }
         <link rel="manifest" href="/static/manifest.json" />
 
-        <link rel="alternate" title="Xe's Blog" type="application/rss+xml" href="https://christine.website/blog.rss" />
-        <link rel="alternate" title="Xe's Blog" type="application/json" href="https://christine.website/blog.json" />
+        <link rel="alternate" title="Xe's Blog" type="application/rss+xml" href="https://xeiaso.net/blog.rss" />
+        <link rel="alternate" title="Xe's Blog" type="application/json" href="https://xeiaso.net/blog.json" />
 
         <link rel="apple-touch-icon" sizes="57x57" href="/static/favicon/apple-icon-57x57.png">
         <link rel="apple-touch-icon" sizes="60x60" href="/static/favicon/apple-icon-60x60.png">
diff --git a/templates/index.rs.html b/templates/index.rs.html
index b6fb92d..6c10941 100644
--- a/templates/index.rs.html
+++ b/templates/index.rs.html
@@ -5,16 +5,15 @@
 @:header_html(None, None)
 
 <link rel="authorization_endpoint" href="https://idp.christine.website/auth">
-<link rel="canonical" href="https://christine.website/">
+<link rel="canonical" href="https://xeiaso.net/">
 <meta name="google-site-verification" content="rzs9eBEquMYr9Phrg0Xm0mIwFjDBcbdgJ3jF6Disy-k" />
 <script type="application/ld+json">
  @{
      "@@context": "http://schema.org/",
      "@@type": "Person",
      "name": "Xe Iaso",
-     "alternateName": "Cadey, Christine Dodrill, Xena",
-     "url": "https://christine.website",
-     "image": "https://christine.website/static/img/avatar_large.png",
+     "url": "https://xeiaso.net",
+     "image": "https://xeiaso.net/static/img/avatar_large.png",
      "sameAs": [
          "https://github.com/Xe",
          "https://tulpa.dev/cadey",
@@ -39,7 +38,7 @@
 
 <!-- Description -->
 <meta name="description" content="Full-stack Engineer" />
-<meta name="author" content="Xe Iaso, Christine Dodrill">
+<meta name="author" content="Xe Iaso">
 
 <div class="grid">
     <div class="cell -3of12 content">
@@ -48,8 +47,8 @@
         <a href="/contact" class="justify-content-center">Contact Me</a>
     </div>
     <div class="cell -9of12 content">
-        <h1>Xe</h1>
-        <h4>Full-stack Engineer</h4>
+        <h1>Xe Iaso</h1>
+        <h4>Archmage of Infrastructure</h4>
         <h5>Skills</h5>
         <ul>
             <li>Go, Lua, Haskell, C, Rust and other languages</li>
diff --git a/templates/talkpost.rs.html b/templates/talkpost.rs.html
index 231d64f..46cd1de 100644
--- a/templates/talkpost.rs.html
+++ b/templates/talkpost.rs.html
@@ -19,31 +19,29 @@
 
 <!-- Description -->
 <meta name="description" content="@post.front_matter.title - Xe's Blog" />
-<meta name="author" content="Xe Iaso">
+<meta name="author" content="Xe Iaso" />
 
-<link rel="canonical" href="https://christine.website/@post.link">
+<link rel="canonical" href="https://xeiaso.net/@post.link" />
 
 <script type="application/ld+json">
  @{
      "@@context": "http://schema.org",
      "@@type": "Article",
      "headline": "@post.front_matter.title",
-     "image": "https://christine.website/static/img/avatar.png",
-     "url": "https://christine.website/@post.link",
+     "image": "https://xeiaso.net/static/img/avatar.png",
+     "url": "https://xeiaso.net/@post.link",
      "datePublished": "@post.date.format("%Y-%m-%d")",
      "mainEntityOfPage": @{
          "@@type": "WebPage",
-         "@@id": "https://christine.website/@post.link"
+         "@@id": "https://xeiaso.net/@post.link"
          @},
      "author": @{
          "@@type": "Person",
-         "name": "Xe Iaso",
-         "alternateName": "Christine Dodrill"
+         "name": "Xe Iaso"
          @},
      "publisher": @{
          "@@type": "Person",
-         "name": "Xe Iaso",
-         "alternateName": "Christine Dodrill"
+         "name": "Xe Iaso"
          @}
      @}
 </script>