summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-02 13:56:05 -0300
committerRenato Botelho <renato@netgate.com>2016-08-02 13:56:05 -0300
commitba84d2fc4000c6d4d0066158b97d718d1ef9d5ac (patch)
tree208f0fa6fe461e77ab73c3f3ecda803d14410047
parent5925de171cf61a0f338472195a4b9314d42655d8 (diff)
downloadpfsense-ba84d2fc4000c6d4d0066158b97d718d1ef9d5ac.zip
pfsense-ba84d2fc4000c6d4d0066158b97d718d1ef9d5ac.tar.gz
Do not scp log files
-rw-r--r--build.conf.sample1
-rwxr-xr-xbuild.sh1
-rw-r--r--tools/builder_common.sh14
-rw-r--r--tools/builder_defaults.sh3
4 files changed, 0 insertions, 19 deletions
diff --git a/build.conf.sample b/build.conf.sample
index 6756142..389e70d 100644
--- a/build.conf.sample
+++ b/build.conf.sample
@@ -37,7 +37,6 @@ export PRODUCT_URL="https://PRODUCT_URL/"
#export RSYNCIP="your.snapshot.server"
#export RSYNCUSER="username"
#export RSYNCPATH="/usr/local/www/snapshots"
-#export RSYNCLOGS="/usr/local/www/snapshots/logs"
# rsync data to upload pkg repo
#export PKG_RSYNC_HOSTNAME="pkg_repo_hostname"
diff --git a/build.sh b/build.sh
index 76e4ae4..96151dd 100755
--- a/build.sh
+++ b/build.sh
@@ -261,7 +261,6 @@ if [ -n "${SNAPSHOTS}" -a -z "${DO_NOT_UPLOAD}" ]; then
RSYNCIP \
RSYNCUSER \
RSYNCPATH \
- RSYNCLOGS \
PKG_RSYNC_HOSTNAME \
PKG_RSYNC_USERNAME \
PKG_RSYNC_SSH_PORT \
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 27f4766..039b47f 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2063,8 +2063,6 @@ poudriere_bulk() {
# This routine is called to write out to stdout
# a string. The string is appended to $SNAPSHOTSLOGFILE
-# and we scp the log file to the builder host if
-# needed for the real time logging functions.
snapshots_update_status() {
if [ -z "$1" ]; then
return
@@ -2074,18 +2072,6 @@ snapshots_update_status() {
fi
echo "$*"
echo "`date` -|- $*" >> $SNAPSHOTSLOGFILE
- if [ -z "${DO_NOT_UPLOAD}" -a -n "${SNAPSHOTS_RSYNCIP}" ]; then
- LU=$(cat $SNAPSHOTSLASTUPDATE 2>/dev/null)
- CT=$(date "+%H%M%S")
- # Only update every minute
- if [ "$LU" != "$CT" ]; then
- ssh ${SNAPSHOTS_RSYNCUSER}@${SNAPSHOTS_RSYNCIP} \
- "mkdir -p ${SNAPSHOTS_RSYNCLOGS}"
- scp -q $SNAPSHOTSLOGFILE \
- ${SNAPSHOTS_RSYNCUSER}@${SNAPSHOTS_RSYNCIP}:${SNAPSHOTS_RSYNCLOGS}/build.log
- date "+%H%M%S" > $SNAPSHOTSLASTUPDATE
- fi
- fi
}
create_sha256() {
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 1357b5f..3a8c2b7 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -349,7 +349,6 @@ export NANOBSD_IMG_TEMPLATE=${NANOBSD_IMG_TEMPLATE:-"${PRODUCT_NAME}${PRODUCT_NA
# Rsync data to send snapshots
export RSYNCUSER=${RSYNCUSER:-"snapshots"}
export RSYNCPATH=${RSYNCPATH:-"/usr/local/www/snapshots/${TARGET}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"}
-export RSYNCLOGS=${RSYNCLOGS:-"/usr/local/www/snapshots/logs/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}/${TARGET}"}
export RSYNCKBYTELIMIT=${RSYNCKBYTELIMIT:-"248000"}
export SNAPSHOTSLOGFILE=${SNAPSHOTSLOGFILE:-"${SCRATCHDIR}/snapshots-build.log"}
@@ -358,11 +357,9 @@ export SNAPSHOTSLASTUPDATE=${SNAPSHOTSLASTUPDATE:-"${SCRATCHDIR}/snapshots-lastu
if [ -n "${POUDRIERE_SNAPSHOTS}" ]; then
export SNAPSHOTS_RSYNCIP=${PKG_RSYNC_HOSTNAME}
export SNAPSHOTS_RSYNCUSER=${PKG_RSYNC_USERNAME}
- export SNAPSHOTS_RSYNCLOGS=${PKG_RSYNC_LOGS}
else
export SNAPSHOTS_RSYNCIP=${RSYNCIP}
export SNAPSHOTS_RSYNCUSER=${RSYNCUSER}
- export SNAPSHOTS_RSYNCLOGS=${RSYNCLOGS}
fi
if [ "${PRODUCT_NAME}" = "pfSense" ]; then
OpenPOWER on IntegriCloud