rename athena-apt->athenet-apt

The new name is server hostname-neutral.  The httpd is now on leto.

8 files changed, 20 insertions, 16 deletions

diff --git a/.duply/melete-spwhitton-home/exclude b/.duply/melete-spwhitton-home/exclude
index d230f72b..17866820 100644
--- a/.duply/melete-spwhitton-home/exclude
+++ b/.duply/melete-spwhitton-home/exclude
@@ -1,6 +1,6 @@
 - /home/spwhitton/lib/annex/.git/annex
 - /home/spwhitton/annex/.git/annex
-- /home/spwhitton/lib/athena-apt/pool
+- /home/spwhitton/lib/athenet-apt/pool
 - /home/spwhitton/lib/dionysus/.git/annex/objects
 - /home/spwhitton/lib/podcasts/.git/annex/objects
 - /home/spwhitton/lib/rt
diff --git a/.hstow-unstow-ignore b/.hstow-unstow-ignore
index ef6e3658..27accd71 100644
--- a/.hstow-unstow-ignore
+++ b/.hstow-unstow-ignore
@@ -3,7 +3,7 @@ doc/*
 .emacs.d/eln-cache/*
 .fmail/*
 lib/annex/*
-lib/athena-apt/*
+lib/athenet-apt/*
 lib/wikiannex/*
 lib/podcasts/*
 lib/priv/*
diff --git a/.ssh/config b/.ssh/config
index d1a97eb7..82beadc5 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -48,6 +48,9 @@ Host melete.silentflame.com | melete
 User spwhitton
 ForwardAgent yes
 
+Host *.silentflame.com silentflame.com
+User spwhitton
+
 ####################################################################
 
 Host github | github.com
diff --git a/bin/athena-apt-add b/bin/athenet-apt-add
index 0346fa54..d3784b94 100755
--- a/bin/athena-apt-add
+++ b/bin/athenet-apt-add
@@ -7,8 +7,8 @@ set -e
 changes="$(readlink -f $1)"
 dist="$(grep ^Distribution: $changes | cut -d \  -f2)"
 
-if ! [ -d "$HOME/lib/athena-apt" ]; then
-    echo >&2 "athena-apt annex not checked out"
+if ! [ -d "$HOME/lib/athenet-apt" ]; then
+    echo >&2 "athenet-apt annex not checked out"
     exit 1
 fi
 if ! [ -f "$changes" ]; then
@@ -18,6 +18,6 @@ fi
 
 changestool "$changes" includeallsources || true
 (
-    cd "$HOME/lib/athena-apt"
+    cd "$HOME/lib/athenet-apt"
     reprepro include "$dist" "$changes"
 )
diff --git a/bin/reprepro-rebuilder b/bin/reprepro-rebuilder
index 4007b0ed..fff7f679 100755
--- a/bin/reprepro-rebuilder
+++ b/bin/reprepro-rebuilder
@@ -33,7 +33,7 @@ use Getopt::Long;
 use Term::UI;
 use File::chdir;
 
-our $repo             = "$ENV{HOME}/lib/athena-apt";
+our $repo             = "$ENV{HOME}/lib/athenet-apt";
 our $prefix           = "athena";
 our @dists            = qw(bookworm bookworm-backports unstable experimental);
 our $bpo_dist         = "bookworm-backports";
diff --git a/lib-src/git/includes b/lib-src/git/includes
index 6f8114af..8fb50d3d 100644
--- a/lib-src/git/includes
+++ b/lib-src/git/includes
@@ -4,8 +4,8 @@
 	path = ~/src/dotfiles/lib-src/git/doc
 [includeIf "gitdir:~/lib/annex/"]
 	path = ~/src/dotfiles/lib-src/git/lib/annex
-[includeIf "gitdir:~/lib/athena-apt/"]
-	path = ~/src/dotfiles/lib-src/git/lib/athena-apt
+[includeIf "gitdir:~/lib/athenet-apt/"]
+	path = ~/src/dotfiles/lib-src/git/lib/athenet-apt
 [includeIf "gitdir:~/lib/podcasts/"]
 	path = ~/src/dotfiles/lib-src/git/lib/podcasts
 [includeIf "gitdir:~/lib/priv/"]
diff --git a/lib-src/git/lib/athena-apt b/lib-src/git/lib/athenet-apt
index ff09fb6f..696e97ab 100644
--- a/lib-src/git/lib/athena-apt
+++ b/lib-src/git/lib/athenet-apt
@@ -14,7 +14,7 @@
 [push]
 	default = matching
 
-[remote "demeter"]
+[remote "htdocs"]
 	annex-tracking-branch = master
 
 [remote "origin"]
diff --git a/lib-src/mr/config b/lib-src/mr/config
index 6e43ee0e..333e899d 100644
--- a/lib-src/mr/config
+++ b/lib-src/mr/config
@@ -280,12 +280,13 @@ update = ./update-and-sync
 push = git annex --no-content sync
 skip = lazy
 
-[lib/athena-apt]
-checkout = git clone demeter:athena-apt
+[lib/athenet-apt]
+# legacy url for the origin remote
+checkout = git clone git@git.spwhitton.name:athena-apt athenet-apt
 post_checkout =
-    cd athena-apt
+    cd athenet-apt
     git annex init --version=7
-    git annex enableremote demeter rsyncurl=demeter:/srv/www/debian
+    git annex enableremote htdocs rsyncurl=silentflame.com:/srv/www/debian
     git annex get .
 update = git annex sync --no-content
 skip = lazy
@@ -293,10 +294,10 @@ skip = lazy
 push =
     git annex add
     git annex unlock db
-    git annex sync --content demeter
+    git annex sync --content htdocs
     git annex sync origin
-    ssh demeter find /srv/www/debian -type f -exec chmod 644 '{}' +
-    ssh demeter find /srv/www/debian -type d -exec chmod 755 '{}' +
+    ssh silentflame.com find /srv/www/debian -type f -exec chmod 644 '{}' +
+    ssh silentflame.com find /srv/www/debian -type d -exec chmod 755 '{}' +
 
 # The git-diff-files(1) call in ~/src/dotfiles/bin/git-is-clean fails in v7
 # git-annex repos with unlocked empty files, which this repo often has: empty