attempt to replace references to demeter

It is better to use a server hostname-neutral reference where possible.

4 files changed, 30 insertions, 26 deletions

diff --git a/.config/git/config b/.config/git/config
index 09c01894..efbe7791 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -83,16 +83,18 @@
 	email = spwhitton@spwhitton.name
 
 [url "https://git.spwhitton.name/"]
-	 insteadOf = demeter:
+	 insteadOf = spw:
 	 insteadOf = git://git.spwhitton.name/
 	 insteadOf = http://git.spwhitton.name/
 	 insteadOf = athena:		     # for compatibility only
+	 insteadOf = demeter:		     # for compatibility only
 	 insteadOf = git://spwhitton.name/   # for compatibility only
 [url "git@git.spwhitton.name:"]
 	 pushInsteadOf = http://git.spwhitton.name/
 	 pushInsteadOf = https://git.spwhitton.name/
 	 pushInsteadOf = git://git.spwhitton.name/
-	 pushInsteadOf = demeter:
+	 pushInsteadOf = spw:
+	 pushInsteadOf = demeter:	       # for compatibility only
 	 pushInsteadOf = athena:	       # for compatibility only
 	 pushInsteadOf = git://spwhitton.name/ # for compatibility only
 
diff --git a/.ssh/config b/.ssh/config
index 82beadc5..5f003ec1 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -34,7 +34,7 @@ HostName athena.silentflame.com
 ForwardAgent yes
 IdentityFile ~/.ssh/id_athena
 
-# For demeter's gitolite installation.
+# For personal gitolite installation.
 Host git.spwhitton.name spwhitton.name
 IdentityFile ~/.ssh/id_athena
 
diff --git a/bin/locmaint b/bin/locmaint
index a2c442d9..9bdce9ef 100755
--- a/bin/locmaint
+++ b/bin/locmaint
@@ -106,7 +106,7 @@ our @remote_annexes = (
     { origin => "athenag:annex.git",   homedir => "lib/annex", lazy => 1 },
     { origin => "athenag:annex19.git", homedir => "annex" },
     { origin => "athenag:libpriv.git", homedir => "lib/priv" },
-    { origin => "athena:wikiannex",    homedir => "lib/wikiannex" },
+    { origin => "git@git.spwhitton.name:wikiannex", homedir => "lib/wikiannex" },
     { origin => "athenap:athpriv",     homedir => "src/athpriv", synconlyannex => 1 });
 
 for (getpwuid($<) . '@' . `hostname -f`) {
@@ -394,15 +394,16 @@ sub do_coldbkup {
         # point, to grab metadata non-recursively
     }
 
-    # athena main repos
-    mkdir catfile($gitbk, "athena"); # compat dirname
+    # git.spwhitton.name main repos
+    mkdir catfile($gitbk, "athena"); # use 'athena' for backup drive compat
     my @athena_repos = map {
         if (m|^/srv/git/repositories/priv/(.+)\.git$|) {
             { uri => "athenap:$1", dir => "priv/$1.git" }
         } elsif (m|^/srv/git/repositories/(.+)\.git$|) {
             { uri => "athena:$1", dir => "$1.git" }
         }
-    } `ssh demeter find /srv/git/repositories -name "*.git" -type d 2>/dev/null`;
+    } `ssh spwhitton\@git.spwhitton.name\\
+ find /srv/git/repositories -name "*.git" -type d 2>/dev/null`;
     backup_repo($_->{uri}, catfile($gitbk, "athena", $_->{dir}))
       for @athena_repos;
 
diff --git a/lib-src/mr/config b/lib-src/mr/config
index 333e899d..daeb2981 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -187,7 +187,7 @@ autoci =
 pre_update = mr autoci
 
 [src/athpriv]
-checkout = git clone demeterp:athpriv
+checkout = git clone spwp:athpriv
 pre_update = on athena || git annex sync origin athenah
 pre_push = on athena || git annex sync --content origin athenah
 post_update = hstow restow ~/src/athpriv
@@ -214,7 +214,7 @@ fixups =
 ####################################################################
 
 [doc]
-checkout = git clone demeterp:doc doc
+checkout = git clone spwp:doc doc
 update = git pull --rebase=false --no-edit "$@"
 autoci = doccheckin
 pre_update = win32 || doccheckin
@@ -225,17 +225,17 @@ post_checkout = git utime
 skip = ! mine
 
 [src/wiki]
-checkout = git clone demeter:wiki
+checkout = git clone spw:wiki
 skip = ! mine
 
 [lib/realloc]
-checkout = git clone demeterp:realloc
+checkout = git clone spwp:realloc
 skip = ! mine
 
 ####################################################################
 
 [lib/radicale]
