create ca-trust directory on boot

cisagov · May 5, 2020 · 2c2de9f · 2c2de9f
1 parent 4c24aff
commit 2c2de9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/scripts/control.py b/scripts/control.py
@@ -145,7 +145,7 @@ def start():
   # make sure the auth files exist. if we are in an interactive shell and we're
   # missing any of the auth files, prompt to create them now
   if sys.__stdin__.isatty() and (not MalcolmAuthFilesExist()):
-    check_call(['bash', os.path.join(ScriptPath, 'auth_setup')])
+    authSetup()
 
   # still missing? sorry charlie
   if (not MalcolmAuthFilesExist()):
@@ -173,6 +173,7 @@ def start():
   # make sure some directories exist before we start
   for path in [os.path.join(MalcolmPath, 'elasticsearch'),
                os.path.join(MalcolmPath, 'elasticsearch-backup'),
+               os.path.join(MalcolmPath, os.path.join('nginx', 'ca-trust')),
                os.path.join(MalcolmPath, os.path.join('pcap', 'upload')),
                os.path.join(MalcolmPath, os.path.join('pcap', 'processed')),
                os.path.join(MalcolmPath, os.path.join('zeek-logs', 'current')),

diff --git a/scripts/malcolm_appliance_packager.sh b/scripts/malcolm_appliance_packager.sh
@@ -62,6 +62,7 @@ if mkdir "$DESTDIR"; then
   trap "cleanup" EXIT
 
   mkdir $VERBOSE -p "$DESTDIR/nginx/certs/"
+  mkdir $VERBOSE -p "$DESTDIR/nginx/ca-trust/"
   mkdir $VERBOSE -p "$DESTDIR/htadmin/"
   mkdir $VERBOSE -p "$DESTDIR/logstash/certs/"
   mkdir $VERBOSE -p "$DESTDIR/filebeat/certs/"