chore: add Makefile & .env file to simplify deployment

.editorconfig

@@ -0,0 +1,21 @@
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+spaces_around_brackets = outside
+spaces_around_operators = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{php, js}]
+quote_type = single
+
+[Makefile]
+indent_style = tab
+
+[*.mk]
+indent_style = tab

.env.example

@@ -0,0 +1,12 @@
+MEDIAWIKIVERSION=1.31
+
+AUTOINSTALL=oui
+SERVERURL=http://localhost
+WIKINAME=NaoWiki
+DBNAME=mediawiki
+DBPASS=HC51qp6xYIK
+ADMINUSER=Admin
+ADMINPASSWORD=EDI917VJb30
+
+WEB_PORT=80
+WEB_SSL_PORT=443

.gitignore

@@ -1 +1,2 @@
-distribution-files/mediawiki/
+distribution-files/*
+.env

Makefile

@@ -0,0 +1,30 @@
+# Spread cli arguments
+ifneq (,$(filter $(firstword $(MAKECMDGOALS)),exec))
+    CLI_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
+    $(eval $(CLI_ARGS):;@:)
+endif
+
+docker-compose = docker-compose -f docker-compose.yml $1
+
+-include .env
+
+init:
+	cp .env.example .env
+
+config:
+	sed -i 's/MYSQL_ROOT_PASSWORD=.*/MYSQL_ROOT_PASSWORD=${DBPASS}/g' ./docker-compose.yml
+	sed -i 's/MYSQL_ROOT_PASSWORD=.*/MYSQL_ROOT_PASSWORD=${DBPASS}/g' ./autoinstall.yml
+	sed -i 's/MYSQL_PASSWORD=.*/MYSQL_PASSWORD=${DBPASS}/g' ./docker-compose.yml
+	sed -i 's/MYSQL_PASSWORD=.*/MYSQL_PASSWORD=${DBPASS}/g' ./autoinstall.yml
+	sudo ./runfirst.bash
+
+up:
+	$(call docker-compose, up -d --force-recreate)
+
+down:
+	$(call docker-compose, down --volumes)
+
+reup: down up
+
+destroy:
+	@if [ -d ./distribution-files/mediawiki ]; then sudo rm -fr ./distribution-files/mediawiki; fi

README.md

@@ -7,10 +7,11 @@ Project Compendium: http://binaryoasis.com:8000 (Not quite reflective of the reb
 ## TLDR:
 Runs on linux (only) kernel 3.10+ - Only tested on ubuntu 16.04
 
-Set vars in `runfirst.bash` if you want auto install
+Set vars in `.env` if you want auto install (after `make init`)
 ```
-sudo ./runfirst.bash
-sudo docker-compose up -d --force-recreate
+make init
+make config
+make up
 ```
 
 ## Freshly re-engineered!

docker-compose.yml

@@ -38,8 +38,8 @@ services:
   nginx:
     image: nginx:1.10
     ports:
-    - "80:80"
-    - "443:443"
+    - "${WEB_PORT}:80"
+    - "${WEB_SSL_PORT}:443"
     volumes:
     - "./distribution-files/nginx:/etc/nginx"
     - "./distribution-files/mediawiki:/var/www/mediawiki"

runfirst.bash

@@ -5,25 +5,7 @@ if [[ $EUID -ne 0 ]]; then
 fi
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-MEDIAWIKIVERSION="1.30"
-
-#Auto Install Variables
-AUTOINSTALL="false" #Does not auto install by default. Set to anything other than false
-SERVERURL="https://localhost" #No Trailing slash
-WIKINAME="My Wiki"
-DBNAME="mediawiki"
-#NOTE: Due to interpolation, may have issues with special charecters on passwords.
-#NOTE: This Will override the password set in the docker-compose file
-DBPASS="HC51qp6xYIK"
-ADMINUSER="Admin"
-ADMINPASSWORD="EDI917VJb30" #Due to interpolation, may have issues with special charecters
-
-#### Begin all the things you don't need to worry about ####
-
-sed -i "s/MYSQL_ROOT_PASSWORD=.*/MYSQL_ROOT_PASSWORD=$DBPASS/g" $DIR/docker-compose.yml
-sed -i "s/MYSQL_ROOT_PASSWORD=.*/MYSQL_ROOT_PASSWORD=$DBPASS/g" $DIR/autoinstall.yml
-sed -i "s/MYSQL_PASSWORD=.*/MYSQL_PASSWORD=$DBPASS/g" $DIR/docker-compose.yml
-sed -i "s/MYSQL_PASSWORD=.*/MYSQL_PASSWORD=$DBPASS/g" $DIR/autoinstall.yml
+source .env
 
 #system prep
 command -v docker >/dev/null 2>&1 || { curl -s https://get.docker.com/ | bash; }
@@ -148,5 +130,5 @@ if [[ $AUTOINSTALL != "false" ]]; then
   docker rm -f no-one-else-should-be-using-this-name-or-this
 
   clear
-  printf "\nYour wiki has been created, now you can run:\ndocker-compose up [-d] [--force-recreate] \n\n"
+  printf "\nYour wiki has been created, now you can run:\nmake up \n\n"
 fi