fixes in opnsesne addon
This commit is contained in:
1 parent
c507e9e12a
commit
17f1de681e
16 files changed
+251
-8
No files matched your search
@@ -100,7 +100,7 @@ source_ref=$SOURCE_BRANCH
|
||||
source_commit=$SHA
|
||||
build_reason=$BUILD_REASON
|
||||
source_revision=$SOURCE_REVISION
|
||||
packaging_revision=$PACKAGING_REVISION
|
||||
packaging_revision=$OPNSENSE_PACKAGING_REVISION
|
||||
opnsense_series=$OPNSENSE_ABI
|
||||
freebsd_release=$FREEBSD_RELEASE
|
||||
freebsd_abi=$FREEBSD_ABI
|
||||
|
||||
@@ -44,7 +44,7 @@ opnsense_release_complete_for_commit() {
|
||||
[[ -f "$opnsense/os-rustproxy-latest.pkg" ]] || return 1
|
||||
grep -Fqx "source_commit=$sha" "$opnsense/BUILD-INFO.txt" || return 1
|
||||
grep -Fqx "opnsense_series=$OPNSENSE_ABI" "$opnsense/BUILD-INFO.txt" || return 1
|
||||
grep -Fqx "packaging_revision=$PACKAGING_REVISION" "$opnsense/BUILD-INFO.txt" || return 1
|
||||
grep -Fqx "packaging_revision=$OPNSENSE_PACKAGING_REVISION" "$opnsense/BUILD-INFO.txt" || return 1
|
||||
[[ -d "$package_dir" ]] || return 1
|
||||
find "$package_dir" -maxdepth 1 -type f -name 'os-rustproxy-*.pkg' -print -quit | grep -q . || return 1
|
||||
return 0
|
||||
|
||||
@@ -3,6 +3,7 @@ set -Eeuo pipefail
|
||||
|
||||
# Increment when package payload/installation semantics change without a source commit.
|
||||
PACKAGING_REVISION=2
|
||||
OPNSENSE_PACKAGING_REVISION=3
|
||||
|
||||
log() {
|
||||
printf '%s %s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ')" "$*"
|
||||
|
||||
@@ -36,7 +36,7 @@ mkdir -p "$STAGE/usr/local/sbin"
|
||||
install -m 0555 "$BINARY" "$STAGE/usr/local/sbin/rust-proxy"
|
||||
|
||||
chmod 0555 "$STAGE/usr/local/etc/rc.d/rustproxy"
|
||||
chmod 0555 "$STAGE/usr/local/etc/rc.syshook.d/10-rustproxy.start"
|
||||
chmod 0555 "$STAGE/usr/local/etc/rc.syshook.d/start/50-rustproxy.start"
|
||||
chmod 0555 "$STAGE/usr/local/opnsense/scripts/rustproxy/service.sh"
|
||||
|
||||
POST_INSTALL_FILE="$PLUGIN_ROOT/+POST_INSTALL.pre"
|
||||
|
||||
Reference in new issue
Block a user