diff --git a/build.sh b/build.sh index 9d12725..77eaa33 100755 --- a/build.sh +++ b/build.sh @@ -283,11 +283,17 @@ preflight_colibri_artifacts() { resolve_colibri_paths _colibri_rc="${_resolved_colibri_repo}/packaging/freebsd/colibri_daemon.in" + _colibri_newsyslog="${_resolved_colibri_repo}/packaging/freebsd/newsyslog-colibri.conf" if [ ! -f "${_colibri_rc}" ]; then echo "ERROR: Colibri rc.d source missing: ${_colibri_rc}" echo " Set COLIBRI_REPO=/path/to/colibri or FEATURE_COLIBRI=NO." exit 1 fi + if [ ! -f "${_colibri_newsyslog}" ]; then + echo "ERROR: Colibri newsyslog source missing: ${_colibri_newsyslog}" + echo " Set COLIBRI_REPO=/path/to/colibri or FEATURE_COLIBRI=NO." + exit 1 + fi for _colibri_bin in colibri-daemon colibri colibri-smoke-agent; do if [ ! -x "${_resolved_colibri_artifact_dir}/${_colibri_bin}" ]; then echo "ERROR: Colibri release binary missing: ${_resolved_colibri_artifact_dir}/${_colibri_bin}" diff --git a/scripts/stage-colibri-iso.sh b/scripts/stage-colibri-iso.sh index 3839259..d76aae5 100755 --- a/scripts/stage-colibri-iso.sh +++ b/scripts/stage-colibri-iso.sh @@ -30,7 +30,9 @@ ETC_DIR="${DESTDIR}/usr/local/etc/colibri" DB_DIR="${DESTDIR}/var/db/colibri" RUN_DIR="${DESTDIR}/var/run/colibri" LOG_DIR="${DESTDIR}/var/log/colibri" +NEWSYSLOG_DIR="${DESTDIR}/usr/local/etc/newsyslog.conf.d" RC_SOURCE="${COLIBRI_REPO}/packaging/freebsd/colibri_daemon.in" +NEWSYSLOG_SOURCE="${COLIBRI_REPO}/packaging/freebsd/newsyslog-colibri.conf" require_file() { if [ ! -f "$1" ]; then @@ -53,7 +55,8 @@ copy_bin() { } require_file "${RC_SOURCE}" -mkdir -p "${BIN_DIR}" "${RC_DIR}" "${ETC_DIR}" "${DB_DIR}" "${RUN_DIR}" "${LOG_DIR}" +require_file "${NEWSYSLOG_SOURCE}" +mkdir -p "${BIN_DIR}" "${RC_DIR}" "${ETC_DIR}" "${NEWSYSLOG_DIR}" "${DB_DIR}" "${RUN_DIR}" "${LOG_DIR}" copy_bin colibri-daemon copy_bin colibri @@ -64,6 +67,7 @@ if [ "${COLIBRI_STAGE_INCLUDE_TUI}" != "0" ] && [ -x "${COLIBRI_ARTIFACT_DIR}/co fi install -m 0555 "${RC_SOURCE}" "${RC_DIR}/colibri_daemon" +install -m 0644 "${NEWSYSLOG_SOURCE}" "${NEWSYSLOG_DIR}/colibri.conf" cat > "${ETC_DIR}/rc.conf.sample" <