From f24d4c3009f3e0f1dfd4ab3759befa3aae461562 Mon Sep 17 00:00:00 2001 From: Zaraki Date: Fri, 4 Oct 2019 16:26:19 +0200 Subject: [PATCH] fix: training-http level update --- levels/web/training-http/Dockerfile | 3 --- levels/web/training-http/Makefile | 4 ---- levels/web/training-http/docker-compose.yml | 7 +++++++ levels/web/training-http/front/Dockerfile | 3 +++ levels/web/training-http/{ => front}/on-init | 0 .../web/training-http/{ => front}/www/default.php | 0 .../web/training-http/{ => front}/www/header.php | 0 levels/web/training-http/{ => front}/www/index.php | 0 levels/web/training-http/{ => front}/www/post.php | 0 levels/web/training-http/{ => front}/www/redir.php | 0 levels/web/training-http/{ => front}/www/step1.php | 0 levels/web/training-http/{ => front}/www/step2.php | 0 levels/web/training-http/{ => front}/www/step3.php | 0 levels/web/training-http/{ => front}/www/step4.php | 0 levels/web/training-http/level.yml | 14 -------------- 15 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 levels/web/training-http/Dockerfile delete mode 100644 levels/web/training-http/Makefile create mode 100644 levels/web/training-http/docker-compose.yml create mode 100644 levels/web/training-http/front/Dockerfile rename levels/web/training-http/{ => front}/on-init (100%) rename levels/web/training-http/{ => front}/www/default.php (100%) rename levels/web/training-http/{ => front}/www/header.php (100%) rename levels/web/training-http/{ => front}/www/index.php (100%) rename levels/web/training-http/{ => front}/www/post.php (100%) rename levels/web/training-http/{ => front}/www/redir.php (100%) rename levels/web/training-http/{ => front}/www/step1.php (100%) rename levels/web/training-http/{ => front}/www/step2.php (100%) rename levels/web/training-http/{ => front}/www/step3.php (100%) rename levels/web/training-http/{ => front}/www/step4.php (100%) delete mode 100644 levels/web/training-http/level.yml diff --git a/levels/web/training-http/Dockerfile b/levels/web/training-http/Dockerfile deleted file mode 100644 index 25d16a3d6..000000000 --- a/levels/web/training-http/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM php:7-apache -COPY on-init /pathwar-hooks/ -COPY www/ /var/www/html \ No newline at end of file diff --git a/levels/web/training-http/Makefile b/levels/web/training-http/Makefile deleted file mode 100644 index 446f16983..000000000 --- a/levels/web/training-http/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -dev: - docker build -t pathwar/level-training-http . - pathwar.land hypervisor prune - pathwar.land hypervisor run --web-port=8899 pathwar/level-training-http diff --git a/levels/web/training-http/docker-compose.yml b/levels/web/training-http/docker-compose.yml new file mode 100644 index 000000000..36b7e384c --- /dev/null +++ b/levels/web/training-http/docker-compose.yml @@ -0,0 +1,7 @@ +version: '3.7' + +services: + front: + build: front + ports: + - 80 diff --git a/levels/web/training-http/front/Dockerfile b/levels/web/training-http/front/Dockerfile new file mode 100644 index 000000000..028a7879b --- /dev/null +++ b/levels/web/training-http/front/Dockerfile @@ -0,0 +1,3 @@ +FROM php:7.3-apache +COPY www/ /var/www/html/ +COPY on-init /pathwar-hooks/ diff --git a/levels/web/training-http/on-init b/levels/web/training-http/front/on-init similarity index 100% rename from levels/web/training-http/on-init rename to levels/web/training-http/front/on-init diff --git a/levels/web/training-http/www/default.php b/levels/web/training-http/front/www/default.php similarity index 100% rename from levels/web/training-http/www/default.php rename to levels/web/training-http/front/www/default.php diff --git a/levels/web/training-http/www/header.php b/levels/web/training-http/front/www/header.php similarity index 100% rename from levels/web/training-http/www/header.php rename to levels/web/training-http/front/www/header.php diff --git a/levels/web/training-http/www/index.php b/levels/web/training-http/front/www/index.php similarity index 100% rename from levels/web/training-http/www/index.php rename to levels/web/training-http/front/www/index.php diff --git a/levels/web/training-http/www/post.php b/levels/web/training-http/front/www/post.php similarity index 100% rename from levels/web/training-http/www/post.php rename to levels/web/training-http/front/www/post.php diff --git a/levels/web/training-http/www/redir.php b/levels/web/training-http/front/www/redir.php similarity index 100% rename from levels/web/training-http/www/redir.php rename to levels/web/training-http/front/www/redir.php diff --git a/levels/web/training-http/www/step1.php b/levels/web/training-http/front/www/step1.php similarity index 100% rename from levels/web/training-http/www/step1.php rename to levels/web/training-http/front/www/step1.php diff --git a/levels/web/training-http/www/step2.php b/levels/web/training-http/front/www/step2.php similarity index 100% rename from levels/web/training-http/www/step2.php rename to levels/web/training-http/front/www/step2.php diff --git a/levels/web/training-http/www/step3.php b/levels/web/training-http/front/www/step3.php similarity index 100% rename from levels/web/training-http/www/step3.php rename to levels/web/training-http/front/www/step3.php diff --git a/levels/web/training-http/www/step4.php b/levels/web/training-http/front/www/step4.php similarity index 100% rename from levels/web/training-http/www/step4.php rename to levels/web/training-http/front/www/step4.php diff --git a/levels/web/training-http/level.yml b/levels/web/training-http/level.yml deleted file mode 100644 index b79719d2a..000000000 --- a/levels/web/training-http/level.yml +++ /dev/null @@ -1,14 +0,0 @@ -level: - name: HTTP Tutorial - version: 1.0 - author: Pathwar team - passphrases: 4 - description: Introduction to HTTP - rootable: false - cpu_shares: 1/10 - memory_limit: 16M - tags: - - http - - tp - redump: 600 - lang: en