Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-10-20 16:53:28 +0200
committerErich Eckner <git@eckner.net>2020-10-20 16:53:28 +0200
commit17bd4887275d28a63e514ad0f6ff5d4f66e598fe (patch)
tree5b76e526159bed5e22ef7ee980df07631b2d7613 /lib
parent6541883a54297ab403e5b28eb896a366a7decd19 (diff)
master_mirror_sftp_root new to configure a possibly different root directory of the http mirror from the sftp user (rsync is still expected to have its root identical to the http one)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/common-functions6
-rwxr-xr-xlib/load-configuration1
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/common-functions b/lib/common-functions
index 110578f..b64af00 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -871,6 +871,12 @@ failsafe_sftp() {
trial_counter=20
trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
cat > "${temp_dir}/input"
+ if [ -n "${master_mirror_sftp_root}" ]; then
+ sed -i '
+ /^\(rm\|rename\) / s@"\([^"]\+\)"@"'"${master_mirror_sftp_root}"'/\1"@g
+ /^ln / s@"\([^"]\+\)"$@"'"${master_mirror_sftp_root}"'/\1"@
+ ' "${temp_dir}/input"
+ fi
sed -n '
s/^rm "\([^"]\+\)"$/- \1/
s/^ln\( [^"]\S*\)* "[^"]\+" "\([^"]\+\)"$/+ \2/
diff --git a/lib/load-configuration b/lib/load-configuration
index 2796d00..eb9ad1e 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -93,6 +93,7 @@ master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packag
# to access the master mirror via sftp
master_mirror_sftp_command='sftp -b- user@mirror'
+master_mirror_sftp_root='mirror.archlinux32.org'
# mirror of sources, identified (solely) by hash
source_by_hash_mirror='https://sources.archlinux32.org/'