diff options
-rwxr-xr-x | netzbon/config_nginx.sh | 20 | ||||
-rwxr-xr-x | netzbon/functions.sh | 2 | ||||
-rw-r--r-- | netzbon/nginx-conf/backend.taler-nginx.conf | 2 | ||||
-rw-r--r-- | netzbon/nginx-conf/bank.taler-nginx.conf | 2 | ||||
-rw-r--r-- | netzbon/nginx-conf/exchange.taler-nginx.conf | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/netzbon/config_nginx.sh b/netzbon/config_nginx.sh index 9c5bf55..b5d824b 100755 --- a/netzbon/config_nginx.sh +++ b/netzbon/config_nginx.sh @@ -10,21 +10,21 @@ envsubst <nginx-conf/exchange.taler-nginx.conf > /etc/nginx/sites-available/exch # Create nginx symlinks, just once -if [ ! -f /etc/nginx/sites-enabled/backend.${DOMAIN_NAME} ];then -ln -s /etc/nginx/sites-available/backend.${DOMAIN_NAME} /etc/nginx/sites-enabled/backend.${DOMAIN_NAME} +if [ ! -f /etc/nginx/sites-enabled/backend."${DOMAIN_NAME}" ];then +ln -s /etc/nginx/sites-available/backend."${DOMAIN_NAME}" /etc/nginx/sites-enabled/backend."${DOMAIN_NAME}" fi -if [ ! -f /etc/nginx/sites-enabled/bank.${DOMAIN_NAME} ];then -ln -s /etc/nginx/sites-available/bank.${DOMAIN_NAME} /etc/nginx/sites-enabled/bank.${DOMAIN_NAME} +if [ ! -f /etc/nginx/sites-enabled/bank."${DOMAIN_NAME}" ];then +ln -s /etc/nginx/sites-available/bank."${DOMAIN_NAME}" /etc/nginx/sites-enabled/bank."${DOMAIN_NAME}" fi -if [ ! -f /etc/nginx/sites-enabled/exchange.${DOMAIN_NAME} ];then -ln -s /etc/nginx/sites-available/exchange.${DOMAIN_NAME} /etc/nginx/sites-enabled/exchange.${DOMAIN_NAME} +if [ ! -f /etc/nginx/sites-enabled/exchange."${DOMAIN_NAME}" ];then +ln -s /etc/nginx/sites-available/exchange."${DOMAIN_NAME}" /etc/nginx/sites-enabled/exchange."${DOMAIN_NAME}" fi -if test ${ENABLE_TLS} == "y" +if test "${ENABLE_TLS}" == "y" then # patch to: Replace http to https, to avoid error of mixed content @@ -35,9 +35,9 @@ sed -i "s/http:\/\/bank./https:\/\/bank./g" /etc/libeufin/demobank-ui-settings.j say "Obtaining TLS certificates" - certbot -d backend.${DOMAIN_NAME} \ - -d bank.${DOMAIN_NAME} \ - -d exchange.${DOMAIN_NAME} + certbot -d backend."${DOMAIN_NAME}" \ + -d bank."${DOMAIN_NAME}" \ + -d exchange."${DOMAIN_NAME}" fi diff --git a/netzbon/functions.sh b/netzbon/functions.sh index b4c265d..29d9770 100755 --- a/netzbon/functions.sh +++ b/netzbon/functions.sh @@ -13,7 +13,7 @@ function say() function check_user() { - if [ $(whoami) != "root" ]; then + if [ "$(whoami)" != "root" ]; then say "Please run this script as root" exit 1 fi diff --git a/netzbon/nginx-conf/backend.taler-nginx.conf b/netzbon/nginx-conf/backend.taler-nginx.conf index 9b88d57..07dceed 100644 --- a/netzbon/nginx-conf/backend.taler-nginx.conf +++ b/netzbon/nginx-conf/backend.taler-nginx.conf @@ -3,7 +3,7 @@ server { listen 80; listen [::]:80; - server_name backend.${DOMAIN_NAME}; + server_name backend."${DOMAIN_NAME}"; location / { proxy_pass http://unix:/var/run/taler/merchant-httpd/merchant-http.sock; diff --git a/netzbon/nginx-conf/bank.taler-nginx.conf b/netzbon/nginx-conf/bank.taler-nginx.conf index e602ab9..6216efe 100644 --- a/netzbon/nginx-conf/bank.taler-nginx.conf +++ b/netzbon/nginx-conf/bank.taler-nginx.conf @@ -2,7 +2,7 @@ server { listen 80; listen [::]:80; - server_name bank.${DOMAIN_NAME}; + server_name bank."${DOMAIN_NAME}"; access_log /var/log/nginx/libeufin-sandbox.log; error_log /var/log/nginx/libeufin-sandbox.err; diff --git a/netzbon/nginx-conf/exchange.taler-nginx.conf b/netzbon/nginx-conf/exchange.taler-nginx.conf index 0f470a1..1d36046 100644 --- a/netzbon/nginx-conf/exchange.taler-nginx.conf +++ b/netzbon/nginx-conf/exchange.taler-nginx.conf @@ -3,7 +3,7 @@ server { listen 80; listen [::]:80; - server_name exchange.${DOMAIN_NAME}; + server_name exchange."${DOMAIN_NAME}"; location / { proxy_pass http://unix:/var/run/taler/exchange-httpd/exchange-http.sock; |