From 143bfcb2c8ec33a20ca1a378647e0819643b3422 Mon Sep 17 00:00:00 2001 From: SG Date: Mon, 10 Oct 2022 10:27:13 -0600 Subject: [PATCH] i don't think we need to actually run auth_setup prior to packaging --- scripts/malcolm_appliance_packager.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/malcolm_appliance_packager.sh b/scripts/malcolm_appliance_packager.sh index fb53a03ca..ca822a86a 100755 --- a/scripts/malcolm_appliance_packager.sh +++ b/scripts/malcolm_appliance_packager.sh @@ -89,7 +89,7 @@ if mkdir "$DESTDIR"; then mkdir $VERBOSE -p "$DESTDIR/zeek/intel/MISP" mkdir $VERBOSE -p "$DESTDIR/zeek/intel/STIX" cp $VERBOSE ./docker-compose-standalone.yml "$DESTDIR/docker-compose.yml" - cp $VERBOSE ./auth.env "$DESTDIR/" + touch "$DESTDIR/"auth.env cp $VERBOSE ./cidr-map.txt "$DESTDIR/" cp $VERBOSE ./host-map.txt "$DESTDIR/" cp $VERBOSE ./net-map.json "$DESTDIR/" @@ -113,9 +113,6 @@ if mkdir "$DESTDIR"; then ln -s ./control.py stop ln -s ./control.py wipe popd >/dev/null 2>&1 - echo "You must set an administrator username and password for Malcolm, and self-signed X.509 certificates will be generated" - ./scripts/auth_setup - rm -rf logstash/certs/ca.key pushd .. >/dev/null 2>&1 DESTNAME="$RUN_PATH/$(basename $DESTDIR).tar.gz" README="$RUN_PATH/$(basename $DESTDIR).README.txt" @@ -123,7 +120,6 @@ if mkdir "$DESTDIR"; then cp $VERBOSE "$SCRIPT_PATH/malcolm_common.py" "$RUN_PATH/" tar -czf $VERBOSE "$DESTNAME" "./$(basename $DESTDIR)/" echo "Packaged Malcolm to \"$DESTNAME\"" - echo "" unset CONFIRMATION echo ""