From 3869d50b95a670241ba3ec75249c4f572282b8ef Mon Sep 17 00:00:00 2001 From: Marcus Rohrmoser Date: Fri, 20 Dec 2024 11:11:40 +0100 Subject: [PATCH] Seppo.Social -> Seppo.mro.name --- Changelog.txt | 14 +++++++------- Makefile | 2 +- README.txt.tpl | 10 +++++----- as2_vocab/types.ml | 2 +- bin/index.mld | 2 +- bin/shell.ml | 4 ++-- c.sh | 8 ++++---- chkr/cgi.ml | 2 +- chkr/index.mld | 4 ++-- chkr/shell.ml | 2 +- deploy.sh | 4 ++-- doap.rdf | 8 ++++---- doap.ttl | 8 ++++---- doc/wb/themes/current/actor.xsl | 2 +- doc/wb/themes/current/backoffice.xsl | 14 +++++++------- doc/wb/themes/current/configform.xsl | 8 ++++---- doc/wb/themes/current/posts.xsl | 4 ++-- doc/wb/themes/current/timeline.xsl | 2 +- lib/cgi.ml | 4 ++-- lib/http.ml | 6 +++--- lib/iweb.ml | 4 ++-- lib/st.ml | 2 +- lib/xml.ml | 4 ++-- mime.sh | 2 +- res/doap.rdf | 2 +- res/static/apchk.xml | 16 ++++++++-------- .../contrib/etc/apache2/sites-available/050-seppo.conf | 4 ++-- res/static/themes/current/actor.xsl | 2 +- res/static/themes/current/backoffice.xsl | 14 +++++++------- res/static/themes/current/configform.xsl | 8 ++++---- res/static/themes/current/posts.xsl | 4 ++-- res/static/themes/current/timeline.xsl | 2 +- res/welcome.en.txt | 2 +- test/t_ap.ml | 12 ++++++------ test/t_as2.ml | 4 ++-- test/t_iweb.ml | 2 +- test/t_rfc4287.ml | 2 +- 37 files changed, 98 insertions(+), 98 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 04b893a..7bcdd2d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,11 +1,11 @@ # v0.3, Thu Oct 19 10:54:40 CEST 2023 -Download: https://Seppo.Social/Linux-x86_64-0.3 -Binary: https://Seppo.Social/Linux-x86_64-0.3/seppo.cgi -Source: https://Seppo.Social/Linux-x86_64-0.3/source.tar.gz -Git: https://Seppo.Social/v/5f078d9 -Install: https://seppo.social/en/support/#installation +Download: https://Seppo.mro.name/Linux-x86_64-0.3 +Binary: https://Seppo.mro.name/Linux-x86_64-0.3/seppo.cgi +Source: https://Seppo.mro.name/Linux-x86_64-0.3/source.tar.gz +Git: https://Seppo.mro.name/v/5f078d9 +Install: https://seppo.mro.name/en/support/#installation Changes @@ -21,7 +21,7 @@ and parts of https://blog.mro.name/2022/12/nlnet-seppo/#7-activitypub-activities Example to verify the signature with openssl: -$ curl -LO https://Seppo.Social/seppo.pub.pem +$ curl -LO https://Seppo.mro.name/seppo.pub.pem $ openssl dgst -verify seppo.pub.pem -keyform PEM -sha256 -signature seppo.cgi.sign -binary seppo.cgi # v0.2, Tue Jun 20 16:30:35 CEST 2023 @@ -37,6 +37,6 @@ Corresponds to https://blog.mro.name/2022/12/nlnet-seppo/#3-new-instance-via-web - show help with $ ./seppo.cgi -h - create new instance and account visible via webfinger @alice@example.org - handle common error scenarios -- actionable advice on Seppo.Social/support +- actionable advice on Seppo.mro.name/support Corresponds to https://blog.mro.name/2022/12/nlnet-seppo/#1-new-instance-via-commandline-interface-cli diff --git a/Makefile b/Makefile index 0b6a260..b1a792a 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ deps: opam install . --deps-only --with-test --with-doc --yes deploy: final - rsync -avPz $(dst) $(cdst) seppo.social:~/seppo.social/_bin/`date +%FT%H%M%S`/ + rsync -avPz $(dst) $(cdst) seppo.mro.name:~/seppo.mro.name/_bin/`date +%FT%H%M%S`/ $(dst): _build/default/bin/seppo_bin.exe cp $< $@ diff --git a/README.txt.tpl b/README.txt.tpl index 5bc3190..e861f5e 100644 --- a/README.txt.tpl +++ b/README.txt.tpl @@ -3,9 +3,9 @@ Binary: seppo.cgi Source: source.tar.gz -Download: https://Seppo.Social/en/downloads/seppo-$ver -Git: https://Seppo.Social/v/$GIT_SHA -Install: https://seppo.social/en/support/#installation +Download: https://Seppo.mro.name/en/downloads/seppo-$ver +Git: https://Seppo.mro.name/v/$GIT_SHA +Install: https://seppo.mro.name/en/support/#installation Changes @@ -29,9 +29,9 @@ v0.4 - app/var/run/cookie.sec persistence format - app/var/db/notify.cdb persistence format - various commandline helpers (seppo.cgi -h) -- https optional https://seppo.social/issues/8 +- https optional https://seppo.mro.name/issues/8 Verify the signature with openssl: -$ curl -LO https://Seppo.Social/seppo.pub.pem +$ curl -LO https://Seppo.mro.name/seppo.pub.pem $ openssl dgst -verify seppo.pub.pem -keyform PEM -sha256 -signature seppo.cgi.signature -binary seppo.cgi diff --git a/as2_vocab/types.ml b/as2_vocab/types.ml index 2561b65..7f92ad4 100644 --- a/as2_vocab/types.ml +++ b/as2_vocab/types.ml @@ -142,7 +142,7 @@ type public_key = { \{ "name": "Support", - "value": "Seppo.Social/support", + "value": "Seppo.mro.name/support", "type": "PropertyValue" \}, *) diff --git a/bin/index.mld b/bin/index.mld index 1f915c7..6b49e8f 100644 --- a/bin/index.mld +++ b/bin/index.mld @@ -1,7 +1,7 @@ {0 Seppo} A {{:https://datatracker.ietf.org/doc/html/rfc3875}CGI} to deploy on a webserver -and have a Social Web server as e.g. {:https://seppo.social/aseppototry/} +and have a Social Web server as e.g. {:https://seppo.mro.name/aseppototry/} Implements {{:https://www.w3.org/TR/activitypub}ActivityPub} and {{:https://www.rfc-editor.org/rfc/rfc7033}WebFinger}. diff --git a/bin/shell.ml b/bin/shell.ml index 3eb8bcc..b20bb0a 100644 --- a/bin/shell.ml +++ b/bin/shell.ml @@ -42,12 +42,12 @@ let err i msgs = let exec (args : string list) = let print_version oc = let exe = Filename.basename Sys.executable_name in - Printf.fprintf oc "%s: https://Seppo.Social/v/%s+%s\n" exe Version.dune_project_version Version.git_sha; + Printf.fprintf oc "%s: https://Seppo.mro.name/v/%s+%s\n" exe Version.dune_project_version Version.git_sha; 0 and print_help oc = let _exe = Filename.basename Sys.executable_name in Printf.fprintf oc - {|Some basic tasks on Seppo.Social installations. + {|Some basic tasks on Seppo.mro.name installations. If run from commandline: diff --git a/c.sh b/c.sh index 9b8ee73..ae72b20 100755 --- a/c.sh +++ b/c.sh @@ -51,17 +51,17 @@ done ls -l ./*.signature echo deploy -for dst in dev.seppo.social dev1.seppo.social +for dst in dev.seppo.mro.name dev1.seppo.mro.name do echo "$dst" | figlet - arch="$(ssh "$dst" uname -sm | tr ' ' '-')" - rsync -avPz -- *"-$arch"-*.cgi* "$dst":~/seppo.social/dev/ || { + arch="$(ssh -4 "$dst" uname -sm | tr ' ' '-')" + rsync -4 -avPz -- *"-$arch"-*.cgi* "$dst":~/mro.name/dev.seppo/ || { beep ; beep ; beep continue } f="$(ls -t "seppo-$arch"-*.cgi | head -n 1)" - ssh "$dst" "cd seppo.social/dev && rm seppo.cgi ; ln -s $f seppo.cgi" + ssh -4 "$dst" "cd mro.name/dev.seppo && rm seppo.cgi ; ln -s $f seppo.cgi" done beep diff --git a/chkr/cgi.ml b/chkr/cgi.ml index 7449bfb..6e6db1d 100644 --- a/chkr/cgi.ml +++ b/chkr/cgi.ml @@ -158,7 +158,7 @@ let handle uuid _ic (req : Cgi.Request.t) : Cgi.Response.t = | "/actor.jsa", `GET -> r |> actor_jsa uuid | "/version", `GET -> Printf.sprintf - "https://Seppo.Social/v/%s+%s" Version.dune_project_version Version.git_sha + "https://Seppo.mro.name/v/%s+%s" Version.dune_project_version Version.git_sha |> Http.s302 | "/webfinger", `GET -> r.query_string |> Uri.query_of_encoded |> webfinger | "/css", `GET -> "/apchk.css" |> send_res Http.Mime.text_css diff --git a/chkr/index.mld b/chkr/index.mld index 6c44c5c..67ede31 100644 --- a/chkr/index.mld +++ b/chkr/index.mld @@ -1,8 +1,8 @@ {0 apchk} A {{:https://datatracker.ietf.org/doc/html/rfc3875}CGI} to deploy on a webserver -and have a checker like {:https://seppo.social/aseppototry/apchk.cgi} +and have a checker like {:https://seppo.mro.name/aseppototry/apchk.cgi} -Part of {:https://Seppo.Social}, generously funded as {:https://nlnet.nl/project/Seppo/} +Part of {:https://Seppo.mro.name}, generously funded as {:https://nlnet.nl/project/Seppo/} as part of the {{:https://www.ngi.eu/ngi-projects/ngi-zero/}NGI0} programme of the đŸ‡ĒđŸ‡ē European Commission. diff --git a/chkr/shell.ml b/chkr/shell.ml index 4cd0278..5f11a38 100644 --- a/chkr/shell.ml +++ b/chkr/shell.ml @@ -59,7 +59,7 @@ let actor ?(key = None) u = let exec (args : string list) = let print_version oc = let exe = Filename.basename Sys.executable_name in - Printf.fprintf oc "%s: https://Seppo.Social/v/%s+%s\n" exe Version.dune_project_version Version.git_sha; + Printf.fprintf oc "%s: https://Seppo.mro.name/v/%s+%s\n" exe Version.dune_project_version Version.git_sha; 0 and print_help oc = let _exe = Filename.basename Sys.executable_name in diff --git a/deploy.sh b/deploy.sh index b68a8d3..e4dd641 100644 --- a/deploy.sh +++ b/deploy.sh @@ -3,5 +3,5 @@ set -e set -u cd "$(dirname "$0")" -rsync -avPz "$1" "seppo.social:~/seppo.social/tmp/" -ssh seppo.social "sh seppo.social/archive/accept.sh ~/seppo.social/tmp/$(basename "$1")" +rsync -avPz "$1" "archive.seppo.mro.name:~/mro.name/seppo.archive/tmp/" +ssh archive.seppo.mro.name "sh mro.name/archive.seppo/accept.sh ~/mro.name/seppo.archive/tmp/$(basename "$1")" diff --git a/doap.rdf b/doap.rdf index 50d6f49..293d5a7 100644 --- a/doap.rdf +++ b/doap.rdf @@ -3,8 +3,8 @@ xmlns="http://usefulinc.com/ns/doap#"> Non-tech persons in the #fediverse. - - + + @@ -16,7 +16,7 @@ XSLT - + @@ -50,7 +50,7 @@ - + Personal Social Web. diff --git a/doap.ttl b/doap.ttl index b6d97a3..8b3be4c 100644 --- a/doap.ttl +++ b/doap.ttl @@ -5,19 +5,19 @@ :name "#Seppo!" ; :audience "Non-tech persons in the #fediverse." ; :shortdesc "Personal Social Web." ; - :homepage ; + :homepage ; :implements ; :implements ; - :service-endpoint ; + :service-endpoint ; :programming-language "OCaml" ; :programming-language "XSLT"; :programming-language "HTML"; :programming-language "JavaScript"; :license ; :maintainer ; - :bug-database ; + :bug-database ; :repository [ - :browse ; + :browse ; a :GitRepository ], [ :browse ; diff --git a/doc/wb/themes/current/actor.xsl b/doc/wb/themes/current/actor.xsl index 55382aa..838e89a 100644 --- a/doc/wb/themes/current/actor.xsl +++ b/doc/wb/themes/current/actor.xsl @@ -36,7 +36,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" xmlns:sec="https://w3id.org/security#" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="as ldp math rdf schema sec seppo" version="1.0"> diff --git a/doc/wb/themes/current/backoffice.xsl b/doc/wb/themes/current/backoffice.xsl index bc1d73c..55725c8 100644 --- a/doc/wb/themes/current/backoffice.xsl +++ b/doc/wb/themes/current/backoffice.xsl @@ -29,11 +29,11 @@ --> @@ -108,7 +108,7 @@
security.txt (RFC9116)
/.well-known/security.txt
WebFinger (RFC7033, RFC7565)
-
https://seppo.social/.well-known/webfinger?resource=acct:demo@seppo.social
+
https://seppo.mro.name/.well-known/webfinger?resource=acct:demo@seppo.mro.name
ActivityStreams 2.0 (json flavour)
ActivityPub
@@ -153,10 +153,10 @@

