diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_defaults.sh | 9 | ||||
| -rw-r--r-- | tools/conf/pfPorts/poudriere_bulk | 4 | ||||
| -rw-r--r-- | tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 0fc9912..acf7fb5 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -261,8 +261,8 @@ if [ -n "${_IS_RELEASE}" ]; then export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"nfs1.nyi.netgate.com"} export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/storage/files/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"} + export PKG_FINAL_RSYNC_HOSTNAME=${PKG_FINAL_RSYNC_HOSTNAME:-"nfs1.nyi.netgate.com"} + export PKG_FINAL_RSYNC_DESTDIR=${PKG_FINAL_RSYNC_DESTDIR:-"/storage/files/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"} @@ -326,8 +326,9 @@ export VARIANTIMAGES="" export VARIANTUPDATES="" # 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 RSYNCIP=${RSYNCIP:-"nfs1.nyi.netgate.com"} +export RSYNCUSER=${RSYNCUSER:-"wwwsync"} +export RSYNCPATH=${RSYNCPATH:-"/storage/files/snapshots/${TARGET}/${PRODUCT_NAME}_${GIT_REPO_BRANCH_OR_TAG}"} export SNAPSHOTSLOGFILE=${SNAPSHOTSLOGFILE:-"${SCRATCHDIR}/snapshots-build.log"} export SNAPSHOTSLASTUPDATE=${SNAPSHOTSLASTUPDATE:-"${SCRATCHDIR}/snapshots-lastupdate.log"} diff --git a/tools/conf/pfPorts/poudriere_bulk b/tools/conf/pfPorts/poudriere_bulk index 763733a..c4434eb 100644 --- a/tools/conf/pfPorts/poudriere_bulk +++ b/tools/conf/pfPorts/poudriere_bulk @@ -18,6 +18,8 @@ net/vnstat net-mgmt/dhcp_probe net-mgmt/net-snmp net-mgmt/%%PRODUCT_NAME%%-pkg-net-snmp +net-mgmt/%%PRODUCT_NAME%%-pkg-snmptt +net-mgmt/%%PRODUCT_NAME%%-pkg-Telegraf sysutils/htop sysutils/grub2-bhyve sysutils/pstree @@ -33,7 +35,7 @@ net/%%PRODUCT_NAME%%-pkg-pfBlockerNG net/%%PRODUCT_NAME%%-pkg-haproxy net/%%PRODUCT_NAME%%-pkg-haproxy-devel net/%%PRODUCT_NAME%%-pkg-Avahi -sysutils/%%PRODUCT_NAME%%-pkg-Netgate-Coreboot-Upgrade +sysutils/%%PRODUCT_NAME%%-pkg-Netgate_Coreboot_Upgrade sysutils/%%PRODUCT_NAME%%-pkg-Notes sysutils/%%PRODUCT_NAME%%-pkg-Backup sysutils/%%PRODUCT_NAME%%-pkg-Cron diff --git a/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 b/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 index 11201ed..d75ed53 100644 --- a/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 +++ b/tools/conf/pfPorts/poudriere_bulk.exclude.arm.armv6 @@ -11,6 +11,7 @@ sysutils/%%PRODUCT_NAME%%-pkg-gwled sysutils/%%PRODUCT_NAME%%-pkg-LCDproc security/%%PRODUCT_NAME%%-pkg-snort security/%%PRODUCT_NAME%%-pkg-suricata -sysutils/%%PRODUCT_NAME%%-pkg-Netgate-Coreboot-Upgrade +sysutils/%%PRODUCT_NAME%%-pkg-Netgate_Coreboot_Upgrade net/%%PRODUCT_NAME%%-pkg-ntopng net/%%PRODUCT_NAME%%-pkg-freeradius2 +net-mgmt/%%PRODUCT_NAME%%-pkg-Telegraf |
