Merge pull request #1940 from bc24fl/develop

Allow docker installs the ability to disable web terminal or server side scripts via .env file
amidaware · Jul 27, 2024 · 411cbdf · 411cbdf
2 parents 090bcf8 + cfd19e0
commit 411cbdf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/docker/.env.example b/docker/.env.example
@@ -24,3 +24,9 @@ MESH_PERSISTENT_CONFIG=0
 # database settings
 POSTGRES_USER=postgres
 POSTGRES_PASS=postgrespass
+
+# disable web terminal
+TRMM_DISABLE_WEB_TERMINAL=False
+
+# disable server side scripts
+TRMM_DISABLE_SERVER_SCRIPTS=False
diff --git a/docker/containers/tactical/entrypoint.sh b/docker/containers/tactical/entrypoint.sh
@@ -18,6 +18,8 @@ set -e
 : "${APP_HOST:=tactical-frontend}"
 : "${REDIS_HOST:=tactical-redis}"
 : "${SKIP_UWSGI_CONFIG:=0}"
+: "${TRMM_DISABLE_WEB_TERMINAL:=False}"
+: "${TRMM_DISABLE_SERVER_SCRIPTS:=False}"
 
 : "${CERT_PRIV_PATH:=${TACTICAL_DIR}/certs/privkey.pem}"
 : "${CERT_PUB_PATH:=${TACTICAL_DIR}/certs/fullchain.pem}"
@@ -111,6 +113,8 @@ MESH_TOKEN_KEY = '${MESH_TOKEN}'
 REDIS_HOST    = '${REDIS_HOST}'
 MESH_WS_URL = '${MESH_WS_URL}'
 ADMIN_ENABLED = False
+TRMM_DISABLE_WEB_TERMINAL = ${TRMM_DISABLE_WEB_TERMINAL}
+TRMM_DISABLE_SERVER_SCRIPTS = ${TRMM_DISABLE_SERVER_SCRIPTS}
 EOF
   )"
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -62,6 +62,8 @@ services:
       MESH_HOST: ${MESH_HOST}
       TRMM_USER: ${TRMM_USER}
       TRMM_PASS: ${TRMM_PASS}
+      TRMM_DISABLE_WEB_TERMINAL: ${TRMM_DISABLE_WEB_TERMINAL}
+      TRMM_DISABLE_SERVER_SCRIPTS: ${TRMM_DISABLE_SERVER_SCRIPTS}
     depends_on:
       - tactical-postgres
       - tactical-meshcentral