fix error with variables

README.md

@@ -2,7 +2,7 @@
 # Ubuntu optimized configuration with EasyEngine
 ----
 ## Server Stack :
-* Nginx 1.13x
+* Nginx 1.14.x
 * PHP-FPM 7/7.1/7.2
 * MariaDB 10.2
 * REDIS 4.0
@@ -13,7 +13,7 @@
 
 ----
 
-All Instructions are available on the [repository Github page}(https://virtubox.github.io/ubuntu-nginx-web-server/)
+## All Instructions and informations are listed on the [Github page](https://virtubox.github.io/ubuntu-nginx-web-server/)
 
 Configuration files with comments and informations available by following the link **source**
 

docs/README.md

@@ -2,7 +2,7 @@
 # Ubuntu optimized configuration with EasyEngine
 ----
 ## Server Stack :
-* Nginx 1.13x
+* Nginx 1.14.x
 * PHP-FPM 7/7.1/7.2
 * MariaDB 10.2
 * REDIS 4.0

scripts/ee-acme-cf.sh

@@ -25,30 +25,30 @@ fi
 ~/.acme.sh/acme.sh --issue -d "$domain_name" -d www."$domain_name"  --keylength ec-384 --dns  dns_cf --dnssleep 60
 
 
-if [ ! -d /etc/letsencrypt/live/"$domain_name" ]; then
+if [ ! -d /etc/letsencrypt/live/$domain_name ]; then
   
 # create folder to store certificate  
-mkdir -p /etc/letsencrypt/live/"$domain_name"
+mkdir -p /etc/letsencrypt/live/$domain_name
 fi
 
 # install the cert and reload nginx
 acme.sh --install-cert -d "$domain_name" --ecc \
---cert-file /etc/letsencrypt/live/"$domain_name"/cert.pem \
---key-file /etc/letsencrypt/live/"$domain_name"/key.pem \
---fullchain-file /etc/letsencrypt/live/"$domain_name"/fullchain.pem \
+--cert-file /etc/letsencrypt/live/$domain_name/cert.pem \
+--key-file /etc/letsencrypt/live/$domain_name/key.pem \
+--fullchain-file /etc/letsencrypt/live/$domain_name/fullchain.pem \
 --reloadcmd "systemctl reload nginx.service"
 
 # add certificate to the nginx vhost configuration
 
-if [ ! -f /var/www/"$domain_name"/conf/nginx/ssl.conf ]; then
+if [ ! -f /var/www/$domain_name/conf/nginx/ssl.conf ]; then
 
-cat <<EOF >/var/www/"$domain_name"/conf/nginx/ssl.conf
+cat <<EOF >/var/www/$domain_name/conf/nginx/ssl.conf
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     ssl on;    
-    ssl_certificate /etc/letsencrypt/live/"$domain_name"/fullchain.pem;
-    ssl_certificate_key    /etc/letsencrypt/"$domain_name"/vtbox.cf/privkey.pem;
-    ssl_trusted_certificate /etc/letsencrypt/"$domain_name"/cert.pem;
+    ssl_certificate /etc/letsencrypt/live/$domain_name/fullchain.pem;
+    ssl_certificate_key    /etc/letsencrypt/$domain_name/vtbox.cf/privkey.pem;
+    ssl_trusted_certificate /etc/letsencrypt/$domain_name/cert.pem;
 EOF
 fi
 
@@ -94,21 +94,21 @@ fi
 # issue cert
 acme.sh --issue -d "$domain_name" --keylength ec-384 --dns  dns_cf --dnssleep 60
 
-if [ ! -d /etc/letsencrypt/live/"$domain_name" ]; then
+if [ ! -d /etc/letsencrypt/live/$domain_name ]; then
   
 # create folder to store certificate  
-mkdir -p /etc/letsencrypt/live/"$domain_name"
+mkdir -p /etc/letsencrypt/live/$domain_name
 fi
 
 if [ ! -f /etc/nginx/conf.d/force-ssl-"$domain_name".conf ]; then
 # add certificate to the nginx vhost configuration
-cat <<EOF >/var/www/"$domain_name"/conf/nginx/ssl.conf
+cat <<EOF >/var/www/$domain_name/conf/nginx/ssl.conf
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     ssl on;
-    ssl_certificate /etc/letsencrypt/live/"$domain_name"/fullchain.pem;
-    ssl_certificate_key     /etc/letsencrypt/live/"$domain_name"/key.pem;
-    ssl_trusted_certificate /etc/letsencrypt/live/"$domain_name"/cert.pem;
+    ssl_certificate /etc/letsencrypt/live/$domain_name/fullchain.pem;
+    ssl_certificate_key     /etc/letsencrypt/live/$domain_name/key.pem;
+    ssl_trusted_certificate /etc/letsencrypt/live/$domain_name/cert.pem;
 EOF
 fi
 
@@ -126,9 +126,9 @@ fi
 
 # install the cert and reload nginx
 .acme.sh/acme.sh --install-cert -d "$domain_name" --ecc \
---cert-file /etc/letsencrypt/live/"$domain_name"/cert.pem \
---key-file /etc/letsencrypt/live/"$domain_name"/key.pem \
---fullchain-file /etc/letsencrypt/live/"$domain_name"/fullchain.pem \
+--cert-file /etc/letsencrypt/live/$domain_name/cert.pem \
+--key-file /etc/letsencrypt/live/$domain_name/key.pem \
+--fullchain-file /etc/letsencrypt/live/$domain_name/fullchain.pem \
 --reloadcmd "systemctl reload nginx.service"
 
 }

