rename variable CanonicalHost to Domain.

This commit is contained in:
fiatjaf
2023-10-21 07:47:37 -03:00
parent 6aa1440b05
commit a04f82764a
5 changed files with 16 additions and 16 deletions

View File

@@ -17,7 +17,7 @@ import (
type Settings struct { type Settings struct {
Port string `envconfig:"PORT" default:"2999"` Port string `envconfig:"PORT" default:"2999"`
DiskCachePath string `envconfig:"DISK_CACHE_PATH" default:"/tmp/njump-cache"` DiskCachePath string `envconfig:"DISK_CACHE_PATH" default:"/tmp/njump-cache"`
CanonicalHost string `envconfig:"DOMAIN" default:"njump.me"` Domain string `envconfig:"DOMAIN" default:"njump.me"`
} }
//go:embed static/* //go:embed static/*
@@ -56,7 +56,7 @@ func main() {
return return
} else { } else {
if canonicalHost := os.Getenv("CANONICAL_HOST"); canonicalHost != "" { if canonicalHost := os.Getenv("CANONICAL_HOST"); canonicalHost != "" {
s.CanonicalHost = canonicalHost s.Domain = canonicalHost
} }
} }

View File

@@ -12,5 +12,5 @@ Allow: /
Sitemap: https://{{%s}}/npubs-archive.xml Sitemap: https://{{%s}}/npubs-archive.xml
Sitemap: https://{{%s}}/relays-archive.xml Sitemap: https://{{%s}}/relays-archive.xml
`, s.CanonicalHost, s.CanonicalHost) `, s.Domain, s.Domain)
} }

View File

@@ -26,7 +26,7 @@
(yet) working. (yet) working.
</p> </p>
<p> <p>
<i>njump</i> currently lives under {{ s.CanonicalHost }}, you can <i>njump</i> currently lives under {{ s.Domain }}, you can
reach it appending a Nostr reach it appending a Nostr
<a href="https://github.com/nostr-protocol/nips/blob/master/19.md" <a href="https://github.com/nostr-protocol/nips/blob/master/19.md"
>NIP-19</a >NIP-19</a
@@ -34,7 +34,7 @@
entity (<code>npub</code>, <code>nevent</code>, <code>naddr</code>, entity (<code>npub</code>, <code>nevent</code>, <code>naddr</code>,
etc) after the domain: etc) after the domain:
<span class="exampleUrl" <span class="exampleUrl"
>{{ s.CanonicalHost }}/&lt;nip-19-entity&gt;</span >{{ s.Domain }}/&lt;nip-19-entity&gt;</span
>. >.
</p> </p>
<p> <p>
@@ -63,7 +63,7 @@
<div class="try"> <div class="try">
<form action="/try" method="POST"> <form action="/try" method="POST">
<div class="tryForm"> <div class="tryForm">
<div>{{ s.CanonicalHost }}/</div> <div>{{ s.Domain }}/</div>
<input <input
id="nip19entity" id="nip19entity"
name="nip19entity" name="nip19entity"
@@ -141,11 +141,11 @@
>NIP-05</a >NIP-05</a
> >
inspired permalink: inspired permalink:
<span class="exampleUrl">{{ s.CanonicalHost }}/&lt;nip-5&gt;</span>, <span class="exampleUrl">{{ s.Domain }}/&lt;nip-5&gt;</span>,
for example: for example:
<a href="/nvk.org">https://{{ s.CanonicalHost }}/nvk.org</a> or <a href="/nvk.org">https://{{ s.Domain }}/nvk.org</a> or
<a href="/mike@mikedilger.com" <a href="/mike@mikedilger.com"
>https://{{ s.CanonicalHost }}/mike@mikedilger.com</a >https://{{ s.Domain }}/mike@mikedilger.com</a
>. >.
</p> </p>
<p> <p>
@@ -168,10 +168,10 @@
<p> <p>
You can have a view of the last content posted to a relay using You can have a view of the last content posted to a relay using
<span class="exampleUrl" <span class="exampleUrl"
>{{ s.CanonicalHost }}/r/&lt;relay-host&gt;</span >{{ s.Domain }}/r/&lt;relay-host&gt;</span
>, for example: >, for example:
<a href="/r/nostr.wine" <a href="/r/nostr.wine"
>https://{{ s.CanonicalHost }}/r/nostr.wine</a >https://{{ s.Domain }}/r/nostr.wine</a
> >
</p> </p>
<p> <p>

View File

@@ -28,7 +28,7 @@
<link <link
rel="canonical" rel="canonical"
href="https://{{s.CanonicalHost}}/{{.npub | escapeString }}" href="https://{{s.Domain}}/{{.npub | escapeString }}"
/> />
<link <link
rel="sitemap" rel="sitemap"

View File

@@ -2,7 +2,7 @@
<urlset xmlns="http://www.Sitemaps.Org/schemas/sitemap/0.9"> <urlset xmlns="http://www.Sitemaps.Org/schemas/sitemap/0.9">
{{if .Npub}} {{if .Npub}}
<url> <url>
<loc>https://{{s.CanonicalHost}}/{{.Npub | escapeString}}</loc> <loc>https://{{s.Domain}}/{{.Npub | escapeString}}</loc>
<lastmod>{{.ModifiedAt | escapeString}}</lastmod> <lastmod>{{.ModifiedAt | escapeString}}</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
<priority>0.8</priority> <priority>0.8</priority>
@@ -10,7 +10,7 @@
{{end}} {{end}}
{{if .Hostname}} {{if .Hostname}}
<url> <url>
<loc>https://{{s.CanonicalHost}}/r/{{.Hostname | escapeString}}</loc> <loc>https://{{s.Domain}}/r/{{.Hostname | escapeString}}</loc>
<lastmod>{{.ModifiedAt | escapeString}}</lastmod> <lastmod>{{.ModifiedAt | escapeString}}</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
<priority>0.8</priority> <priority>0.8</priority>
@@ -19,7 +19,7 @@
{{if .LastNotes}} {{if .LastNotes}}
{{range .LastNotes}} {{range .LastNotes}}
<url> <url>
<loc>https://{{s.CanonicalHost}}/{{.Nevent | escapeString}}</loc> <loc>https://{{s.Domain}}/{{.Nevent | escapeString}}</loc>
<lastmod>{{.ModifiedAt | escapeString}}</lastmod> <lastmod>{{.ModifiedAt | escapeString}}</lastmod>
<changefreq>never</changefreq> <changefreq>never</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
@@ -29,7 +29,7 @@
{{if .Data}} {{if .Data}}
{{range $element := .Data }} {{range $element := .Data }}
<url> <url>
<loc>https://{{s.CanonicalHost}}/{{$.PathPrefix}}{{$element | trimProtocol | escapeString}}</loc> <loc>https://{{s.Domain}}/{{$.PathPrefix}}{{$element | trimProtocol | escapeString}}</loc>
<lastmod>{{$.ModifiedAt | escapeString}}</lastmod> <lastmod>{{$.ModifiedAt | escapeString}}</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
<priority>0.5</priority> <priority>0.5</priority>