From 3c6e12496c2f6b48d7b941531d0c7600f18990c6 Mon Sep 17 00:00:00 2001
From: Luis Guzman <Ark74@users.noreply.github.com>
Date: Tue, 12 Apr 2022 23:16:09 -0500
Subject: [PATCH] 6.4.5 (#79)

* Use the original file, instead of overwrite the symlink.

* Fix typo and increase countdown.

* Add tool for grub setup.

* Require to run with sudo.

* Actually require to run with admin rights.

* Improve comments.

* Actually apply changes to nginx conf instead of symlink.
---
 etherpad-docker.sh | 2 +-
 grafana.sh         | 2 +-
 jra_nextcloud.sh   | 4 ++--
 mode/chp-mode.sh   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etherpad-docker.sh b/etherpad-docker.sh
index 5fabaac..c9568ff 100644
--- a/etherpad-docker.sh
+++ b/etherpad-docker.sh
@@ -44,7 +44,7 @@ fi
 }
 DOMAIN="$(ls /etc/prosody/conf.d/ | awk -F'.cfg' '!/localhost/{print $1}' | awk '!NF || !seen[$0]++')"
 MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
-WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf"
+WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
 PSGVER="$(apt-cache madison postgresql|awk -F'[ +]' 'NR==1{print $3}')"
 ETHERPAD_DB_USER="dockerpad"
 ETHERPAD_DB_NAME="etherpad"
diff --git a/grafana.sh b/grafana.sh
index 852d6fb..093b4db 100644
--- a/grafana.sh
+++ b/grafana.sh
@@ -47,7 +47,7 @@ MAIN_TEL="/etc/telegraf/telegraf.conf"
 TEL_JIT="/etc/telegraf/telegraf.d/jitsi.conf"
 GRAFANA_INI="/etc/grafana/grafana.ini"
 DOMAIN="$(ls /etc/prosody/conf.d/ | awk -F'.cfg' '!/localhost/{print $1}' | awk '!NF || !seen[$0]++')"
-WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf"
+WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
 GRAFANA_PASS="$(tr -dc "a-zA-Z0-9#_*=" < /dev/urandom | fold -w 14 | head -n1)"
 
 # Min requirements
diff --git a/jra_nextcloud.sh b/jra_nextcloud.sh
index d7c8ce5..a366440 100644
--- a/jra_nextcloud.sh
+++ b/jra_nextcloud.sh
@@ -45,7 +45,7 @@ PSGVER="$(apt-cache madison postgresql|awk -F'[ +]' 'NR==1{print $3}')"
 PHP_FPM_DIR="/etc/php/$PHPVER/fpm"
 PHP_INI="$PHP_FPM_DIR/php.ini"
 PHP_CONF="/etc/php/$PHPVER/fpm/pool.d/www.conf"
-NC_NGINX_SSL_PORT="$(grep "listen 44" /etc/nginx/sites-enabled/$DOMAIN.conf | awk '{print$2}')"
+NC_NGINX_SSL_PORT="$(grep "listen 44" /etc/nginx/sites-available/$DOMAIN.conf | awk '{print$2}')"
 NC_REPO="https://download.nextcloud.com/server/releases"
 NCVERSION="$(curl -s -m 900 $NC_REPO/ | sed --silent 's/.*href="nextcloud-\([^"]\+\).zip.asc".*/\1/p' | sort --version-sort | tail -1)"
 STABLEVERSION="nextcloud-$NCVERSION"
@@ -419,7 +419,7 @@ NC_NGINX
 systemctl stop nginx
 letsencrypt certonly --standalone --renew-by-default --agree-tos -d $NC_DOMAIN
 if [ -f /etc/letsencrypt/live/$NC_DOMAIN/fullchain.pem ];then
-    ln -s $NC_NGINX_CONF /etc/nginx/sites-enabled/
+    ln -s $NC_NGINX_CONF /etc/nginx/sites-available/
 else
     echo "There are issues on getting the SSL certs..."
     read -n 1 -s -r -p "Press any key to continue"
diff --git a/mode/chp-mode.sh b/mode/chp-mode.sh
index 7c4b760..d2e6dde 100644
--- a/mode/chp-mode.sh
+++ b/mode/chp-mode.sh
@@ -53,7 +53,7 @@ MEET_CONF="/etc/jitsi/meet/$DOMAIN-config.js"
 MEET_CONF_HP="/etc/jitsi/meet/${DOMAIN}-chp-config.js"
 INT_CONF_JS="/etc/jitsi/meet/${DOMAIN}-interface_config.js"
 INT_CONF_JS_HP="/etc/jitsi/meet/${DOMAIN}-chp-interface_config.js"
-WS_CONF="/etc/nginx/sites-enabled/$DOMAIN.conf"
+WS_CONF="/etc/nginx/sites-available/$DOMAIN.conf"
 FSTAB="/etc/fstab"
 CHAT_DISABLED="TBD"