diff options
| author | Renato Botelho <renato@netgate.com> | 2016-05-24 17:48:22 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-05-24 17:50:40 -0300 |
| commit | 252efda8e59f0ff0d3794c3545969b3c3e24664e (patch) | |
| tree | f8ffee8a9b8d8c4edbae4cd8090a22f6d21899a7 | |
| parent | b6899307677f1d48aad9181149c550f853c83d3e (diff) | |
| download | pfsense-252efda8e59f0ff0d3794c3545969b3c3e24664e.zip pfsense-252efda8e59f0ff0d3794c3545969b3c3e24664e.tar.gz | |
Change default final rsync destination when it's a RELEASE
| -rw-r--r-- | tools/builder_defaults.sh | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index f812702..95f174d 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -273,20 +273,6 @@ export POUDRIERE_BULK=${POUDRIERE_BULK:-"${BUILDER_TOOLS}/conf/pfPorts/poudriere export POUDRIERE_PORTS_GIT_URL=${POUDRIERE_PORTS_GIT_URL:-"${GIT_REPO_BASE}/freebsd-ports.git"} export POUDRIERE_PORTS_GIT_BRANCH=${POUDRIERE_PORTS_GIT_BRANCH:-"RELENG_2_3_1"} -# Host to rsync pkg repos from poudriere -export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}} -export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} -export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} -export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/staging/ce/packages"} -export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/staging/ce/packages/logs/${POUDRIERE_BRANCH}/${TARGET}"} - -# Final packages server -export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"beta.pfsense.org"} -export PKG_FINAL_RSYNC_USERNAME=${PKG_FINAL_RSYNC_USERNAME:-"wwwsync"} -export PKG_FINAL_RSYNC_SSH_PORT=${PKG_FINAL_RSYNC_SSH_PORT:-"22"} -export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} -export SKIP_FINAL_RSYNC=${SKIP_FINAL_RSYNC:-} - unset _IS_RELEASE unset CORE_PKG_DATESTRING export TIMESTAMP_SUFFIX="-${DATESTRING}" @@ -311,6 +297,25 @@ case "${PRODUCT_VERSION##*-}" in exit 1 esac +# Host to rsync pkg repos from poudriere +export PKG_RSYNC_HOSTNAME=${PKG_RSYNC_HOSTNAME:-${STAGING_HOSTNAME}} +export PKG_RSYNC_USERNAME=${PKG_RSYNC_USERNAME:-"wwwsync"} +export PKG_RSYNC_SSH_PORT=${PKG_RSYNC_SSH_PORT:-"22"} +export PKG_RSYNC_DESTDIR=${PKG_RSYNC_DESTDIR:-"/staging/ce/packages"} +export PKG_RSYNC_LOGS=${PKG_RSYNC_LOGS:-"/staging/ce/packages/logs/${POUDRIERE_BRANCH}/${TARGET}"} + +# Final packages server +if [ -n "${_IS_RELEASE}" ]; then + export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"pkg.pfsense.org"} + export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/usr/local/www/pkg"} +else + export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"beta.pfsense.org"} + export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/usr/local/www/beta/packages"} +fi +export PKG_FINAL_RSYNC_USERNAME=${PKG_FINAL_RSYNC_USERNAME:-"wwwsync"} +export PKG_FINAL_RSYNC_SSH_PORT=${PKG_FINAL_RSYNC_SSH_PORT:-"22"} +export SKIP_FINAL_RSYNC=${SKIP_FINAL_RSYNC:-} + # pkg repo variables export USE_PKG_REPO_STAGING="1" export PKG_REPO_SERVER_DEVEL=${PKG_REPO_SERVER_DEVEL:-"pkg+https://beta.pfsense.org/packages"} |
