CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Move + rename SOVERSION var for ISO build

Browse Source
This commit is contained in:
William Wernert
2020-05-04 10:43:27 -04:00
parent 714cd522cb
commit a2fbdf644c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup/so-functions
View File

@@ -19,6 +19,8 @@ source ./so-whiptail
source ./so-variables source ./so-variables
source ./so-common-functions source ./so-common-functions
SOVERSION=1.2.2
accept_salt_key_remote() { accept_salt_key_remote() {
systemctl restart salt-minion systemctl restart salt-minion
@@ -586,7 +588,7 @@ docker_registry() {
} }
docker_seed_registry() { docker_seed_registry() {
local VERSION="HH$so_version" local VERSION="HH$SOVERSION"
if ! [ -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then if ! [ -f /nsm/docker-registry/docker/so-dockers-"$VERSION".tar ]; then
local TRUSTED_CONTAINERS=(\ local TRUSTED_CONTAINERS=(\
@@ -816,7 +818,7 @@ master_static() {
# Create a static file for global values # Create a static file for global values
printf '%s\n'\ printf '%s\n'\
"static:"\ "static:"\
" soversion: HH$so_version"\ " soversion: HH$SOVERSION"\
" hnmaster: $HNMASTER"\ " hnmaster: $HNMASTER"\
" ntpserver: $NTPSERVER"\ " ntpserver: $NTPSERVER"\
" proxy: $PROXY"\ " proxy: $PROXY"\
@@ -1370,7 +1372,7 @@ set_updates() {
# FIXME: should this be a function? # FIXME: should this be a function?
set_version() { set_version() {
# Drop a file with the current version # Drop a file with the current version
echo "$so_version" > /etc/soversion echo "$SOVERSION" > /etc/soversion
} }
update_sudoers() { update_sudoers() {

3
setup/so-variables
View File

@@ -31,6 +31,3 @@ export temp_install_dir=/root/installtmp
export percentage_str='Getting started' export percentage_str='Getting started'
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
export so_version=1.2.2