fix packaging

idaholab · Sep 20, 2022 · 32caf88 · 32caf88
1 parent 28969ea
commit 32caf88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/malcolm-iso/build.sh b/malcolm-iso/build.sh
@@ -96,6 +96,7 @@ if [ -d "$WORKDIR" ]; then
   mkdir -p "$MALCOLM_DEST_DIR/htadmin/"
   mkdir -p "$MALCOLM_DEST_DIR/logstash/certs/"
   mkdir -p "$MALCOLM_DEST_DIR/logstash/maps/"
+  mkdir -p "$MALCOLM_DEST_DIR/netbox/env/"
   mkdir -p "$MALCOLM_DEST_DIR/netbox/media/"
   mkdir -p "$MALCOLM_DEST_DIR/netbox/postgres/"
   mkdir -p "$MALCOLM_DEST_DIR/netbox/redis/"
@@ -135,6 +136,9 @@ if [ -d "$WORKDIR" ]; then
   cp ./README.md "$MALCOLM_DEST_DIR/"
   cp ./logstash/certs/*.conf "$MALCOLM_DEST_DIR/logstash/certs/"
   cp ./logstash/maps/malcolm_severity.yaml "$MALCOLM_DEST_DIR/logstash/maps/"
+  cp -r ./netbox/config/ "$MALCOLM_DEST_DIR/netbox/"
+  cp ./netbox/env/netbox.env.example "$MALCOLM_DEST_DIR/netbox/env/"
+
   touch "$MALCOLM_DEST_DIR"/firstrun
   popd >/dev/null 2>&1
 

diff --git a/scripts/malcolm_appliance_packager.sh b/scripts/malcolm_appliance_packager.sh
@@ -67,6 +67,7 @@ if mkdir "$DESTDIR"; then
   mkdir $VERBOSE -p "$DESTDIR/htadmin/"
   mkdir $VERBOSE -p "$DESTDIR/logstash/certs/"
   mkdir $VERBOSE -p "$DESTDIR/logstash/maps/"
+  mkdir $VERBOSE -p "$DESTDIR/netbox/env/"
   mkdir $VERBOSE -p "$DESTDIR/netbox/media/"
   mkdir $VERBOSE -p "$DESTDIR/netbox/postgres/"
   mkdir $VERBOSE -p "$DESTDIR/netbox/redis/"
@@ -98,6 +99,8 @@ if mkdir "$DESTDIR"; then
   cp $VERBOSE ./README.md "$DESTDIR/"
   cp $VERBOSE ./logstash/certs/*.conf "$DESTDIR/logstash/certs/"
   cp $VERBOSE ./logstash/maps/malcolm_severity.yaml "$DESTDIR/logstash/maps/"
+  cp $VERBOSE -r ./netbox/config/ "$DESTDIR/netbox/"
+  cp $VERBOSE ./netbox/env/netbox.env.example "$DESTDIR/netbox/env/"
   pushd "$DESTDIR" >/dev/null 2>&1
   touch ./.opensearch.primary.curlrc ./.opensearch.secondary.curlrc
   chmod 600 ./.opensearch.primary.curlrc ./.opensearch.secondary.curlrc