diff --git a/CMS/Backend/apache-siteBackend-unconfigured b/CMS/Backend/apache-siteBackend-unconfigured index 275680c..bc7112a 100644 --- a/CMS/Backend/apache-siteBackend-unconfigured +++ b/CMS/Backend/apache-siteBackend-unconfigured @@ -22,7 +22,7 @@ Alias /backend/database /usr/share/phpmyadmin RewriteEngine on - RewriteRule /monit /monit/$1 [R] + RewriteRule /backend/monit /backend/monit/$1 [R] #enables/disables monit-websocket diff --git a/CMS/Backend/nginx-siteBackend-unconfigured b/CMS/Backend/nginx-siteBackend-unconfigured index 644b72b..d7fe94f 100644 --- a/CMS/Backend/nginx-siteBackend-unconfigured +++ b/CMS/Backend/nginx-siteBackend-unconfigured @@ -36,7 +36,7 @@ location = /backend/netdata { location /backend/monit/ { deny all; #enables/disables monit-websocket - proxypass http://unix:/var/run/monit/monit.sock:/; + proxy_pass http://unix:/var/run/monit/monit.sock:/; } location ~ /\.ht { diff --git a/CoreModules/apache/conf.sh b/CoreModules/apache/conf.sh index d6dacb2..2b0fcf6 100644 --- a/CoreModules/apache/conf.sh +++ b/CoreModules/apache/conf.sh @@ -7,7 +7,7 @@ systemctl stop $apacheService > $OUTPUT 2>&1 if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then a2dissite 000-default > $OUTPUT 2>&1 a2dismod mpm_prefork > $OUTPUT 2>&1 - a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb > $OUTPUT 2>&1 + a2enmod actions fcgid alias proxy_fcgi ssl headers http2 setenvif socache_shmcb rewrite > $OUTPUT 2>&1 mkdir -p "$apacheConfDir"/snippets/ monitconf=/etc/monit/monitrc elif [ "$shortdist" = "el8" ]; then @@ -63,7 +63,7 @@ curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/to sed -i -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-PhpMyAdmin.sh ##monit curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_APACHE.sh -o /opt/toggle/toggle-MonitWebui.sh -sed -i -e 's/MONITCONF/'$monitconf'/' -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-MonitWebui.sh +sed -i -e 's#MONITCONF#'$monitconf'#' -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-MonitWebui.sh unset monitconf diff --git a/CoreModules/nginx/conf.sh b/CoreModules/nginx/conf.sh index 3e397cd..5733e62 100644 --- a/CoreModules/nginx/conf.sh +++ b/CoreModules/nginx/conf.sh @@ -48,7 +48,7 @@ elif [ "$shortdist" = "el8" ]; then monitconf=/etc/monitrc fi curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_NGINX.sh -o /opt/toggle/toggle-MonitWebui.sh -sed -i -e 's/MONITCONF/'$monitconf'/' /opt/toggle/toggle-MonitWebui.sh +sed -i -e 's#MONITCONF#'$monitconf'#' /opt/toggle/toggle-MonitWebui.sh unset monitconf