Clean up of environment nginx start-up

.gitignore

@@ -43,6 +43,7 @@ adminer.php
 nbproject/
 data/
 env/nginx/webserver/conf.d/default.conf
+env/nginx/ssl
 env/nginx/certs
 env/nginx/share
 env/nginx/webserver/vhost.d

env/nginx/Dockerfile

@@ -57,7 +57,7 @@ ADD ./certs /etc/nginx/certs
 #	apt-get update && \
 #	apt-get install -y python-certbot-nginx -t stretch-backports
 
-EXPOSE 80 443
+EXPOSE 80 443 8080
 
 # Execute Nginx config using environment variables to start all services
 CMD ["bash", "/scripts/start.sh"]

env/nginx/scripts/start.sh

@@ -14,24 +14,17 @@ if [ -f $ENV ]; then
 		exit 1
 	fi
 
-	if [ -z ${WEBROOT+x} ]; then
-		echo "WEBROOT not set!"
-		exit 1
-	fi
-
 	if [ -f $CONF_DEFAULT ]; then
 		rm $CONF_DEFAULT
 	fi
 
 	# Update CONF to match current domain env
 	if [ ! -f $CONF ]; then
 		CONF="/etc/nginx/conf.d/$VIRTUAL_HOST.template"
-		# CONF_DEFAULT="/etc/nginx/vhost.d/$VIRTUAL_HOST.conf"
 	fi
 
 	cp $CONF $CONF_DEFAULT
 	sed -i -e "s/{VIRTUAL_HOST}/${VIRTUAL_HOST}/g" $CONF_DEFAULT
-	sed -i -e "s/{WEBROOT}/${WEBROOT}/g" $CONF_DEFAULT
 	echo # \n
 	cat $CONF_DEFAULT
 	echo # \n

env/nginx/webserver/conf.d/www.naturalremedy.company.template

@@ -0,0 +1,27 @@
+server {
+	listen 8080;
+	listen [::]:8080;
+
+	server_name naturalremedy.company;
+	return 301 $scheme://www.naturalremedy.company$request_uri;
+}
+
+server {
+
+	listen 8080;
+	listen [::]:8080;
+
+	server_name www.naturalremedy.company;
+
+	set $MAGE_ROOT /home/www/naturalremedy/src;
+	set $code default;
+
+	root $MAGE_ROOT;
+	index index.php;
+
+	include /etc/nginx/defaults/magento1.conf;
+
+	location / {
+	    try_files $uri $uri/ /index.php$is_args$args;
+	}
+}

start.sh

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
-docker network create nginx-proxy
 docker-compose up -d --remove-orphans