From 0da22ddd1aa031c9e2abd017d4da61bd1a53fe72 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Thu, 12 Jul 2018 15:50:34 -0400
Subject: [PATCH] Corrections for Wiki path

---
 Makefile           | 15 +++++++--------
 docker-compose.yml |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 5d3722b..f13b6d0 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ restart: init
 clone:
 	@$(shell git clone https://github.com/Open-RSC/Website.git)
 	@$(shell git clone https://github.com/Open-RSC/Game.git)
-	@$(shell git clone https://github.com/Open-RSC/Wiki.git)
+	@$(shell cd Website && git clone https://github.com/Open-RSC/Wiki.git)
 	#@$(shell sudo chmod -R 777 Website && sudo chmod -R 777 Game && sudo chmod 644 Website/board/config.php)
 
 clone-windows-website:
@@ -26,17 +26,17 @@ clone-windows-game:
 	#icacls Game /grant Everyone:F /t
 
 clone-windows-wiki:
-	@git clone https://github.com/Open-RSC/Wiki.git
+	@git clone https://github.com/Open-RSC/Wiki.git Website/Wiki
 
 pull:
 	@$(shell cd Website && git pull)
 	@$(shell cd Game && git pull)
-	@$(shell cd Wiki && git pull)
+	@$(shell cd Website/Wiki && git pull)
 
 pull-windows:
 	@cd Website && git pull
 	@cd Game && git pull
-	@cd Wiki && git pull
+	@cd Website/Wiki && git pull
 
 logs:
 	@docker-compose logs -f
@@ -60,21 +60,20 @@ import:
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql 2>/dev/null
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql 2>/dev/null
 	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql 2>/dev/null
-	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Wiki/openrsc_wiki.sql 2>/dev/null
+	@docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql 2>/dev/null
 
 import-windows:
 	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_logs.sql
 	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc_config.sql
 	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Game/Databases/openrsc.sql
 	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/openrsc_forum.sql
-	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Wiki/openrsc_wiki.sql
+	@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < Website/Wiki/openrsc_wiki.sql
 
 flush:
-	@$(shell rm -rf Website && rm -rf Game && rm -rf Wiki)
+	@$(shell rm -rf Website && rm -rf Game)
 
 flush-windows:
 	@rmdir "Website" /s /Q
 	@rmdir "Game" /s /Q
-	@rmdir "Wiki" /s /Q
 
 .PHONY: clean test code-sniff init
diff --git a/docker-compose.yml b/docker-compose.yml
index 19cc6fd..7af7e88 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,6 @@ services:
             - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
             - "./etc/ssl:/etc/ssl"
             - "./Website:/var/www/html/public"
-            - "./Wiki:/var/www/html/public/wiki"
             - "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
         ports:
             - "80:80"
@@ -24,7 +23,6 @@ services:
         volumes:
             - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
             - "./Website:/var/www/html/public"
-            - "./Wiki:/var/www/html/public/wiki"
     myadmin:
         image: phpmyadmin/phpmyadmin
         container_name: phpmyadmin