From a51744988fae221ec41a454ac350688c8ba5a88f Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Sat, 29 Jan 2022 00:45:41 +0000 Subject: [PATCH] adjust editions for new nginx --- docker/nginx/docker-compose.yml | 12 +----------- etc/compose/collector.yml | 14 ++------------ etc/compose/hive.yml | 14 ++------------ etc/compose/industrial.yml | 14 ++------------ etc/compose/log4j.yml | 14 ++------------ etc/compose/medical.yml | 14 ++------------ etc/compose/mini.yml | 14 ++------------ etc/compose/nextgen.yml | 14 ++------------ etc/compose/standard.yml | 14 ++------------ 9 files changed, 17 insertions(+), 107 deletions(-) diff --git a/docker/nginx/docker-compose.yml b/docker/nginx/docker-compose.yml index 27db5a2c..dd0e3af3 100644 --- a/docker/nginx/docker-compose.yml +++ b/docker/nginx/docker-compose.yml @@ -7,10 +7,6 @@ services: build: . container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy @@ -18,20 +14,14 @@ services: - /var/tmp/nginx/uwsgi - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" - "127.0.0.1:64304:64304" image: "dtagdevsec/nginx:2203" - #read_only: true + read_only: true volumes: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml index ef8f0f4a..7b75a8f2 100644 --- a/etc/compose/collector.yml +++ b/etc/compose/collector.yml @@ -201,21 +201,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -226,9 +219,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/hive.yml b/etc/compose/hive.yml index 72248242..861fb031 100644 --- a/etc/compose/hive.yml +++ b/etc/compose/hive.yml @@ -80,21 +80,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -105,9 +98,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml index d95aa9e2..a19b2f15 100644 --- a/etc/compose/industrial.yml +++ b/etc/compose/industrial.yml @@ -408,21 +408,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -433,9 +426,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/log4j.yml b/etc/compose/log4j.yml index b7c08914..73fff881 100644 --- a/etc/compose/log4j.yml +++ b/etc/compose/log4j.yml @@ -191,21 +191,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -216,9 +209,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/medical.yml b/etc/compose/medical.yml index a46760d7..a5d0c0d4 100644 --- a/etc/compose/medical.yml +++ b/etc/compose/medical.yml @@ -185,21 +185,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -210,9 +203,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/mini.yml b/etc/compose/mini.yml index f1845310..9f50f456 100644 --- a/etc/compose/mini.yml +++ b/etc/compose/mini.yml @@ -210,21 +210,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -235,9 +228,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index 8941ca7f..1d99160c 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -551,21 +551,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -576,9 +569,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml index 4fcead42..651e5c1c 100644 --- a/etc/compose/standard.yml +++ b/etc/compose/standard.yml @@ -584,21 +584,14 @@ services: nginx: container_name: nginx restart: always - environment: - ### If set to YES all changes within Heimdall will remain for the next start - ### Make sure to uncomment the corresponding volume statements below, or the setting will prevent a successful start of T-Pot. - - HEIMDALL_PERSIST=NO tmpfs: - /var/tmp/nginx/client_body - /var/tmp/nginx/proxy - /var/tmp/nginx/fastcgi - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi + - /var/tmp/nginx/scgi - /run - - /var/log/php7/ - - /var/lib/nginx/tmp:uid=100,gid=82 - - /var/lib/nginx/html/storage/logs:uid=100,gid=82 - - /var/lib/nginx/html/storage/framework/views:uid=100,gid=82 + - /var/lib/nginx/tmp:uid=100,gid=82 network_mode: "host" ports: - "64297:64297" @@ -609,9 +602,6 @@ services: - /data/nginx/cert/:/etc/nginx/cert/:ro - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro - /data/nginx/log/:/var/log/nginx/ - ### Enable the following volumes if you set HEIMDALL_PERSIST=YES - # - /data/nginx/heimdall/database:/var/lib/nginx/html/database - # - /data/nginx/heimdall/storage:/var/lib/nginx/html/storage # Spiderfoot service spiderfoot: