continue working on installer

remove portainer remove wetty remove netdata add cockpit tweak fail2ban for cockpit, sshd, nginx update logo to 18.10 remove configs with regard to portainer, wetty, netdata adjust packages for install.sh, preseed
2025-07-02 01:27:27 -04:00 · 2018-06-23 21:23:33 +00:00
parent 96e02eeb10
commit d6077792b9
11 changed files with 36 additions and 288 deletions
--- a/etc/compose/collector.yml
+++ b/etc/compose/collector.yml
@ -171,26 +171,6 @@ services:
     - /data:/data
     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip

-# Netdata service
-  netdata:
-    container_name: netdata
-    restart: always
-    network_mode: "host"
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    cap_add:
-     - SYS_PTRACE
-    security_opt:
-     - apparmor=unconfined
-    ports:
-     - "64301:64301"
-    image: "dtagdevsec/netdata:1804"
-    volumes:
-     - /proc:/host/proc:ro
-     - /sys:/host/sys:ro
-     - /var/run/docker.sock:/var/run/docker.sock:ro
-
 # Nginx service
  nginx:
    container_name: nginx
@ -212,20 +192,6 @@ services:
     - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro
     - /data/nginx/log/:/var/log/nginx/

-# Portainer service
-  portainer:
-    container_name: portainer
-    command:  -H unix:///var/run/docker.sock --no-auth
-    restart: always
-    networks:
-     - portainer_local
-    ports:
-     - "127.0.0.1:64299:9000"
-    image: "dtagdevsec/portainer:1804"
-    read_only: true
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-
 # Spiderfoot service
  spiderfoot:
    container_name: spiderfoot
@ -238,15 +204,3 @@ services:
    volumes:
     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db

-# Wetty service
-  wetty:
-    container_name: wetty
-    restart: always
-    stop_signal: SIGKILL
-    network_mode: "host"
-    env_file:
-     - /opt/tpot/etc/compose/wetty_environment
-    tmpfs:
-     - /home/wetty/.ssh/:uid=2000,gid=2000
-    image: "dtagdevsec/wetty:1804"
-    read_only: true
--- a/etc/compose/experimental.yml
+++ b/etc/compose/experimental.yml
@ -505,26 +505,6 @@ services:
     - /data:/data
     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip

-# Netdata service
-  netdata:
-    container_name: netdata
-    restart: always
-    network_mode: "host"
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    cap_add:
-     - SYS_PTRACE
-    security_opt:
-     - apparmor=unconfined
-    ports:
-     - "64301:64301"
-    image: "dtagdevsec/netdata:1804"
-    volumes:
-     - /proc:/host/proc:ro
-     - /sys:/host/sys:ro
-     - /var/run/docker.sock:/var/run/docker.sock:ro
-
 # Nginx service
  nginx:
    container_name: nginx
@ -546,20 +526,6 @@ services:
     - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro
     - /data/nginx/log/:/var/log/nginx/

-# Portainer service
-  portainer:
-    container_name: portainer
-    command:  -H unix:///var/run/docker.sock --no-auth
-    restart: always
-    networks:
-     - portainer_local
-    ports:
-     - "127.0.0.1:64299:9000"
-    image: "dtagdevsec/portainer:1804"
-    read_only: true
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-
 # Spiderfoot service
  spiderfoot:
    container_name: spiderfoot
@ -572,15 +538,3 @@ services:
    volumes:
     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db

-# Wetty service
-  wetty:
-    container_name: wetty
-    restart: always
-    stop_signal: SIGKILL
-    network_mode: "host"
-    env_file:
-     - /opt/tpot/etc/compose/wetty_environment
-    tmpfs:
-     - /home/wetty/.ssh/:uid=2000,gid=2000
-    image: "dtagdevsec/wetty:1804"
-    read_only: true
--- a/etc/compose/industrial.yml
+++ b/etc/compose/industrial.yml
@ -324,26 +324,6 @@ services:
     - /data:/data
     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip

-# Netdata service
-  netdata:
-    container_name: netdata
-    restart: always
-    network_mode: "host"
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    cap_add:
-     - SYS_PTRACE
-    security_opt:
-     - apparmor=unconfined
-    ports:
-     - "64301:64301"
-    image: "dtagdevsec/netdata:1804"
-    volumes:
-     - /proc:/host/proc:ro
-     - /sys:/host/sys:ro
-     - /var/run/docker.sock:/var/run/docker.sock:ro
-
 # Nginx service
  nginx:
    container_name: nginx
@ -365,20 +345,6 @@ services:
     - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro
     - /data/nginx/log/:/var/log/nginx/

