diff --git a/config.toml b/config.toml index cfefacb..9dbed4e 100644 --- a/config.toml +++ b/config.toml @@ -16,7 +16,7 @@ disableKinds = ["taxonomy", "term"] description = "My personal IndieWeb site. I write about and develop software to promote user autonomy. Topics include accessibility, security, privacy, and software freedom." src = "https://sr.ht/~seirdy/seirdy.one/" canonicalBaseURL = "https://seirdy.one" # I have mirrors with different baseURLs - webmentionEndpoint = "https://seirdy.one/webmentions/receive" + webmentionEndpoint = "https://collector.seirdy.one/webmentions/receive" logUrlPrefix = "https://git.sr.ht/~seirdy/seirdy.one/log/master/item/" copyright = "Copyright © 2023 Rohan “Seirdy” Kumar" dark = "auto" diff --git a/content/meta/csp-bug-reproduction.md b/content/meta/csp-bug-reproduction.md index d6c0cc0..f9515cf 100644 --- a/content/meta/csp-bug-reproduction.md +++ b/content/meta/csp-bug-reproduction.md @@ -15,7 +15,7 @@ What this page demonstrates This is a test page that demonstrates the following Content-Security-Policy (CSP): ``` -default-src 'none' 'report-sample';img-src 'self';style-src 'sha256-7cS8Hu9ov7dRhfioeeb9J8mtB9/iLLpVIZsMM+BJUcs=' 'report-sample';frame-ancestors 'none';base-uri 'none';form-action https://seirdy.one/webmentions/receive https://seirdy.one/search/;manifest-src 'self';media-src 'self';sandbox allow-same-origin allow-scripts allow-forms;report-uri https://collector.seirdy.one;connect-src https://collector.seirdy.one +default-src 'none' 'report-sample';img-src 'self';style-src 'sha256-7cS8Hu9ov7dRhfioeeb9J8mtB9/iLLpVIZsMM+BJUcs=' 'report-sample';frame-ancestors 'none';base-uri 'none';form-action https://collector.seirdy.one/webmentions/receive https://seirdy.one/search/;manifest-src 'self';media-src 'self';sandbox allow-same-origin allow-scripts allow-forms;report-uri https://collector.seirdy.one;connect-src https://collector.seirdy.one ``` Here's a multi-line version, to reduce horizontal scrolling: @@ -26,7 +26,7 @@ img-src 'self'; style-src 'sha256-HASH' 'report-sample'; frame-ancestors 'none'; base-uri 'none'; -form-action https://seirdy.one/webmentions/receive https://seirdy.one/search/; +form-action https://collector.seirdy.one/webmentions/receive https://seirdy.one/search/; manifest-src 'self'; media-src 'self'; sandbox allow-same-origin allow-scripts allow-forms; @@ -45,7 +45,7 @@ img-src 'self'; style-src 'sha256-HASH'; frame-ancestors 'none'; base-uri 'none'; -form-action https://seirdy.one/webmentions/receive https://seirdy.one/search/; +form-action https://collector.seirdy.one/webmentions/receive https://seirdy.one/search/; manifest-src 'self'; upgrade-insecure-requests; sandbox allow-same-origin allow-forms diff --git a/layouts/partials/webmentions/webmention-form.html b/layouts/partials/webmentions/webmention-form.html index 629267d..82fedf4 100644 --- a/layouts/partials/webmentions/webmention-form.html +++ b/layouts/partials/webmentions/webmention-form.html @@ -2,7 +2,7 @@ Publish a response on your own website, and link back to this page's canonical location. Then share your link here to turn it into a Webmention.
+ action="{{ .Site.Params.webmentionEndpoint }}" method="post"> {{ $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" -}} diff --git a/linter-configs/htmltest.yml b/linter-configs/htmltest.yml index cec2840..03ee3a6 100644 --- a/linter-configs/htmltest.yml +++ b/linter-configs/htmltest.yml @@ -37,7 +37,7 @@ IgnoreURLs: - "https://archive.ph" - "https://archive.today" - "https://ogp.me/ns" - - "https://seirdy.one/webmentions/" + - "https://collector.seirdy.one/webmentions/" - "http://creativecommons.org/ns" - "https://seirdy.one/search/" # - "https://seirdy.one/.well-known/webfinger?resource=acct%3Aseirdy%40seirdy.one" diff --git a/scripts/get-webmentions.sh b/scripts/get-webmentions.sh index 44989f6..84524dd 100644 --- a/scripts/get-webmentions.sh +++ b/scripts/get-webmentions.sh @@ -9,8 +9,8 @@ set -e -u dirname="$(dirname "$0")" curl_wrapper="$dirname/curl-wrapper.sh" -auth_url='https://seirdy.one/webmentions/authenticate/access-key' -webmentions_url='https://seirdy.one/webmentions/manage/mentions?limit=9999&status=approved' +auth_url='https://collector.seirdy.one/webmentions/authenticate/access-key' +webmentions_url='https://collector.seirdy.one/webmentions/manage/mentions?limit=9999&status=approved' webmentions_file="$dirname/../data/webmentions.json" stale_after_minutes=90 diff --git a/static/webfinger.json b/static/webfinger.json index 077a767..0c28ef5 100644 --- a/static/webfinger.json +++ b/static/webfinger.json @@ -49,7 +49,7 @@ }, { "rel": "webmention", - "href": "https://seirdy.one/webmentions/receive" + "href": "https://collector.seirdy.one/webmentions/receive" }, { "rel": "http://webfinger.net/rel/profile-page",