attempt git config updates for recent file & git hosting changes

1 files changed, 29 insertions, 29 deletions

diff --git a/.mrconfig.in b/.mrconfig.in
index 68ce023e..ee2f029d 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -291,7 +291,7 @@ pre_stow = homedir_mkdirs
 post_stow = load-trustdb
 
 [src/athpriv]
-checkout = git clone athenap:athpriv athpriv
+checkout = git clone demeterp:athpriv athpriv
 stowable = true
 skip = ! mine
 
@@ -307,7 +307,7 @@ pre_update_append = always_adopt .config/rss2email.cfg
 # --- hosts configuration
 
 [src/propellor]
-checkout = git clone athena:propellor propellor --branch spw3conf
+checkout = git clone demeter:propellor propellor --branch spw3conf
 post_checkout =
     cd propellor
     # get new release tags for merging into 'spw3conf' and 'debian' branches
@@ -332,7 +332,7 @@ skip = ! workstation
 # --- personal website source
 
 [src/wiki]
-checkout = git clone athena:wiki
+checkout = git clone demeter:wiki
 skip = ! mine
 
 # --- misc. source repos with special config (e.g. installation of git
@@ -342,7 +342,7 @@ skip = ! mine
 checkout = git clone salsa:dgit-team/dgit
 post_checkout =
     cd dgit
-    git remote add -f athena athena:dgit
+    git remote add -f demeter demeter:dgit
     dgit setup-new-tree
     install-git-hooks dgit
 skip = lazy
@@ -355,7 +355,7 @@ skip = lazy
 # skip = lazy
 
 [src/grml-live]
-checkout = git clone athena:grml-live -b spw/std
+checkout = git clone demeter:grml-live -b spw/std
 post_checkout =
     cd grml-live
     git remote add -f upstream github:grml/grml-live
@@ -363,7 +363,7 @@ fixups = git config commit.gpgsign true
 skip = lazy
 
 [src/mailscripts]
-checkout = git clone 'athena:mailscripts' 'mailscripts'
+checkout = git clone 'demeter:mailscripts' 'mailscripts'
 post_checkout =
     cd mailscripts
     install-git-hooks mailscripts
@@ -372,7 +372,7 @@ post_checkout =
 skip = ! workstation
 
 [src/p5-Git-Annex]
-checkout = git clone athena:p5-Git-Annex p5-Git-Annex
+checkout = git clone demeter:p5-Git-Annex p5-Git-Annex
 post_checkout =
     cd p5-Git-Annex
     install-git-hooks p5-Git-Annex
@@ -383,7 +383,7 @@ post_checkout =
 skip = lazy
 
 [src/p5-API-GitForge]
-checkout = git clone athena:p5-API-GitForge p5-API-GitForge
+checkout = git clone demeter:p5-API-GitForge p5-API-GitForge
 post_checkout =
     cd p5-API-GitForge
     install-git-hooks p5-API-GitForge
@@ -393,35 +393,35 @@ post_checkout =
 skip = lazy
 
 [src/org-d20]
-checkout = git clone 'athena:org-d20' 'org-d20'
+checkout = git clone 'demeter:org-d20' 'org-d20'
 post_checkout =
     cd org-d20
     install-git-hooks org-d20
 skip = lazy
 
 [src/haskell-tab-indent]
-checkout = git clone 'athena:haskell-tab-indent' 'haskell-tab-indent'
+checkout = git clone 'demeter:haskell-tab-indent' 'haskell-tab-indent'
 post_checkout =
     cd haskell-tab-indent
     install-git-hooks haskell-tab-indent
 skip = lazy
 
 [src/git-remote-gcrypt]
-checkout = git clone 'athena:git-remote-gcrypt' 'git-remote-gcrypt'
+checkout = git clone 'demeter:git-remote-gcrypt' 'git-remote-gcrypt'
 post_checkout =
     cd git-remote-gcrypt
     install-git-hooks git-remote-gcrypt
 skip = ! workstation
 
 [src/pandoc-citeproc-preamble]
-checkout = git clone 'athena:pandoc-citeproc-preamble' 'pandoc-citeproc-preamble'
+checkout = git clone 'demeter:pandoc-citeproc-preamble' 'pandoc-citeproc-preamble'
 post_checkout =
     cd pandoc-citeproc-preamble
     install-git-hooks pandoc-citeproc-preamble
 skip = lazy
 
 [src/cl/consfigurator]
