Work_Archive/VPS-scripts_Web-V2
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 11 Wiki Activity

fixed typos in config for monit

Browse Source
This commit is contained in:
Bram Prieshof
2021-01-08 15:11:02 +01:00
parent afffd9f74d
commit d123670a71
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMS/Backend/apache-siteBackend-unconfigured
View File

@@ -22,7 +22,7 @@ Alias /backend/database /usr/share/phpmyadmin
<Location /backend/monit> <Location /backend/monit>
RewriteEngine on RewriteEngine on
RewriteRule /monit /monit/$1 [R] RewriteRule /backend/monit /backend/monit/$1 [R]
</Location> </Location>
<Location /backend/monit/> <Location /backend/monit/>
#enables/disables monit-websocket #enables/disables monit-websocket

2
CMS/Backend/nginx-siteBackend-unconfigured
View File

@@ -36,7 +36,7 @@ location = /backend/netdata {
location /backend/monit/ { location /backend/monit/ {
deny all; #enables/disables monit-websocket 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 { location ~ /\.ht {

4
CoreModules/apache/conf.sh
View File

@@ -7,7 +7,7 @@ systemctl stop $apacheService > $OUTPUT 2>&1
if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] ; then
a2dissite 000-default > $OUTPUT 2>&1 a2dissite 000-default > $OUTPUT 2>&1
a2dismod mpm_prefork > $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/ mkdir -p "$apacheConfDir"/snippets/
monitconf=/etc/monit/monitrc monitconf=/etc/monit/monitrc
elif [ "$shortdist" = "el8" ]; then 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 sed -i -e 's/APASRV/'$apacheService'/' -e 's#APADIR#'$apacheConfDir'#' /opt/toggle/toggle-PhpMyAdmin.sh
##monit ##monit
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_APACHE.sh -o /opt/toggle/toggle-MonitWebui.sh 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 unset monitconf

2
CoreModules/nginx/conf.sh
View File

@@ -48,7 +48,7 @@ elif [ "$shortdist" = "el8" ]; then
monitconf=/etc/monitrc monitconf=/etc/monitrc
fi fi
curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/Scripts/toggles/toggle-Monit_NGINX.sh -o /opt/toggle/toggle-MonitWebui.sh 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 unset monitconf