Project

General

Profile

« Previous | Next » 

Revision cafd9f97

Added by Brad Davis over 3 years ago

Add support for multiple sites for syncing packages to

Each site must be defined in the PKG_RSYNC_HOSTS variable and then a
PKG_RSYNC_HOSTNAME_$site must be defined as the target, for example:

PKG_RSYNC_HOSTS="nyi"
PKG_RSYNC_HOSTNAME_nyi="nfs1.nyi.netgate.com"

The final rsync hostname can be overridden as
PKG_FINAL_RSYNC_HOSTNAME_$site or will inherit from
PKG_RSYNC_HOSTNAME_$site.

View differences:

tools/builder_defaults.sh
267 267
STAGING_HOSTNAME=${STAGING_HOSTNAME:-"release-staging.nyi.netgate.com"}
268 268

  
269 269
# Host to rsync pkg repos from poudriere
270
export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-"nfs1.nyi.netgate.com"}
270
export PKG_RSYNC_HOSTS=${PKG_RSYNC_HOSTS:-"nyi"}
271
export PKG_RSYNC_HOSTNAME_nyi=${PKG_RSYNC_HOSTNAME_nyi:-"nfs1.nyi.netgate.com"}
271 272
export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"}
272 273
export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"}
273 274
export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/storage/files/release-staging/ce/packages"}
274 275

  
275 276
# Final packages server
276 277
if [ -n "${_IS_RELEASE}" -o -n "${_IS_RC}" ]; then
277
	export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"nfs1.nyi.netgate.com"}
278
	export PKG_FINAL_RSYNC_HOSTNAME_nyi=${PKG_FINAL_RSYNC_HOSTNAME_nyi:-"nfs1.nyi.netgate.com"}
278 279
	export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/storage/files/pkg"}
279 280
else
280
	export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"nfs1.nyi.netgate.com"}
281
	export PKG_FINAL_RSYNC_HOSTNAME_nyi=${PKG_FINAL_RSYNC_HOSTNAME_nyi:-"nfs1.nyi.netgate.com"}
281 282
	export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/storage/files/beta/packages"}
282 283
fi
283 284
export PKG_FINAL_RSYNC_USERNAME=${PKG_FINAL_RSYNC_USERNAME:-"wwwsync"}

Also available in: Unified diff