Software

-
Seppo.Social
-
Seppo.Social/support
-
Seppo.Social/downloads
-
Seppo.Social/development
+
Seppo.mro.name
+
Seppo.mro.name/support
+
Seppo.mro.name/downloads
+
Seppo.mro.name/development
diff --git a/doc/wb/themes/current/configform.xsl b/doc/wb/themes/current/configform.xsl index 76194d0..2f9ad65 100644 --- a/doc/wb/themes/current/configform.xsl +++ b/doc/wb/themes/current/configform.xsl @@ -85,8 +85,8 @@

../app/ access permission check: ok (https://Seppo.Social/S1005)

You are invited, but not obliged, to have a look at the files on your webspace. You find a directory themes/current/ that contains the @@ -103,14 +103,14 @@ seppo.cgi">seppo.cgi.

Banner

Upload a jpg to your webspace and rename it to me-banner.jpg - (next to seppo.cgi). See also S1007

+ (next to seppo.cgi). See also S1007

Avatar

Avatar

Upload a jpg to your webspace and rename it to me-avatar.jpg - (next to seppo.cgi). See also S1007

+ (next to seppo.cgi). See also S1007

diff --git a/doc/wb/themes/current/posts.xsl b/doc/wb/themes/current/posts.xsl index d527cf0..cecb900 100644 --- a/doc/wb/themes/current/posts.xsl +++ b/doc/wb/themes/current/posts.xsl @@ -37,8 +37,8 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" - xmlns:se="http://seppo.social/" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:se="http://seppo.mro.name/" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:toot="http://joinmastodon.org/ns#" xmlns:wf="urn:ietf:rfc:7033" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" diff --git a/doc/wb/themes/current/timeline.xsl b/doc/wb/themes/current/timeline.xsl index 5a7fc3e..826f5f0 100644 --- a/doc/wb/themes/current/timeline.xsl +++ b/doc/wb/themes/current/timeline.xsl @@ -37,7 +37,7 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:toot="http://joinmastodon.org/ns#" xmlns:wf="urn:ietf:rfc:7033" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" diff --git a/lib/cgi.ml b/lib/cgi.ml index ffc18f0..f0d2978 100644 --- a/lib/cgi.ml +++ b/lib/cgi.ml @@ -26,12 +26,12 @@ open Astring -(* https://seppo.social/S1037 *) +(* https://seppo.mro.name/S1037 *) let cgi_bin = "/cgi-bin/" (* cd to asset storage location if locked inside /cgi-bin/ (if the case). * - * https://seppo.social/S1037 + * https://seppo.mro.name/S1037 *) let cd_cgi_bin_twin_path script_name = let is_sep = Char.equal '/' diff --git a/lib/http.ml b/lib/http.ml index 2eb2f12..8de6f78 100644 --- a/lib/http.ml +++ b/lib/http.ml @@ -492,7 +492,7 @@ let get Lwt.return (response, body) ) | _ -> (* here the http header signature validation could be done. - But not for now: https://seppo.social/issues/23 *) + But not for now: https://seppo.mro.name/issues/23 *) Logr.debug (fun m -> m "%s.%s %a %a" "Http" "get" Uuidm.pp uuid Cohttp.Response.pp_hum response); Lwt.return (response, body) and f () = get_follow uri in @@ -514,7 +514,7 @@ let post let headers = body |> String.length |> H.content_length |> H.add' headers in let f () = Cohttp_lwt_unix.Client.post ~body:(`String body) ~headers uri (* here the http header signature validation could be done. - But no for now: https://seppo.social/issues/23 *) + But no for now: https://seppo.mro.name/issues/23 *) in let r = timeout ~seconds ~f in Logr.info (fun m -> m "%s.%s %a dt=%.3fs localhost -> %a" "Http" "post" Uuidm.pp uuid (Sys.time() -. t0) Uri.pp uri); @@ -538,7 +538,7 @@ let get_jsonv | #Cohttp.Code.success_status as sta -> Logr.debug (fun m -> m "%s.%s get %a %a" "Http" "get_jsonv" Uri.pp uri pp_status sta); let%lwt body = body |> Cohttp_lwt.Body.to_string in - (* doesn't validate the digest https://seppo.social/issues/23 *) + (* doesn't validate the digest https://seppo.mro.name/issues/23 *) (try (resp, body |> Ezjsonm.value_from_string) |> fkt diff --git a/lib/iweb.ml b/lib/iweb.ml index db4c545..5cc0c59 100644 --- a/lib/iweb.ml +++ b/lib/iweb.ml @@ -31,7 +31,7 @@ let ( let* ) = Result.bind let chain a b = let f a = Ok (a, b) in Result.bind a f -let seppo = Uri.make ~userinfo:"seppo" ~host:"seppo.social" () +let seppo = Uri.make ~userinfo:"seppo" ~host:"seppo.mro.name" () let to_channel ~xsl oc l (** Write a xml document to a channel. @@ -50,7 +50,7 @@ https://github.com/dimtion/Shaarlier |} in Xml.to_chan ~xsl ~readme l oc -(** Redirect to work properly on /cgi-bin/ webservers. See https://seppo.social/S1037 +(** Redirect to work properly on /cgi-bin/ webservers. See https://seppo.mro.name/S1037 * * request_uri the requested uri * r request meta data diff --git a/lib/st.ml b/lib/st.ml index d69b28c..3ad8480 100644 --- a/lib/st.ml +++ b/lib/st.ml @@ -1,6 +1,6 @@ let camel = "đŸĢ" -let seppo_s = "Seppo.Social" +let seppo_s = "Seppo.mro.name" let seppo_u = Uri.make ~scheme:"https" ~host:seppo_s () let seppo_c = "Seppo - Personal Social Web" diff --git a/lib/xml.ml b/lib/xml.ml index e0f272c..90460fb 100644 --- a/lib/xml.ml +++ b/lib/xml.ml @@ -6,8 +6,8 @@ let ns_xsd = "http://www.w3.org/2001/XMLSchema" (* and ns_sec = As2_vocab.Constants.ActivityStreams.ns_sec ^ "#" *) let ns_a = "http://www.w3.org/2005/Atom" (* https://www.rfc-editor.org/rfc/rfc4287#section-2 *) let ns_thr = "http://purl.org/syndication/thread/1.0" (* https://www.rfc-editor.org/rfc/rfc4685#section-2 *) -let ns_seppo = "http://seppo.social/2023/ns#" -let ns_backoffice = "http://seppo.social/2023/backoffice#" +let ns_seppo = "http://seppo.mro.name/2023/ns#" +let ns_backoffice = "http://seppo.mro.name/2023/backoffice#" let ns_rfc7033 = "urn:ietf:rfc:7033" let ns_rfc7565 = "urn:ietf:rfc:7565" let ns_as = As2_vocab.Constants.ActivityStreams.ns_as diff --git a/mime.sh b/mime.sh index ef69845..c795e7b 100644 --- a/mime.sh +++ b/mime.sh @@ -67,5 +67,5 @@ done <<-EOF @mro@pixelfed.social Pixelfed https://pixelfed.social/users/mro @takahe@jointakahe.org Takahe https://jointakahe.takahe.social/@takahe@jointakahe.org/ @grindhold@demoday.leadfathom.grindhold.de Flohmarkt https://demoday.leadfathom.grindhold.de/users/grindhold -@2023-08-28@dev.seppo.social Seppo https://dev.seppo.social/2023-08-28/activitypub/profile.jlda +@2023-08-28@dev.seppo.mro.name Seppo https://dev.seppo.mro.name/2023-08-28/activitypub/profile.jlda EOF diff --git a/res/doap.rdf b/res/doap.rdf index 65ba8e1..0429eec 100644 --- a/res/doap.rdf +++ b/res/doap.rdf @@ -6,7 +6,7 @@ #seppo - + OCaml diff --git a/res/static/apchk.xml b/res/static/apchk.xml index 2010f8b..cb1a0a1 100644 --- a/res/static/apchk.xml +++ b/res/static/apchk.xml @@ -5,7 +5,7 @@ - + Resolve WebFinger RFC7033 etc. @@ -16,7 +16,7 @@ (WebFinger URIs),
  • http GET the JSON Resource Descriptor,
    • -
  • parse as understood by #Seppo,
    • +
  • parse as understood by #Seppo,
  • re-encode and return as json. Usually a subset of the input.
  • Http GET the ActivityPub Actor Profile,
    • -
  • parse as understood by #Seppo,
    • +
  • parse as understood by #Seppo,
  • re-encode and return as json. Usually a subset of the input.

    • Signs the GET request with @@ -51,15 +51,15 @@

    About apchk.cgi

    This is an ephemeral (stateless), single-file cgi program. Operate it yourself on commodity shared - webspace: Download apchk.cgi, copy it + webspace: Download apchk.cgi, copy it to a cgi-capable webserver, make it executable (chmod 555) and you're set. To style it to your liking, redirect ./css or ./xsl to yours. The source is free and open.

    + "https://seppo.mro.name/development/">source is free and open.

    Version, Issues & Improvements.

    + "http://seppo.mro.name/issues?labels=apchk.cgi">Issues & Improvements.

    Generously supported by đŸ‡ĒđŸ‡ē - @EC_NGI@ec.social-network.europa.eu under NLnet grant + "webfinger?redirect-rel=http://webfinger.net/rel/profile-page&resource=acct:EC_NGI@ec.mro.name-network.europa.eu"> + @EC_NGI@ec.mro.name-network.europa.eu under NLnet grant #Seppo.

    diff --git a/res/static/contrib/etc/apache2/sites-available/050-seppo.conf b/res/static/contrib/etc/apache2/sites-available/050-seppo.conf index 201ff23..5a81c87 100644 --- a/res/static/contrib/etc/apache2/sites-available/050-seppo.conf +++ b/res/static/contrib/etc/apache2/sites-available/050-seppo.conf @@ -1,4 +1,4 @@ -# See https://Seppo.Social/issues/22 +# See https://Seppo.mro.name/issues/22 # # the .htaccess files that come with #Seppo automatically should be ok to run # seppo.cgi on typical shared hosting environments. @@ -11,7 +11,7 @@ # Be sure to update the ServerAdmin and SeverName fields with your real information. # This version configures https. Change *:443 to *:80 to support plain http connections. # -# thanks https://seppo.social/issues/8#issue-713310 +# thanks https://seppo.mro.name/issues/8#issue-713310 ServerAdmin you@example.org diff --git a/res/static/themes/current/actor.xsl b/res/static/themes/current/actor.xsl index 55382aa..838e89a 100644 --- a/res/static/themes/current/actor.xsl +++ b/res/static/themes/current/actor.xsl @@ -36,7 +36,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" xmlns:sec="https://w3id.org/security#" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="as ldp math rdf schema sec seppo" version="1.0"> diff --git a/res/static/themes/current/backoffice.xsl b/res/static/themes/current/backoffice.xsl index bc1d73c..55725c8 100644 --- a/res/static/themes/current/backoffice.xsl +++ b/res/static/themes/current/backoffice.xsl @@ -29,11 +29,11 @@ --> @@ -108,7 +108,7 @@
    security.txt (RFC9116)
    /.well-known/security.txt
    WebFinger (RFC7033, RFC7565)
    -
    https://seppo.social/.well-known/webfinger?resource=acct:demo@seppo.social
    +
    https://seppo.mro.name/.well-known/webfinger?resource=acct:demo@seppo.mro.name
    ActivityStreams 2.0 (json flavour)
    ActivityPub
    @@ -153,10 +153,10 @@

    Software

    -
    Seppo.Social
    -
    Seppo.Social/support
    -
    Seppo.Social/downloads
    -
    Seppo.Social/development
    +
    Seppo.mro.name
    +
    Seppo.mro.name/support
    +
    Seppo.mro.name/downloads
    +
    Seppo.mro.name/development
    diff --git a/res/static/themes/current/configform.xsl b/res/static/themes/current/configform.xsl index 76194d0..2f9ad65 100644 --- a/res/static/themes/current/configform.xsl +++ b/res/static/themes/current/configform.xsl @@ -85,8 +85,8 @@

    ../app/ access permission check: ok (https://Seppo.Social/S1005)

    You are invited, but not obliged, to have a look at the files on your webspace. You find a directory themes/current/ that contains the @@ -103,14 +103,14 @@ seppo.cgi">seppo.cgi.

    Banner

    Upload a jpg to your webspace and rename it to me-banner.jpg - (next to seppo.cgi). See also S1007

    + (next to seppo.cgi). See also S1007

    Avatar

    Avatar

    Upload a jpg to your webspace and rename it to me-avatar.jpg - (next to seppo.cgi). See also S1007

    + (next to seppo.cgi). See also S1007

    diff --git a/res/static/themes/current/posts.xsl b/res/static/themes/current/posts.xsl index d527cf0..cecb900 100644 --- a/res/static/themes/current/posts.xsl +++ b/res/static/themes/current/posts.xsl @@ -37,8 +37,8 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" - xmlns:se="http://seppo.social/" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:se="http://seppo.mro.name/" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:toot="http://joinmastodon.org/ns#" xmlns:wf="urn:ietf:rfc:7033" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" diff --git a/res/static/themes/current/timeline.xsl b/res/static/themes/current/timeline.xsl index 5a7fc3e..826f5f0 100644 --- a/res/static/themes/current/timeline.xsl +++ b/res/static/themes/current/timeline.xsl @@ -37,7 +37,7 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:schema="http://schema.org#" - xmlns:seppo="http://seppo.social/2023/ns#" + xmlns:seppo="http://seppo.mro.name/2023/ns#" xmlns:toot="http://joinmastodon.org/ns#" xmlns:wf="urn:ietf:rfc:7033" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" diff --git a/res/welcome.en.txt b/res/welcome.en.txt index fe78228..5b650fb 100644 --- a/res/welcome.en.txt +++ b/res/welcome.en.txt @@ -14,4 +14,4 @@ That being settled, you can - #boost 🔁 or #reply ↩ī¸ to others' posts. If you feel for the company of peers or want #support 🤞, have a look at -https://seppo.social/support +https://seppo.mro.name/support diff --git a/test/t_ap.ml b/test/t_ap.ml index 39a4ce0..b0619cc 100644 --- a/test/t_ap.ml +++ b/test/t_ap.ml @@ -65,7 +65,7 @@ let tc_inbox_unfollow () = o.obj.object_ |> Uri.to_string |> A.equals_string __LOC__ "https://dev.seppo.social/2023-06-12/activitypub/profile.json"; assert (o.actor |> Uri.equal o.obj.actor); (* - a.object_ |> A.equals_uri __LOC__ (Uri.of_string "https://dev.seppo.social/2023-06-12/activitypub/profile.json"); + a.object_ |> A.equals_uri __LOC__ (Uri.of_string "https://dev.seppo.mro.name/2023-06-12/activitypub/profile.json"); match a.state with | None -> () | _ -> "-" |> A.equals_string __LOC__ "" @@ -207,14 +207,14 @@ module Note = struct title = "Title"; published = Rfc3339.T "2023-10-24T11:12:13+02:00"; updated = Rfc3339.T "2023-10-24T11:12:13+02:00"; - links = [Link.make ("https://Seppo.Social/demo" |> Uri.of_string) ]; + links = [Link.make ("https://Seppo.mro.name/demo" |> Uri.of_string) ]; content = "string"; } in e.title |> check string __LOC__ "Title"; let n = e |> Ap.Note.of_rfc4287 in let _,su = n.summary_map |> List.hd in su |> check string __LOC__ "Title"; - n.url |> List.hd |> Uri.to_string |> check string __LOC__ "https://seppo.social/demo" + n.url |> List.hd |> Uri.to_string |> check string __LOC__ "https://seppo.mro.name/demo" let tc_create_note_json () = Logr.info (fun m -> m "%s.%s" "Ap_test" "test_create_note_json"); @@ -257,7 +257,7 @@ module Note = struct sensitive = true; content_map= ["de","Inhalt"]; summary_map= ["de","⚠ī¸ Summary"]; - url = ["https://Seppo.Social/demo" |> Uri.of_string]; + url = ["https://Seppo.mro.name/demo" |> Uri.of_string]; } in let base = Uri.empty in let minify = false in @@ -271,7 +271,7 @@ module Note = struct "attributedTo": "", "mediaType": "text/html; charset=utf8", "contentMap": { - "de": "https://seppo.social/demo
    \n
    \nInhalt" + "de": "https://seppo.mro.name/demo
    \n
    \nInhalt" }, "sensitive": true, "summaryMap": { @@ -592,7 +592,7 @@ let tc_decode_create_notes () = http://example.com/seppo.cgi/p-37/ ti 2024-06-19 16:15:14+02:00 - Seppo - Personal Social Web + Seppo - Personal Social Web diff --git a/test/t_as2.ml b/test/t_as2.ml index f28e040..bac4646 100644 --- a/test/t_as2.ml +++ b/test/t_as2.ml @@ -117,7 +117,7 @@ let tc_person = "tc_person", `Quick, (fun () -> "discoverable": true, "generator": { "type": "Link", - "href": "https://seppo.social", + "href": "https://seppo.mro.name", "name": "Seppo - Personal Social Web" }, "icon": { @@ -145,7 +145,7 @@ let tc_person = "tc_person", `Quick, (fun () -> ~blocked:(Some As2.No_p_yes.Yes) ~lang ~base |> tos - |> check string __LOC__ {| + |> check string __LOC__ {| foo no diff --git a/test/t_iweb.ml b/test/t_iweb.ml index 5392a57..589493d 100644 --- a/test/t_iweb.ml +++ b/test/t_iweb.ml @@ -312,7 +312,7 @@ let tc_xhtml = "tc_xhtml", `Quick, (fun () -> - + a diff --git a/test/t_rfc4287.ml b/test/t_rfc4287.ml index 008e521..5b6da4b 100644 --- a/test/t_rfc4287.ml +++ b/test/t_rfc4287.ml @@ -318,7 +318,7 @@ let tc_feed_atom () = https://example.com/sub/o/p-11/ My fancy #Seppo! 2023-02-27T12:34:56+01:00 - Seppo - Personal Social Web + Seppo - Personal Social Web -- 2.11.4.GIT