-# Portainer service
-  portainer:
-    container_name: portainer
-    command:  -H unix:///var/run/docker.sock --no-auth
-    restart: always
-    networks:
-     - portainer_local
-    ports:
-     - "127.0.0.1:64299:9000"
-    image: "dtagdevsec/portainer:1804"
-    read_only: true
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-
 # Spiderfoot service
  spiderfoot:
    container_name: spiderfoot
@ -390,16 +356,3 @@ services:
    image: "dtagdevsec/spiderfoot:1804"
    volumes:
     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db
-
-# Wetty service
-  wetty:
-    container_name: wetty
-    restart: always
-    stop_signal: SIGKILL
-    network_mode: "host"
-    env_file:
-     - /opt/tpot/etc/compose/wetty_environment
-    tmpfs:
-     - /home/wetty/.ssh/:uid=2000,gid=2000
-    image: "dtagdevsec/wetty:1804"
-    read_only: true
--- a/etc/compose/legacy.yml
+++ b/etc/compose/legacy.yml
@ -290,26 +290,6 @@ services:
     - /data:/data
     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip

-# Netdata service
-  netdata:
-    container_name: netdata
-    restart: always
-    network_mode: "host"
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    cap_add:
-     - SYS_PTRACE
-    security_opt:
-     - apparmor=unconfined
-    ports:
-     - "64301:64301"
-    image: "dtagdevsec/netdata:1804"
-    volumes:
-     - /proc:/host/proc:ro
-     - /sys:/host/sys:ro
-     - /var/run/docker.sock:/var/run/docker.sock:ro
-
 # Nginx service
  nginx:
    container_name: nginx
@ -331,20 +311,6 @@ services:
     - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro
     - /data/nginx/log/:/var/log/nginx/

-# Portainer service
-  portainer:
-    container_name: portainer
-    command:  -H unix:///var/run/docker.sock --no-auth
-    restart: always
-    networks:
-     - portainer_local
-    ports:
-     - "127.0.0.1:64299:9000"
-    image: "dtagdevsec/portainer:1804"
-    read_only: true
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-
 # Spiderfoot service
  spiderfoot:
    container_name: spiderfoot
@ -357,15 +323,3 @@ services:
    volumes:
     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db

-# Wetty service
-  wetty:
-    container_name: wetty
-    restart: always
-    stop_signal: SIGKILL
-    network_mode: "host"
-    env_file:
-     - /opt/tpot/etc/compose/wetty_environment
-    tmpfs:
-     - /home/wetty/.ssh/:uid=2000,gid=2000
-    image: "dtagdevsec/wetty:1804"
-    read_only: true
--- a/etc/compose/standard.yml
+++ b/etc/compose/standard.yml
@ -16,7 +16,6 @@ networks:
  vnclowpot_local:
  ewsposter_local:
  spiderfoot_local:
-  portainer_local:

 services:

@ -505,26 +504,6 @@ services:
     - /data:/data
     - /data/ews/conf/ews.ip:/opt/ewsposter/ews.ip

-# Netdata service
-  netdata:
-    container_name: netdata
-    restart: always
-    network_mode: "host"
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    cap_add:
-     - SYS_PTRACE
-    security_opt:
-     - apparmor=unconfined
-    ports:
-     - "64301:64301"
-    image: "dtagdevsec/netdata:1804"
-    volumes:
-     - /proc:/host/proc:ro
-     - /sys:/host/sys:ro
-     - /var/run/docker.sock:/var/run/docker.sock:ro
-
 # Nginx service
  nginx:
    container_name: nginx
@ -546,20 +525,6 @@ services:
     - /data/nginx/conf/nginxpasswd:/etc/nginx/nginxpasswd:ro
     - /data/nginx/log/:/var/log/nginx/

-# Portainer service
-  portainer:
-    container_name: portainer
-    command:  -H unix:///var/run/docker.sock --no-auth
-    restart: always
-    networks:
-     - portainer_local
-    ports:
-     - "127.0.0.1:64299:9000"
-    image: "dtagdevsec/portainer:1804"
-    read_only: true
-    volumes:
-     - /var/run/docker.sock:/var/run/docker.sock
-
 # Spiderfoot service
  spiderfoot:
    container_name: spiderfoot
@ -572,15 +537,3 @@ services:
    volumes:
     - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/spiderfoot.db

-# Wetty service
-  wetty:
-    container_name: wetty
-    restart: always
-    stop_signal: SIGKILL
-    network_mode: "host"
-    env_file:
-     - /opt/tpot/etc/compose/wetty_environment
-    tmpfs:
-     - /home/wetty/.ssh/:uid=2000,gid=2000
-    image: "dtagdevsec/wetty:1804"
-    read_only: true