Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37509964
en ru br
Репозитории ALT
S:4.3.30-alt2
5.1: 4.3.16-alt0.M51.1
www.altlinux.org/Changes

Группа :: Мониторинг
Пакет: xymon

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: xymon.varlibwww.patch
Скачать


diff -Nur xymon-4.3.30.old/xymond/etcfiles/xymon-apache-open.DIST xymon-4.3.30/xymond/etcfiles/xymon-apache-open.DIST
--- xymon-4.3.30.old/xymond/etcfiles/xymon-apache-open.DIST	2019-10-31 13:58:30.565760496 +0400
+++ xymon-4.3.30/xymond/etcfiles/xymon-apache-open.DIST	2019-10-31 14:00:39.005539586 +0400
@@ -26,6 +26,32 @@
     </IfModule>
 </Directory>
 
+Alias @XYMONHOSTURL@/periodic "@XYMONVAR@/periodic"
+<Directory "@XYMONVAR@/periodic">
+    Options Indexes FollowSymLinks Includes MultiViews
+    <IfModule mod_authz_core.c>
+        # Apache 2.4+
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
+Alias @XYMONHOSTURL@/notes "@XYMONVAR@/notes"
+<Directory "@XYMONVAR@/notes">
+    Options Indexes FollowSymLinks Includes MultiViews
+    <IfModule mod_authz_core.c>
+        # Apache 2.4+
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
 Alias @XYMONHOSTURL@  "@INSTALLWWWDIR@"
 <Directory "@INSTALLWWWDIR@">
     Options Indexes FollowSymLinks Includes MultiViews
diff -Nur xymon-4.3.30.old/xymond/etcfiles/xymon-apache-secure.DIST xymon-4.3.30/xymond/etcfiles/xymon-apache-secure.DIST
--- xymon-4.3.30.old/xymond/etcfiles/xymon-apache-secure.DIST	2019-10-31 13:58:30.566760510 +0400
+++ xymon-4.3.30/xymond/etcfiles/xymon-apache-secure.DIST	2019-10-31 14:01:00.014830788 +0400
@@ -26,6 +26,32 @@
     </IfModule>
 </Directory>
 
+Alias @XYMONHOSTURL@/periodic "@XYMONVAR@/periodic"
+<Directory "@XYMONVAR@/periodic">
+    Options Indexes FollowSymLinks Includes MultiViews
+    <IfModule mod_authz_core.c>
+        # Apache 2.4+
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
+Alias @XYMONHOSTURL@/notes "@XYMONVAR@/notes"
+<Directory "@XYMONVAR@/notes">
+    Options Indexes FollowSymLinks Includes MultiViews
+    <IfModule mod_authz_core.c>
+        # Apache 2.4+
+        Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
+
 Alias @XYMONHOSTURL@  "@INSTALLWWWDIR@"
 <Directory "@INSTALLWWWDIR@">
     Options Indexes FollowSymLinks Includes MultiViews
diff -Nur xymon-4.3.30.old/xymond/etcfiles/xymonserver.cfg.DIST xymon-4.3.30/xymond/etcfiles/xymonserver.cfg.DIST
--- xymon-4.3.30.old/xymond/etcfiles/xymonserver.cfg.DIST	2019-10-31 13:58:30.634761451 +0400
+++ xymon-4.3.30/xymond/etcfiles/xymonserver.cfg.DIST	2019-10-31 13:58:56.337117307 +0400
@@ -116,7 +116,7 @@
 XYMONWWWDIR="$XYMONHOME/www"			# The directory for Xymon webpage files.
 XYMONSTATICWWWDIR="$XYMONHOME/static"		# The directory for static Xymon webpage files (help, gifs, and menu).
 XYMONHTMLSTATUSDIR="$XYMONWWWDIR/html"		# HTML status logs go here (xymond_filestore --status --html)
-XYMONNOTESDIR="$XYMONWWWDIR/notes"		# For notes-files (xymond_filestore --notes)
+XYMONNOTESDIR="$XYMONVAR/notes"		# For notes-files (xymond_filestore --notes)
 XYMONREPDIR="$XYMONWWWDIR/rep"			# Top-level directory for Xymon reports.
 XYMONHELPDIR="$XYMONSTATICWWWDIR/help"		# Online help files are located here
 XYMONSNAPDIR="$XYMONWWWDIR/snap"		# Top-level directory for Xymon snapshots.
