Merge branch 'development' of https://github.com/mmguero-dev/Malcolm …

…into v23.08.0_merge_cisagov
cisagov · Aug 14, 2023 · 93b7e6f · 93b7e6f
2 parents 7127843 + 8dcbb2a
commit 93b7e6f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/Dockerfiles/arkime.Dockerfile b/Dockerfiles/arkime.Dockerfile
@@ -62,7 +62,7 @@ RUN apt-get -q update && \
     python3 /opt/bs4_remove_div.py -i ./viewer/vueapp/src/components/users/Users.vue -o ./viewer/vueapp/src/components/users/Users.new -c "new-user-form" && \
     mv -vf ./viewer/vueapp/src/components/users/Users.new ./viewer/vueapp/src/components/users/Users.vue && \
     sed -i 's/v-if.*password.*"/v-if="false"/g' ./viewer/vueapp/src/components/settings/Settings.vue && \
-    rm -rf ./viewer/vueapp/src/components/upload ./capture/plugins/suricata* && \
+    rm -rf ./capture/plugins/suricata* && \
     sed -i "s/^\(ARKIME_LOCALELASTICSEARCH=\).*/\1"$ARKIME_LOCALELASTICSEARCH"/" ./release/Configure && \
     sed -i "s/^\(ARKIME_INET=\).*/\1"$ARKIME_INET"/" ./release/Configure && \
     ./easybutton-build.sh && \

diff --git a/arkime/etc/config.ini b/arkime/etc/config.ini
@@ -49,6 +49,7 @@ pluginsDir=/opt/arkime/plugins
 plugins=wise.so
 viewerPlugins=wise.js
 spiDataMaxIndices=7
+uploadCommand=
 packetThreads=2
 pcapWriteMethod=simple
 pcapWriteSize=262143

diff --git a/arkime/patch/remove_upload.patch b/arkime/patch/remove_upload.patch
diff --git a/sensor-iso/interface/sensor_ctl/arkime/config.ini b/sensor-iso/interface/sensor_ctl/arkime/config.ini
@@ -34,6 +34,7 @@ smtpIpHeaders=X-Originating-IP:;X-Barracuda-Apparent-Source-IP:
 parsersDir=/dummy/parsers
 pluginsDir=/dummy/plugins
 spiDataMaxIndices=2
+uploadCommand=
 compressES=false
 maxESConns=30
 maxESRequests=500