-checkout = git clone 'athenap:consfigurator' 'consfigurator'
+checkout = git clone 'demeter:consfigurator' 'consfigurator'
 post_checkout =
     cd git-remote-gcrypt
     install-git-hooks consfigurator
@@ -443,7 +443,7 @@ skip = lazy
 # --- radicale collections
 
 [lib/radicale]
-checkout = git clone athenap:radicale radicale
+checkout = git clone demeterp:radicale radicale
 skip = ! on spwhitton@athena
 
 # could use /usr/share/mr/git-annex helper to simplify the following
@@ -458,7 +458,7 @@ checkout = git clone athenag:annex.git annex
 post_checkout =
     cd annex
     git annex init
-    git annex enableremote athena rsyncurl=athena:/srv/rsync/annex
+    git annex enableremote athena rsyncurl=athena:local/rsync/annex
 skip = ! workstation
 
 update = git annex sync --no-content origin
@@ -499,7 +499,7 @@ fixups =
 # --- personal website big files annex
 
 [lib/wikiannex]
-checkout = git clone athena:wikiannex.git
+checkout = git clone demeter:wikiannex.git
 post_checkout =
     cd wikiannex
     git annex init
@@ -507,8 +507,8 @@ post_checkout =
     # ^ the git-annex-init sets this wrong
 
     # if workstation; then
-    #     git remote add bkupsd /media/${USER}/bkupsd/git/athena/wikiannex.git
-    #     git remote add m3 /media/${USER}/m3/git/athena/wikiannex.git
+    #     git remote add bkupsd /media/${USER}/bkupsd/git/demeter/wikiannex.git
+    #     git remote add m3 /media/${USER}/m3/git/demeter/wikiannex.git
     # fi
 update = git annex sync --no-content
 push = git annex sync --content
@@ -522,7 +522,7 @@ fixups =
 # --- git annex for university stuff
 
 [lib/dionysus]
-checkout = git clone athenap:dionysus
+checkout = git clone demeterp:dionysus
 post_checkout =
     cd dionysus
     git annex init
@@ -549,7 +549,7 @@ skip = lazy
 # --- git annex for podcasts
 
 # [lib/podcasts]
-# checkout = git clone athenap:podcasts
+# checkout = git clone demeterp:podcasts
 # post_checkout =
 #     cd podcasts
 #     git annex init
@@ -607,11 +607,11 @@ skip = lazy
 # --- git annex for athena's apt repository
 
 [lib/athena-apt]
-checkout = git clone athena:athena-apt athena-apt
+checkout = git clone demeter:athena-apt athena-apt
 post_checkout =
     cd athena-apt
     git annex init --version=7
-    git annex enableremote athena
+    git annex enableremote demeter
     git annex get .
 skip = lazy
 
@@ -619,10 +619,10 @@ update = git annex sync --no-content
 push =
     git annex add
     git annex unlock db
-    git annex sync --content athena
+    git annex sync --content demeter
     git annex sync origin
-    ssh athena find /srv/www/debian -type f -exec chmod 644 '{}' +
-    ssh athena find /srv/www/debian -type d -exec chmod 755 '{}' +
+    ssh demeter find /srv/www/debian -type f -exec chmod 644 '{}' +
+    ssh demeter find /srv/www/debian -type d -exec chmod 755 '{}' +
 fixups =
     git config push.default matching
     git config annex.startupscan false
@@ -631,7 +631,7 @@ fixups =
     git config annex.thin true
     git config annex.addunlocked true
     git config mrrepo.review-unused false
-    git config remote.athena.annex-tracking-branch master
+    git config remote.demeter.annex-tracking-branch master
 
 # The git-diff-files(1) call in ~/bin/git-is-clean fails in v7
 # git-annex repos with unlocked empty files, which this repo often
@@ -641,11 +641,11 @@ isclean =
     test -z "$output" || ( echo $output && exit 1 )
 
 [lib/realloc]
-checkout = git clone athenap:realloc realloc
+checkout = git clone demeterp:realloc realloc
 skip = ! mine
 
 [lib/nmbug-spw]
-checkout = nmbug-spw clone athenap:nmbug-spw
+checkout = nmbug-spw clone demeterp:nmbug-spw
 update = nmbug-spw pull
 push = nmbug-spw push
 status =
@@ -671,7 +671,7 @@ skip = ! [ -e "$HOME/local/auth/fmailsyncpass" ]
 # --- merges.  Skipped on non-local hosts
 
 [doc]
-checkout = git clone athenap:doc doc
+checkout = git clone demeterp:doc doc
 update = git pull "$@"
 skip = ! mine