From a4c75e635ddd86ed1430e43180b423b5335d641f Mon Sep 17 00:00:00 2001
From: Daniel Goldsmith <aa9863@coventry.ac.uk>
Date: Tue, 19 Jan 2021 19:40:09 +0000
Subject: [PATCH] Rename, so XSS and RCE are the correct way areound

---
 Week1/CTF_RCE/docker-compose.yaml        | 31 -----------------
 Week1/CTF_RemoteCode/docker-compose.yaml | 37 ++++++++++++++++++++
 Week1/CTF_XSS/docker-compose.yaml        | 44 ++++++++++--------------
 3 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 Week1/CTF_RCE/docker-compose.yaml
 create mode 100644 Week1/CTF_RemoteCode/docker-compose.yaml

diff --git a/Week1/CTF_RCE/docker-compose.yaml b/Week1/CTF_RCE/docker-compose.yaml
deleted file mode 100644
index 6677464..0000000
--- a/Week1/CTF_RCE/docker-compose.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: '3'
-services:
-  web:
-    image: cueh/6005_fc-web
-    #build:
-    #  context: html
-    ports:
-      - "80:80"
-    #restart: always
-      
-  selenium:
-    image: selenium/standalone-chrome
-    volumes:
-      - /dev/shm:/dev/shm
-    #ports:
-    #  - 4444:4444
-      
-  pychecker:
-    depends_on:
-      - web
-      - selenium
-    image: cueh/6005_fc_checker
-    #build:
-    #  context: Python
-
-  overflow:
-    image: cueh/6005_fc-exploit
-    #build:
-    #  context: Exploit
-    ports:
-      - "22:22"
diff --git a/Week1/CTF_RemoteCode/docker-compose.yaml b/Week1/CTF_RemoteCode/docker-compose.yaml
new file mode 100644
index 0000000..bdbf6ae
--- /dev/null
+++ b/Week1/CTF_RemoteCode/docker-compose.yaml
@@ -0,0 +1,37 @@
+version: '3'
+services:
+  web:
+    image: cueh/6005_moodle-web
+    #build:
+    #  context: MoodleWeb
+    ports:
+      - "80:80"
+    networks:
+      - external_network
+      - internal_network
+    #restart: always
+
+  database:
+    image: cueh/6005_moodle-db
+    #build:
+    #  context: DB
+    environment:
+      - MYSQL_ROOT_PASSWORD=theMoodleUser
+      - MYSQL_DATABASE=moodle
+    networks:
+      - internal_network
+  
+  vuln:
+    image: cueh/6005_moodle-exploit
+    #build:
+    #  context: Exploit
+    ports:
+      - "22:22"
+    networks:
+      - external_network
+      
+networks:
+  external_network:
+    driver: bridge
+  internal_network:
+    driver: bridge
diff --git a/Week1/CTF_XSS/docker-compose.yaml b/Week1/CTF_XSS/docker-compose.yaml
index bdbf6ae..6677464 100644
--- a/Week1/CTF_XSS/docker-compose.yaml
+++ b/Week1/CTF_XSS/docker-compose.yaml
@@ -1,37 +1,31 @@
 version: '3'
 services:
   web:
-    image: cueh/6005_moodle-web
+    image: cueh/6005_fc-web
     #build:
-    #  context: MoodleWeb
+    #  context: html
     ports:
       - "80:80"
-    networks:
-      - external_network
-      - internal_network
     #restart: always
-
-  database:
-    image: cueh/6005_moodle-db
+      
+  selenium:
+    image: selenium/standalone-chrome
+    volumes:
+      - /dev/shm:/dev/shm
+    #ports:
+    #  - 4444:4444
+      
+  pychecker:
+    depends_on:
+      - web
+      - selenium
+    image: cueh/6005_fc_checker
     #build:
-    #  context: DB
-    environment:
-      - MYSQL_ROOT_PASSWORD=theMoodleUser
-      - MYSQL_DATABASE=moodle
-    networks:
-      - internal_network
-  
-  vuln:
-    image: cueh/6005_moodle-exploit
+    #  context: Python
+
+  overflow:
+    image: cueh/6005_fc-exploit
     #build:
     #  context: Exploit
     ports:
       - "22:22"
-    networks:
-      - external_network
-      
-networks:
-  external_network:
-    driver: bridge
-  internal_network:
-    driver: bridge