From 90bae95bb70a4c73e379ad875e50ea0f6aafe9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 23 Sep 2015 21:10:15 -0300 Subject: rename mirror -> sync_domain --- db-sync | 10 +++++----- etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg | 7 ++++--- etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg | 23 ++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/db-sync b/db-sync index 9b87d50..a8ef950 100755 --- a/db-sync +++ b/db-sync @@ -32,7 +32,7 @@ get_repos() { --include="*${files_extension_suffixfile}" \ --exclude="*" \ --delete-after \ - "rsync://${mirror}/${mirror_path}/" "${work_directory}" + "rsync://${sync_domain}/${sync_domain_path}/" "${work_directory}" } get_repo_content() { @@ -116,7 +116,7 @@ init() { --delay-updates \ --include-from="/tmp/${_repo}-${_arch}.whitelist" \ --exclude="*" \ - "rsync://${mirror}/${mirror_path}/${_repo}/os/${_arch}/" \ + "rsync://${sync_domain}/${sync_domain_path}/${_repo}/os/${_arch}/" \ "${root_dir}/${_repo}/os/${_arch}/" # Add a new whitelist @@ -151,7 +151,7 @@ init() { --safe-links \ --include-from=/tmp/any.whitelist \ --exclude="*" \ - "rsync://${mirror}/${mirror_path}/${pkgpool}/" \ + "rsync://${sync_domain}/${sync_domain_path}/${pkgpool}/" \ "${root_dir}/${pkgpool}/" done @@ -170,7 +170,7 @@ init() { --safe-links \ --include-from=/tmp/any.whitelist \ --exclude="*" \ - "rsync://${mirror}/${mirror_path}/${srcpool}/" \ + "rsync://${sync_domain}/${sync_domain_path}/${srcpool}/" \ "${root_dir}/${srcpool}/" done @@ -192,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/etc/dbscripts.cfg" source "$(dirname "$(readlink -e "$0")")/share/db-libremessages" # Check variables presence -for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir derivative_sources_pools derivative_packages_pools; do +for var in database_extension_suffixfile files_extension_suffixfile sync_domain sync_domain_path work_directory blacklist_file root_dir derivative_sources_pools derivative_packages_pools; do test -z "${!var}" && fatal_error "Empty %s" "${var}" done diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg index b5a2a8a..f63fe1e 100644 --- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg +++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg @@ -28,10 +28,11 @@ native_architectures=() architectures=(${derivative_architectures[@]} ${native_architectures[@]}) # derivative distribution sync (db-sync) -mirror="ftp.halifax.rwth-aachen.de" -#mirror="http://mirror.yandex.ru" +sync_domain="ftp.halifax.rwth-aachen.de" +#sync_domain="http://sync_domain.yandex.ru" -mirror_path="archlinux-arm" +sync_domain_path="archlinux-arm" +sync_domain_directory="$_arch/$_repo" # x86 # repo/os/arch/pkg diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg index f9baa7e..bc1bebd 100644 --- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg +++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg @@ -28,17 +28,18 @@ native_architectures=() architectures=(${derivative_architectures[@]} ${native_architectures[@]}) # derivative distribution sync (db-sync) -#mirror="mirrors.kernel.org" -mirror="mirrors.niyawe.de" - -## mirrors without sources folder -#mirror="mirror.nl.leaseweb.net" -#mirror="mirror.one.com" -#mirror="mirror.us.leaseweb.net" -#mirror="mirror.bytemark.co.uk" -#mirror="mirror.de.leaseweb.net" - -mirror_path="archlinux" +#sync_domain="sync_domains.kernel.org" +sync_domain="sync_domains.niyawe.de" + +## sync_domains without sources folder +#sync_domain="sync_domain.nl.leaseweb.net" +#sync_domain="sync_domain.one.com" +#sync_domain="sync_domain.us.leaseweb.net" +#sync_domain="sync_domain.bytemark.co.uk" +#sync_domain="sync_domain.de.leaseweb.net" + +sync_domain_path="archlinux" +sync_domain_directory="$_repo/os/$_arch/" # x86 # repo/os/arch/pkg -- cgit v1.2.3