set php's upload_tmp_dir to a directory on the same storage as the /p…

…cap/upload directory (#171)
idaholab · Apr 20, 2023 · cfa3343 · cfa3343
1 parent b0388df
commit cfa3343
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/docker-compose-standalone.yml b/docker-compose-standalone.yml
@@ -421,6 +421,7 @@ services:
     volumes:
       - ./nginx/ca-trust:/var/local/ca-trust:ro
       - ./pcap/upload:/var/www/upload/server/php/chroot/files
+      - ./pcap/spool:/tmp/upload_tmp_dir
     healthcheck:
       test: ["CMD", "wget", "-qO-", "http://localhost"]
       interval: 30s

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -472,6 +472,7 @@ services:
     volumes:
       - ./nginx/ca-trust:/var/local/ca-trust:ro
       - ./pcap/upload:/var/www/upload/server/php/chroot/files
+      - ./pcap/spool:/tmp/upload_tmp_dir
     healthcheck:
       test: ["CMD", "wget", "-qO-", "http://localhost"]
       interval: 30s

diff --git a/malcolm-iso/build.sh b/malcolm-iso/build.sh
@@ -111,6 +111,7 @@ if [ -d "$WORKDIR" ]; then
   mkdir -p "$MALCOLM_DEST_DIR/opensearch-backup/"
   mkdir -p "$MALCOLM_DEST_DIR/opensearch/nodes/"
   mkdir -p "$MALCOLM_DEST_DIR/pcap/processed/"
+  mkdir -p "$MALCOLM_DEST_DIR/pcap/spool/"
   mkdir -p "$MALCOLM_DEST_DIR/pcap/upload/"
   mkdir -p "$MALCOLM_DEST_DIR/scripts/"
   mkdir -p "$MALCOLM_DEST_DIR/suricata-logs/live"

diff --git a/scripts/control.py b/scripts/control.py
@@ -821,7 +821,7 @@ def stop(wipe=False):
                 BoundPath("netbox-postgres", "/var/lib/postgresql/data", True, None, ["."]),
                 BoundPath("netbox-redis", "/data", True, None, ["."]),
                 BoundPath("opensearch", "/usr/share/opensearch/data", True, ["nodes"], None),
-                BoundPath("pcap-monitor", "/pcap", True, ["processed", "upload"], None),
+                BoundPath("pcap-monitor", "/pcap", True, ["processed", "upload", "spool"], None),
                 BoundPath("suricata", "/var/log/suricata", True, None, ["."]),
                 BoundPath("upload", "/var/www/upload/server/php/chroot/files", True, None, None),
                 BoundPath("zeek", "/zeek/extract_files", True, None, None),
@@ -967,7 +967,7 @@ def start():
             BoundPath("netbox-redis", "/data", False, None, None),
             BoundPath("opensearch", "/usr/share/opensearch/data", False, ["nodes"], None),
             BoundPath("opensearch", "/opt/opensearch/backup", False, None, None),
-            BoundPath("pcap-monitor", "/pcap", False, ["processed", "upload"], None),
+            BoundPath("pcap-monitor", "/pcap", False, ["processed", "upload", "spool"], None),
             BoundPath("suricata", "/var/log/suricata", False, ["live"], None),
             BoundPath("upload", "/var/www/upload/server/php/chroot/files", False, None, None),
             BoundPath("zeek", "/zeek/extract_files", False, None, None),

diff --git a/scripts/malcolm_appliance_packager.sh b/scripts/malcolm_appliance_packager.sh
@@ -76,6 +76,7 @@ if mkdir "$DESTDIR"; then
   mkdir $VERBOSE -p "$DESTDIR/opensearch-backup/"
   mkdir $VERBOSE -p "$DESTDIR/opensearch/nodes/"
   mkdir $VERBOSE -p "$DESTDIR/pcap/processed/"
+  mkdir $VERBOSE -p "$DESTDIR/pcap/spool/"
   mkdir $VERBOSE -p "$DESTDIR/pcap/upload/"
   mkdir $VERBOSE -p "$DESTDIR/config/"
   mkdir $VERBOSE -p "$DESTDIR/scripts/"