scripts/ee-acme-standalone.sh

@@ -25,30 +25,30 @@ fi
 ~/.acme.sh/acme.sh --issue -d "$domain_name" -d www.$domain_name --keylength ec-384 --standalone --pre-hook "systemctl stop nginx" --post-hook "systemctl start nginx"
 
 
-if [ ! -d /etc/letsencrypt/live/"$domain_name" ]; then
+if [ ! -d /etc/letsencrypt/live/$domain_name ]; then
   
 # create folder to store certificate  
-mkdir -p /etc/letsencrypt/live/"$domain_name"
+mkdir -p /etc/letsencrypt/live/$domain_name
 fi
 
 # install the cert and reload nginx
 acme.sh --install-cert -d "$domain_name" --ecc \
---cert-file /etc/letsencrypt/live/"$domain_name"/cert.pem \
---key-file /etc/letsencrypt/live/"$domain_name"/key.pem \
---fullchain-file /etc/letsencrypt/live/"$domain_name"/fullchain.pem \
+--cert-file /etc/letsencrypt/live/$domain_name/cert.pem \
+--key-file /etc/letsencrypt/live/$domain_name/key.pem \
+--fullchain-file /etc/letsencrypt/live/$domain_name/fullchain.pem \
 --reloadcmd "systemctl reload nginx.service"
 
 # add certificate to the nginx vhost configuration
 
-if [ ! -f /var/www/"$domain_name"/conf/nginx/ssl.conf ]; then
+if [ ! -f /var/www/$domain_name/conf/nginx/ssl.conf ]; then
 
-cat <<EOF >/var/www/"$domain_name"/conf/nginx/ssl.conf
+cat <<EOF >/var/www/$domain_name/conf/nginx/ssl.conf
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     ssl on;    
-    ssl_certificate /etc/letsencrypt/live/"$domain_name"/fullchain.pem;
-    ssl_certificate_key    /etc/letsencrypt/"$domain_name"/vtbox.cf/privkey.pem;
-    ssl_trusted_certificate /etc/letsencrypt/"$domain_name"/cert.pem;
+    ssl_certificate /etc/letsencrypt/live/$domain_name/fullchain.pem;
+    ssl_certificate_key    /etc/letsencrypt/$domain_name/vtbox.cf/privkey.pem;
+    ssl_trusted_certificate /etc/letsencrypt/$domain_name/cert.pem;
 EOF
 fi
 
@@ -94,21 +94,21 @@ fi
 # issue cert
 ~/.acme.sh/acme.sh --issue -d "$domain_name" --keylength ec-384 --standalone --pre-hook "systemctl stop nginx" --post-hook "systemctl start nginx"
 
-if [ ! -d /etc/letsencrypt/live/"$domain_name" ]; then
+if [ ! -d /etc/letsencrypt/live/$domain_name ]; then
   
 # create folder to store certificate  
-mkdir -p /etc/letsencrypt/live/"$domain_name"
+mkdir -p /etc/letsencrypt/live/$domain_name
 fi
 
 if [ ! -f /etc/nginx/conf.d/force-ssl-"$domain_name".conf ]; then
 # add certificate to the nginx vhost configuration
-cat <<EOF >/var/www/"$domain_name"/conf/nginx/ssl.conf
+cat <<EOF >/var/www/$domain_name/conf/nginx/ssl.conf
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     ssl on;
-    ssl_certificate /etc/letsencrypt/live/"$domain_name"/fullchain.pem;
-    ssl_certificate_key     /etc/letsencrypt/live/"$domain_name"/key.pem;
-    ssl_trusted_certificate /etc/letsencrypt/live/"$domain_name"/cert.pem;
+    ssl_certificate /etc/letsencrypt/live/$domain_name/fullchain.pem;
+    ssl_certificate_key     /etc/letsencrypt/live/$domain_name/key.pem;
+    ssl_trusted_certificate /etc/letsencrypt/live/$domain_name/cert.pem;
 EOF
 fi
 
@@ -126,9 +126,9 @@ fi
 
 # install the cert and reload nginx
 .acme.sh/acme.sh --install-cert -d "$domain_name" --ecc \
---cert-file /etc/letsencrypt/live/"$domain_name"/cert.pem \
---key-file /etc/letsencrypt/live/"$domain_name"/key.pem \
---fullchain-file /etc/letsencrypt/live/"$domain_name"/fullchain.pem \
+--cert-file /etc/letsencrypt/live/$domain_name/cert.pem \
+--key-file /etc/letsencrypt/live/$domain_name/key.pem \
+--fullchain-file /etc/letsencrypt/live/$domain_name/fullchain.pem \
 --reloadcmd "systemctl reload nginx.service"
 
 }

scripts/init.sh

@@ -1,10 +1,15 @@
 #!/bin/bash
 
+# automated EasyEngine server configuration script 
+# dev currently in progress, not ready to be used
+
 CSI="\\033["
 CEND="${CSI}0m"
 CRED="${CSI}1;31m"
 CGREEN="${CSI}1;32m"
 
+
+
 # Check if user is root
 if [ "$(id -u)" != "0" ]; then
     echo "Error: You must be root to run this script, please use the root user to install the software."