diff -Nur xymon-4.3.30.old/xymond/Makefile xymon-4.3.30/xymond/Makefile
--- xymon-4.3.30.old/xymond/Makefile	2019-10-31 13:58:30.587760801 +0400
+++ xymon-4.3.30/xymond/Makefile	2019-10-31 13:58:56.337117307 +0400
@@ -145,7 +145,7 @@
 endif
 
 cfgfiles:
-	cat $(APACHECONF) | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@INSTALLETCDIR@!$(INSTALLETCDIR)!g' | sed -e 's!@INSTALLWWWDIR@!$(INSTALLWWWDIR)!g' | sed -e 's!@INSTALLSTATICWWWDIR@!$(INSTALLSTATICWWWDIR)!g' | sed -e 's!@CGIDIR@!$(CGIDIR)!g' | sed -e 's!@SECURECGIDIR@!$(SECURECGIDIR)!g' | sed -e 's!@XYMONHOSTURL@!$(XYMONHOSTURL)!g' | sed -e 's!@XYMONCGIURL@!$(XYMONCGIURL)!g' | sed -e 's!@SECUREXYMONCGIURL@!$(SECUREXYMONCGIURL)!g' >etcfiles/xymon-apache.conf
+	cat $(APACHECONF) | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@INSTALLETCDIR@!$(INSTALLETCDIR)!g' | sed -e 's!@INSTALLWWWDIR@!$(INSTALLWWWDIR)!g' | sed -e 's!@INSTALLSTATICWWWDIR@!$(INSTALLSTATICWWWDIR)!g' | sed -e 's!@XYMONVAR@!$(XYMONVAR)!g' | sed -e 's!@CGIDIR@!$(CGIDIR)!g' | sed -e 's!@SECURECGIDIR@!$(SECURECGIDIR)!g' | sed -e 's!@XYMONHOSTURL@!$(XYMONHOSTURL)!g' | sed -e 's!@XYMONCGIURL@!$(XYMONCGIURL)!g' | sed -e 's!@SECUREXYMONCGIURL@!$(SECUREXYMONCGIURL)!g' >etcfiles/xymon-apache.conf
 	cat etcfiles/xymonserver.cfg.DIST | sed -e 's!@XYMONTOPDIR@!$(XYMONTOPDIR)!g'| sed -e 's!@XYMONLOGDIR@!$(XYMONLOGDIR)!g'| sed -e 's!@XYMONHOSTNAME@!$(XYMONHOSTNAME)!g'| sed -e 's!@XYMONHOSTIP@!$(XYMONHOSTIP)!g'| sed -e 's!@XYMONHOSTOS@!$(XYMONHOSTOS)!g' | sed -e 's!@XYMONHOSTURL@!$(XYMONHOSTURL)!g' | sed -e 's!@XYMONCGIURL@!$(XYMONCGIURL)!g' | sed -e 's!@SECUREXYMONCGIURL@!$(SECUREXYMONCGIURL)!g' | sed -e 's!@XYMONHOME@!$(XYMONHOME)!g' | sed -e 's!@XYMONVAR@!$(XYMONVAR)!g' | sed -e 's!@FPING@!$(FPING)!g' | sed -e 's!@MAILPROGRAM@!$(MAILPROGRAM)!g' | sed -e 's!@RUNTIMEDEFS@!$(RUNTIMEDEFS)!g' >etcfiles/xymonserver.cfg
 	../build/bb-commands.sh >>etcfiles/xymonserver.cfg
 	cat etcfiles/hosts.cfg.DIST | sed -e 's!@XYMONHOSTNAME@!$(XYMONHOSTNAME)!g' | sed -e 's!@XYMONHOSTIP@!$(XYMONHOSTIP)!g' >etcfiles/hosts.cfg
diff -Nur xymon-4.3.30.old/xymond/xymonreports.sh.DIST xymon-4.3.30/xymond/xymonreports.sh.DIST
--- xymon-4.3.30.old/xymond/xymonreports.sh.DIST	2019-10-31 13:58:29.000000000 +0400
+++ xymon-4.3.30/xymond/xymonreports.sh.DIST	2019-10-31 13:58:56.337117307 +0400
@@ -35,7 +35,7 @@
 fi
 
 # This is the top-level directory for the pre-generated reports.
-REPORTTOPDIR="$XYMONWWWDIR/periodic"
+REPORTTOPDIR="$XYMONVAR/periodic"
 REPORTTOPURL="$XYMONWEB/periodic"
 
 REPTYPE=$1
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin