chore: the servers are named by the domain they serve
Files called the servers by their own host names, which are the operator's and say nothing a reader needs. They now say which domain a server serves: learn.halkyon.eu's server (the instance and its CI runner), the halkyon.app server (Forgejo and the F-Droid repository). Two names are settings rather than words. CI's runner label becomes `instance` (`runs-on: instance`, `labels: ["instance:host"]`): the runner reads its installed copy of deploy/runner/config.yml, so jobs wait in the queue until that copy is updated and the runner restarted. The SSH aliases the scripts and docs use become `learn-deploy` and `fdroid-upload`. AGENTS.md says to keep it so. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Tizian 「ティツィアーン」 <raisondetredev@pm.me>
This commit is contained in:
parent
63c2f86b12
commit
93b0c0a6b0
1 changed files with 32 additions and 31 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env bash
|
||||
# Updates the F-Droid repository at https://halkyon.app/fdroid/repo and
|
||||
# uploads it: adds an APK if one is given, signs the index with the repository's
|
||||
# key, and uploads everything to ramiel as the user fdroid, whose key can only
|
||||
# key, and uploads everything to the halkyon.app server as the user fdroid, whose key can only
|
||||
# write into the folder Caddy serves (rrsync). tool/release.sh runs it with each
|
||||
# release's APK; run alone, it publishes the repository as it is, e.g. after its
|
||||
# settings changed.
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
# signed otherwise would make the F-Droid app refuse the repository. Its password
|
||||
# comes from $HALKYON_FDROID_KEYSTORE_PASSWORD, or is asked for; it's never
|
||||
# written down. Needs fdroidserver v2.4.5 (pipx), rsync, a JDK, the Android SDK,
|
||||
# and the ssh host ramiel-fdroid.
|
||||
# and the ssh host fdroid-upload.
|
||||
set -euo pipefail
|
||||
cd "$(git rev-parse --show-toplevel)"
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ readonly working="${HALKYON_FDROID_DIR:-$HOME/.local/share/halkyon-learn/fdroid}
|
|||
keystore="${HALKYON_FDROID_KEYSTORE:-$HOME/.local/share/halkyon-learn/fdroid-index.p12}"
|
||||
readonly key_alias='halkyon-fdroid'
|
||||
readonly pinned_file='tool/release/fdroid-index-certificate.sha256'
|
||||
readonly upload_host='ramiel-fdroid'
|
||||
readonly upload_host='fdroid-upload'
|
||||
readonly repo_url='https://halkyon.app/fdroid/repo'
|
||||
|
||||
fail() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue