Redirect to Cockpit

diff --git a/docker/heimdall/Dockerfile b/docker/heimdall/Dockerfile index 6db49dfb..151ecce9 100644 --- a/docker/heimdall/Dockerfile +++ b/docker/heimdall/Dockerfile @@ -6,56 +6,64 @@ ADD dist/ /root/dist/ # Get and install dependencies & packages RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ apk -U --no-cache add \ - git \ - nginx \ - nginx-mod-http-headers-more \ - php7 \ - php7-cgi \ - php7-ctype \ - php7-fileinfo \ - php7-fpm \ - php7-json \ - php7-mbstring \ - php7-openssl \ - php7-pdo \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-session \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-zip + git \ + nginx \ + nginx-mod-http-headers-more \ + php7 \ + php7-cgi \ + php7-ctype \ + php7-fileinfo \ + php7-fpm \ + php7-json \ + php7-mbstring \ + php7-openssl \ + php7-pdo \ + php7-pdo_pgsql \ + php7-pdo_sqlite \ + php7-session \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-zip && \ # -# Clone Heimdall -RUN git clone https://github.com/linuxserver/heimdall && \ +# Clone and setup Heimdall, Nginx + git clone https://github.com/linuxserver/heimdall && \ cp -R heimdall/. /var/lib/nginx/html && \ rm -rf heimdall && \ cd /var/lib/nginx/html && \ cp .env.example .env && \ php artisan key:generate && \ +## Add previously configured content mkdir -p /var/lib/nginx/html/storage/app/public/backgrounds/ && \ cp /root/dist/app/bg1.jpg /var/lib/nginx/html/public/img/bg1.jpg && \ - #cp /root/dist/app/app.sqlite /var/lib/nginx/html/database/app.sqlite && \ + cp /root/dist/app/t-pot.png /var/lib/nginx/html/public/img/heimdall-icon-small.png && \ + cp /root/dist/app/app.sqlite /var/lib/nginx/html/database/app.sqlite && \ + cp /root/dist/app/cyberchef.png /var/lib/nginx/html/storage/app/public/icons/ZotKKZA2QKplZhdoF3WLx4UdKKhLFamf3lSMcLkr.png && \ + cp /root/dist/app/tsec.png /var/lib/nginx/html/storage/app/public/icons/RHwXCfCeGNDdhYgzlShL9o4NBFL2LHZWajgyeL0a.png && \ + cp /root/dist/app/spiderfoot.png /var/lib/nginx/html/storage/app/public/icons/eIllmzavE52rNpg9CBoMg1tymHjEOgUnSTHuBwzc.png && \ + cp /root/dist/html/*.html /var/lib/nginx/html/public/ && \ cp /root/dist/html/favicon.ico /var/lib/nginx/html/public/favicon-16x16.png && \ cp /root/dist/html/favicon.ico /var/lib/nginx/html/public/favicon-32x32.png && \ cp /root/dist/html/favicon.ico /var/lib/nginx/html/public/favicon-96x96.png && \ cp /root/dist/html/favicon.ico /var/lib/nginx/html/public/favicon.ico && \ +## Change ownership, permissions chown root:www-data -R /var/lib/nginx/html && \ chmod 775 -R /var/lib/nginx/html/storage && \ chmod 775 -R /var/lib/nginx/html/database && \ -# Setup configs sed -i "s/user = nobody/user = nginx/g" /etc/php7/php-fpm.d/www.conf && \ sed -i "s/group = nobody/group = nginx/g" /etc/php7/php-fpm.d/www.conf && \ sed -i "s/9000/64304/g" /etc/php7/php-fpm.d/www.conf && \ sed -i "s/APP_NAME=Heimdall/APP_NAME=T-Pot/g" /var/lib/nginx/html/.env && \ - #sed -i '/T-Pot");' /var/lib/nginx/html/public/index.php && \ - mkdir -p /run/nginx && \ + #mkdir -p /run/nginx && \ +## Add Nginx / T-Pot specific configs rm -rf /etc/nginx/conf.d/* /usr/share/nginx/html/* && \ cp /root/dist/conf/nginx.conf /etc/nginx/ && \ cp -R /root/dist/conf/ssl /etc/nginx/ && \ cp /root/dist/conf/tpotweb.conf /etc/nginx/conf.d/ && \ # # Clean up + apk del --purge \ + git && \ rm -rf /root/* && \ rm -rf /var/cache/apk/* # diff --git a/docker/heimdall/dist/app/BHegRMdhfy70b4vJdhECnxp05GaRZoNvilzxCB5M.png b/docker/heimdall/dist/app/BHegRMdhfy70b4vJdhECnxp05GaRZoNvilzxCB5M.png deleted file mode 100644 index a0be4e9b..00000000 Binary files a/docker/heimdall/dist/app/BHegRMdhfy70b4vJdhECnxp05GaRZoNvilzxCB5M.png and /dev/null differ diff --git a/docker/heimdall/dist/app/app.sqlite b/docker/heimdall/dist/app/app.sqlite index 94266b08..0afe0628 100755 Binary files a/docker/heimdall/dist/app/app.sqlite and b/docker/heimdall/dist/app/app.sqlite differ diff --git a/docker/heimdall/dist/app/cyberchef.png b/docker/heimdall/dist/app/cyberchef.png new file mode 100644 index 00000000..eb182286 Binary files /dev/null and b/docker/heimdall/dist/app/cyberchef.png differ diff --git a/docker/heimdall/dist/app/spiderfoot.png b/docker/heimdall/dist/app/spiderfoot.png new file mode 100644 index 00000000..d145db8b Binary files /dev/null and b/docker/heimdall/dist/app/spiderfoot.png differ diff --git a/docker/heimdall/dist/app/t-pot.png b/docker/heimdall/dist/app/t-pot.png new file mode 100644 index 00000000..0349351c Binary files /dev/null and b/docker/heimdall/dist/app/t-pot.png differ diff --git a/docker/heimdall/dist/app/tsec.png b/docker/heimdall/dist/app/tsec.png new file mode 100644 index 00000000..13fa75ab Binary files /dev/null and b/docker/heimdall/dist/app/tsec.png differ diff --git a/docker/heimdall/dist/html/cockpit.html b/docker/heimdall/dist/html/cockpit.html new file mode 100644 index 00000000..1484ad4b --- /dev/null +++ b/docker/heimdall/dist/html/cockpit.html @@ -0,0 +1,11 @@ + + + + + + + Redirect to Cockpit + + diff --git a/docker/heimdall/dist/html/navbar.html b/docker/heimdall/dist/html/navbar.html deleted file mode 100644 index 8c700ef3..00000000 --- a/docker/heimdall/dist/html/navbar.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - T-Pot - - - - - - Home - - CyberChef - ES Head - Kibana - Spiderfoot - - - - diff --git a/docker/heimdall/dist/html/style.css b/docker/heimdall/dist/html/style.css deleted file mode 100644 index 2696a613..00000000 --- a/docker/heimdall/dist/html/style.css +++ /dev/null @@ -1,17 +0,0 @@ -.btn { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0px; - font-family: Arial; - color: #ffffff; - font-size: 12px; - background: #E20074; - padding: 2px 30px 2px 30px; - text-decoration: none; -} - -.btn:hover { - background: #c2c2c2; - text-decoration: none; -} - diff --git a/docker/heimdall/dist/html/tpotweb.html b/docker/heimdall/dist/html/tpotweb.html deleted file mode 100644 index 5afd0404..00000000 --- a/docker/heimdall/dist/html/tpotweb.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - T-Pot - - - - - - - - - diff --git a/docker/heimdall/docker-compose.yml b/docker/heimdall/docker-compose.yml index 52d1d289..5a3cf2c0 100644 --- a/docker/heimdall/docker-compose.yml +++ b/docker/heimdall/docker-compose.yml @@ -7,13 +7,13 @@ services: build: . container_name: nginx restart: always - tmpfs: - - /var/tmp/nginx/client_body - - /var/tmp/nginx/proxy - - /var/tmp/nginx/fastcgi - - /var/tmp/nginx/uwsgi - - /var/tmp/nginx/scgi - - /run +# tmpfs: +# - /var/tmp/nginx/client_body +# - /var/tmp/nginx/proxy +# - /var/tmp/nginx/fastcgi +# - /var/tmp/nginx/uwsgi +# - /var/tmp/nginx/scgi +# - /run network_mode: "host" ports: - "64297:64297"