From 0fa3c7715bbd83cd3819a3548bac595b6d5f4c04 Mon Sep 17 00:00:00 2001 From: Lukian Date: Tue, 21 Jan 2025 10:43:32 +0100 Subject: [PATCH] Refactor project structure: remove obsolete files, add new Dockerfile for Apache, and integrate React app with TypeScript support --- {docker => apache}/apache2/000-default.conf | 0 {docker => apache}/apache2/default-ssl.conf | 0 {docker => apache}/apache2/dockerfile | 0 {docker => apache}/apache2/react-page/.gitignore | 0 {docker => apache}/apache2/react-page/README.md | 0 {docker => apache}/apache2/react-page/eslint.config.js | 0 {docker => apache}/apache2/react-page/index.html | 0 {docker => apache}/apache2/react-page/package-lock.json | 0 {docker => apache}/apache2/react-page/package.json | 0 {docker => apache}/apache2/react-page/public/vite.svg | 0 {docker => apache}/apache2/react-page/src/App.css | 0 {docker => apache}/apache2/react-page/src/App.tsx | 0 {docker => apache}/apache2/react-page/src/assets/react.svg | 0 {docker => apache}/apache2/react-page/src/index.css | 0 {docker => apache}/apache2/react-page/src/main.tsx | 0 {docker => apache}/apache2/react-page/src/vite-env.d.ts | 0 {docker => apache}/apache2/react-page/tsconfig.app.json | 0 {docker => apache}/apache2/react-page/tsconfig.json | 0 {docker => apache}/apache2/react-page/tsconfig.node.json | 0 {docker => apache}/apache2/react-page/vite.config.ts | 0 {docker => apache}/apache2/ssl/CA.crt | 0 {docker => apache}/apache2/ssl/CA.key | 0 {docker => apache}/apache2/ssl/CA.srl | 0 {docker => apache}/apache2/ssl/cert.crt | 0 {docker => apache}/apache2/ssl/certifactes.csr | 0 {docker => apache}/apache2/ssl/private-rsa.key | 0 {docker => apache}/apache2/ssl/public.key | 0 {docker => apache}/apache2/ssl/public.pub | 0 {docker => apache}/apache2/ssl/request.csr | 0 {docker => apache}/attacker/dockerfile | 0 {docker => apache}/attacker/ip_forward | 0 compose.yml => apache/compose.yml | 4 ++-- 32 files changed, 2 insertions(+), 2 deletions(-) rename {docker => apache}/apache2/000-default.conf (100%) rename {docker => apache}/apache2/default-ssl.conf (100%) rename {docker => apache}/apache2/dockerfile (100%) rename {docker => apache}/apache2/react-page/.gitignore (100%) rename {docker => apache}/apache2/react-page/README.md (100%) rename {docker => apache}/apache2/react-page/eslint.config.js (100%) rename {docker => apache}/apache2/react-page/index.html (100%) rename {docker => apache}/apache2/react-page/package-lock.json (100%) rename {docker => apache}/apache2/react-page/package.json (100%) rename {docker => apache}/apache2/react-page/public/vite.svg (100%) rename {docker => apache}/apache2/react-page/src/App.css (100%) rename {docker => apache}/apache2/react-page/src/App.tsx (100%) rename {docker => apache}/apache2/react-page/src/assets/react.svg (100%) rename {docker => apache}/apache2/react-page/src/index.css (100%) rename {docker => apache}/apache2/react-page/src/main.tsx (100%) rename {docker => apache}/apache2/react-page/src/vite-env.d.ts (100%) rename {docker => apache}/apache2/react-page/tsconfig.app.json (100%) rename {docker => apache}/apache2/react-page/tsconfig.json (100%) rename {docker => apache}/apache2/react-page/tsconfig.node.json (100%) rename {docker => apache}/apache2/react-page/vite.config.ts (100%) rename {docker => apache}/apache2/ssl/CA.crt (100%) rename {docker => apache}/apache2/ssl/CA.key (100%) rename {docker => apache}/apache2/ssl/CA.srl (100%) rename {docker => apache}/apache2/ssl/cert.crt (100%) rename {docker => apache}/apache2/ssl/certifactes.csr (100%) rename {docker => apache}/apache2/ssl/private-rsa.key (100%) rename {docker => apache}/apache2/ssl/public.key (100%) rename {docker => apache}/apache2/ssl/public.pub (100%) rename {docker => apache}/apache2/ssl/request.csr (100%) rename {docker => apache}/attacker/dockerfile (100%) rename {docker => apache}/attacker/ip_forward (100%) rename compose.yml => apache/compose.yml (86%) diff --git a/docker/apache2/000-default.conf b/apache/apache2/000-default.conf similarity index 100% rename from docker/apache2/000-default.conf rename to apache/apache2/000-default.conf diff --git a/docker/apache2/default-ssl.conf b/apache/apache2/default-ssl.conf similarity index 100% rename from docker/apache2/default-ssl.conf rename to apache/apache2/default-ssl.conf diff --git a/docker/apache2/dockerfile b/apache/apache2/dockerfile similarity index 100% rename from docker/apache2/dockerfile rename to apache/apache2/dockerfile diff --git a/docker/apache2/react-page/.gitignore b/apache/apache2/react-page/.gitignore similarity index 100% rename from docker/apache2/react-page/.gitignore rename to apache/apache2/react-page/.gitignore diff --git a/docker/apache2/react-page/README.md b/apache/apache2/react-page/README.md similarity index 100% rename from docker/apache2/react-page/README.md rename to apache/apache2/react-page/README.md diff --git a/docker/apache2/react-page/eslint.config.js b/apache/apache2/react-page/eslint.config.js similarity index 100% rename from docker/apache2/react-page/eslint.config.js rename to apache/apache2/react-page/eslint.config.js diff --git a/docker/apache2/react-page/index.html b/apache/apache2/react-page/index.html similarity index 100% rename from docker/apache2/react-page/index.html rename to apache/apache2/react-page/index.html diff --git a/docker/apache2/react-page/package-lock.json b/apache/apache2/react-page/package-lock.json similarity index 100% rename from docker/apache2/react-page/package-lock.json rename to apache/apache2/react-page/package-lock.json diff --git a/docker/apache2/react-page/package.json b/apache/apache2/react-page/package.json similarity index 100% rename from docker/apache2/react-page/package.json rename to apache/apache2/react-page/package.json diff --git a/docker/apache2/react-page/public/vite.svg b/apache/apache2/react-page/public/vite.svg similarity index 100% rename from docker/apache2/react-page/public/vite.svg rename to apache/apache2/react-page/public/vite.svg diff --git a/docker/apache2/react-page/src/App.css b/apache/apache2/react-page/src/App.css similarity index 100% rename from docker/apache2/react-page/src/App.css rename to apache/apache2/react-page/src/App.css diff --git a/docker/apache2/react-page/src/App.tsx b/apache/apache2/react-page/src/App.tsx similarity index 100% rename from docker/apache2/react-page/src/App.tsx rename to apache/apache2/react-page/src/App.tsx diff --git a/docker/apache2/react-page/src/assets/react.svg b/apache/apache2/react-page/src/assets/react.svg similarity index 100% rename from docker/apache2/react-page/src/assets/react.svg rename to apache/apache2/react-page/src/assets/react.svg diff --git a/docker/apache2/react-page/src/index.css b/apache/apache2/react-page/src/index.css similarity index 100% rename from docker/apache2/react-page/src/index.css rename to apache/apache2/react-page/src/index.css diff --git a/docker/apache2/react-page/src/main.tsx b/apache/apache2/react-page/src/main.tsx similarity index 100% rename from docker/apache2/react-page/src/main.tsx rename to apache/apache2/react-page/src/main.tsx diff --git a/docker/apache2/react-page/src/vite-env.d.ts b/apache/apache2/react-page/src/vite-env.d.ts similarity index 100% rename from docker/apache2/react-page/src/vite-env.d.ts rename to apache/apache2/react-page/src/vite-env.d.ts diff --git a/docker/apache2/react-page/tsconfig.app.json b/apache/apache2/react-page/tsconfig.app.json similarity index 100% rename from docker/apache2/react-page/tsconfig.app.json rename to apache/apache2/react-page/tsconfig.app.json diff --git a/docker/apache2/react-page/tsconfig.json b/apache/apache2/react-page/tsconfig.json similarity index 100% rename from docker/apache2/react-page/tsconfig.json rename to apache/apache2/react-page/tsconfig.json diff --git a/docker/apache2/react-page/tsconfig.node.json b/apache/apache2/react-page/tsconfig.node.json similarity index 100% rename from docker/apache2/react-page/tsconfig.node.json rename to apache/apache2/react-page/tsconfig.node.json diff --git a/docker/apache2/react-page/vite.config.ts b/apache/apache2/react-page/vite.config.ts similarity index 100% rename from docker/apache2/react-page/vite.config.ts rename to apache/apache2/react-page/vite.config.ts diff --git a/docker/apache2/ssl/CA.crt b/apache/apache2/ssl/CA.crt similarity index 100% rename from docker/apache2/ssl/CA.crt rename to apache/apache2/ssl/CA.crt diff --git a/docker/apache2/ssl/CA.key b/apache/apache2/ssl/CA.key similarity index 100% rename from docker/apache2/ssl/CA.key rename to apache/apache2/ssl/CA.key diff --git a/docker/apache2/ssl/CA.srl b/apache/apache2/ssl/CA.srl similarity index 100% rename from docker/apache2/ssl/CA.srl rename to apache/apache2/ssl/CA.srl diff --git a/docker/apache2/ssl/cert.crt b/apache/apache2/ssl/cert.crt similarity index 100% rename from docker/apache2/ssl/cert.crt rename to apache/apache2/ssl/cert.crt diff --git a/docker/apache2/ssl/certifactes.csr b/apache/apache2/ssl/certifactes.csr similarity index 100% rename from docker/apache2/ssl/certifactes.csr rename to apache/apache2/ssl/certifactes.csr diff --git a/docker/apache2/ssl/private-rsa.key b/apache/apache2/ssl/private-rsa.key similarity index 100% rename from docker/apache2/ssl/private-rsa.key rename to apache/apache2/ssl/private-rsa.key diff --git a/docker/apache2/ssl/public.key b/apache/apache2/ssl/public.key similarity index 100% rename from docker/apache2/ssl/public.key rename to apache/apache2/ssl/public.key diff --git a/docker/apache2/ssl/public.pub b/apache/apache2/ssl/public.pub similarity index 100% rename from docker/apache2/ssl/public.pub rename to apache/apache2/ssl/public.pub diff --git a/docker/apache2/ssl/request.csr b/apache/apache2/ssl/request.csr similarity index 100% rename from docker/apache2/ssl/request.csr rename to apache/apache2/ssl/request.csr diff --git a/docker/attacker/dockerfile b/apache/attacker/dockerfile similarity index 100% rename from docker/attacker/dockerfile rename to apache/attacker/dockerfile diff --git a/docker/attacker/ip_forward b/apache/attacker/ip_forward similarity index 100% rename from docker/attacker/ip_forward rename to apache/attacker/ip_forward diff --git a/compose.yml b/apache/compose.yml similarity index 86% rename from compose.yml rename to apache/compose.yml index 27c10d2..a832140 100644 --- a/compose.yml +++ b/apache/compose.yml @@ -1,6 +1,6 @@ services: webserver: - build: docker/apache2 + build: ./apache2 container_name: webserver ports: - 5000:5000 @@ -9,7 +9,7 @@ services: networks: - mynetwork attacker: - build: docker/attacker + build: ./attacker container_name: attacker ports: - 5001:5001