-checkout = git clone demeterp:radicale radicale
+checkout = git clone spwp:radicale radicale
 skip = ! on spwhitton@athena
 
 [public_html]
@@ -266,15 +266,16 @@ push = git annex sync --content cloud origin
 skip = lazy
 
 [lib/wikiannex]
-checkout = git clone demeter:wikiannex
+# legacy url for the origin remote
+checkout = git clone git@git.spwhitton.name:wikiannex
 post_checkout = cd wikiannex; git annex init
 update = git annex sync --no-content
 push = git annex sync --content
-fixups = ! on demeter || git annex adjust --hide-missing --unlock
+fixups = ! on leto || git annex adjust --hide-missing --unlock
 skip = lazy
 
 [lib/podcasts]
-checkout = git clone demeterp:podcasts
+checkout = git clone spwp:podcasts
 post_checkout = cd podcasts; git annex init
 update = ./update-and-sync
 push = git annex --no-content sync
@@ -333,9 +334,9 @@ isclean =
 #     This branch doesn't usually need to be pushed anywhere, but if we do
 #     need to push it somewhere for backup purposes, we execute
 #
-#     % git config branch."$(hostname -s)".pushRemote demeter
+#     % git config branch."$(hostname -s)".pushRemote spwhitton
 #
-#     and then 'mr push' will force push it to demeter.
+#     and then 'mr push' will force push it to git.spwhitton.name.
 #
 # "athena/unstable" branch:
 #
@@ -375,10 +376,10 @@ isclean =
 #
 #     If need to back out before reprepro-rebuilder:
 #         % cd ~//src/deb/emacs-snapshot
-#         % git reset --hard demeter/athena/unstable
+#         % git reset --hard spwhitton/athena/unstable
 #
 #     It is important to test local installability of the new .deb, probably
-#     in develacc or a sid chroot, before adding to demeter-apt, because
+#     in develacc or a sid chroot, before adding to athenet-apt, because
 #     running the rebased "melete" branch doesn't detect any byte compilation
 #     issues against my current selection of elpa-* packages.
 #
@@ -395,7 +396,7 @@ checkout = git clone https://git.savannah.gnu.org/git/emacs.git trunk
 post_clean = ./autogen.sh autoconf
 post_checkout =
     cd trunk
-    git remote add -f demeter demeter:emacs ||:
+    git remote add -f spwhitton spw:emacs ||:
     git -c fetch.fsckObjects=false \
     	remote add -f debian https://salsa.debian.org/rlb/deb-emacs.git/ ||:
     ./autogen.sh all
@@ -406,8 +407,8 @@ skip = lazy
 checkout = git_worktree_checkout "$HOME/src/emacs/trunk" \
     -b "$hostname" --no-track \
     "$(if [ -n "$(git -C $HOME/src/emacs/trunk \
-    	       	      for-each-ref '[r]efs/remotes/demeter/'"$hostname")" ]
-	  then echo demeter/"$hostname"; else echo master; fi)"
+    	       	      for-each-ref '[r]efs/remotes/spwhitton/'"$hostname")" ]
+	  then echo spwhitton/"$hostname"; else echo master; fi)"
 post_clean = ./autogen.sh autoconf
 post_checkout = cd primary; ./autogen.sh autoconf
 # We don't have the "$(hostname -s)" branch's upstream set to origin/master to
@@ -439,7 +440,7 @@ skip = lazy || git_worktree_skip
 
 [src/deb/emacs-snapshot]
 checkout = git_worktree_checkout "$HOME/src/emacs/trunk" \
-    -b athena/unstable demeter/athena/unstable
+    -b athena/unstable spwhitton/athena/unstable
 skip = ! workstation || git_worktree_skip
 
 [src/deb/emacs]
@@ -479,12 +480,12 @@ skip = lazy
 checkout = git clone salsa:dgit-team/dgit
 post_checkout =
     cd dgit
-    git remote add -f demeter demeter:dgit ||:
+    git remote add -f spwhitton spw:dgit ||:
     dgit setup-new-tree
 skip = lazy
 
 [src/p5-Git-Annex]
-checkout = git clone demeter:p5-Git-Annex
+checkout = git clone spw:p5-Git-Annex
 post_checkout =
     cd p5-Git-Annex
     git remote \
@@ -493,7 +494,7 @@ post_checkout =
 skip = lazy
 
 [src/p5-API-GitForge]
-checkout = git clone demeter:p5-API-GitForge
+checkout = git clone spw:p5-API-GitForge
 post_checkout =
     cd p5-API-GitForge
     git remote \