Репозитории ALT
| S: | 1.2.24-alt1 |
| 5.1: | 0.8.7b-alt4 |
| 4.1: | 0.8.7b-alt2 |
| 4.0: | 0.8.6j-alt1 |
Группа :: Мониторинг
Пакет: cacti
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: cacti-1.2.24-alt1.patch
Скачать
Скачать
.gear/cacti.spec | 393 +++++++++++++++++++++++++++++++++++++++++++
.gear/rules | 5 +
.gear/tags/list | 1 +
.gear/upstream/filter-tag | 1 +
.gear/upstream/remotes | 3 +
.gear/upstream/transform-tag | 1 +
altlinux/cacti-apache.conf | 21 +++
altlinux/cacti-lighttpd.conf | 24 +++
altlinux/cacti-readme.alt | 23 +++
altlinux/cacti-rrdpath.sql | 1 +
altlinux/cacti.logrotate | 8 +
cli/install_cacti.php | 2 +-
include/global.php | 12 +-
include/global_settings.php | 6 +-
install/functions.php | 8 +-
lib/clog_webapi.php | 4 +-
lib/functions.php | 5 +-
lib/installer.php | 2 +-
poller.php | 8 +-
poller_maintenance.php | 2 +-
20 files changed, 508 insertions(+), 22 deletions(-)
diff --git a/.gear/cacti.spec b/.gear/cacti.spec
new file mode 100644
index 000000000..5a2c42aec
--- /dev/null
+++ b/.gear/cacti.spec
@@ -0,0 +1,393 @@
+%define phpversion php8.0
+Name: cacti
+Version: 1.2.24
+Release: alt1
+
+%define cactidir %_datadir/%name
+%define cacticonfdir %_sysconfdir/%name
+%define username cacti
+
+Summary: The complete RRDTool-based graphing solution.
+Summary(ru_RU.UTF8): п÷п╬п╩п╫п╬я└я┐п╫п╨я├п╦п╬п╫п╟п╩я▄п╫п╟я▐ п╬п╠п╬п╩п╬я┤п╨п╟ п╢п╩я▐ RRDTool.
+
+License: GPLv2+
+Group: Monitoring
+
+URL: http://www.cacti.net/
+VCS: https://github.com/Cacti/cacti
+Source: %name-%version.tar
+Source2: %name-readme.alt
+Source3: %name.logrotate
+Source5: %name-rrdpath.sql
+Source7: %name-apache.conf
+Source8: %name-lighttpd.conf
+
+Patch: %name-%version-%release.patch
+
+#The following plugins have been merged into the core Cacti
+Provides: cacti-plugin-aggregate = %version-%release
+Conflicts: cacti-plugin-aggregate < %version-%release
+Provides: cacti-plugin-discovery = %version-%release
+Conflicts: cacti-plugin-discovery < %version-%release
+Provides: cacti-plugin-settings = %version-%release
+Conflicts: cacti-plugin-settings < %version-%release
+Provides: cacti-plugin-ssl = %version-%release
+Conflicts: cacti-plugin-ssl < %version-%release
+
+
+Requires: webserver webserver-common rrd-utils net-snmp net-snmp-utils
+Requires: %phpversion %phpversion-snmp %phpversion-sockets %phpversion-pdo %phpversion-pdo_mysql %phpversion-mbstring %phpversion-openssl %phpversion-gd2 %phpversion-gmp
+
+BuildRequires(pre): rpm-macros-webserver-common
+BuildArch: noarch
+# build docs
+BuildRequires: lynx docbook-utils
+
+
+%description
+Cacti is a complete frontend to RRDTool. It stores all of the necessary
+information to create graphs and populate them with data in a MySQL database.
+The frontend is completely PHP driven. Along with being able to maintain graphs,
+data sources, and round robin archives in a database, Cacti also handles the data
+gathering. There is SNMP support for those used to creating traffic graphs with
+MRTG.
+
+%description -l ru_RU.UTF8
+Cacti - я█я┌п╬ п©п╬п╩п╫п╬я└я┐п╫п╨я├п╦п╬п╫п╟п╩я▄п╫п╟я▐ п╬п╠п╬п╩п╬я┤п╨п╟ п╢п╩я▐ RRDTool. п÷я─п╬пЁя─п╟п╪п╪п╟ я┘я─п╟п╫п╦я┌ п╡я│я▌
+п╫п╣п╬п╠я┘п╬п╢п╦п╪я┐я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╢п╩я▐ я│п╬п╥п╢п╟п╫п╦я▐ п╦ п╫п╟п©п╬п╩п╫п╣п╫п╦я▐ пЁя─п╟я└п╦п╨п╬п╡ п╡ п╠п╟п╥п╣ MySQL.
+п÷я─п╬пЁя─п╟п╪п╪п╟ п©п╬п╩п╫п╬я│я┌я▄я▌ п╫п╟п©п╦я│п╟п╫п╟ п╫п╟ PHP. п▓п╪п╣я│я┌п╣ я│ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄я▌ я┐п©я─п╟п╡п╩п╣п╫п╦я▐
+пЁя─п╟я└п╦п╨п╟п╪п╦, п╦я│я┌п╬я┤п╫п╦п╨п╟п╪п╦ п╢п╟п╫п╫я▀я┘ п╦ п╟я─я┘п╦п╡п╟п╪п╦ round robin Cacti я┌п╟п╨п╤п╣ п╥п╟п╫п╦п╪п╟п╣я┌я│я▐
+я│п╠п╬я─п╬п╪ п╢п╟п╫п╫я▀я┘.
+
+%package setup
+Summary: Cacti setup package
+Group: Monitoring
+BuildArch: noarch
+Requires: %name = %version-%release
+
+%description setup
+Install this package to configure initial Cacti installation. You
+should uninstall this package when you're done, as it considered
+insecure to keep the setup files in place.
+
+%description -l ru_RU.UTF8 setup
+пёя│я┌п╟п╫п╬п╡п╦я┌п╣ я█я┌п╬я┌ п©п╟п╨п╣я┌ п╢п╩я▐ п©п╣я─п╡п╬п╫п╟я┤п╟п╩я▄п╫п╬п╧ п╦п╫п╦я├п╦п╟п╩п╦п╥п╟я├п╦п╦ Cacti.
+п÷п╬я│п╩п╣ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ п╫п╟я│я┌я─п╬п╧п╨п╦ Cacti п▓я▀ п╢п╬п╩п╤п╫я▀ я┐п╢п╟п╩п╦я┌я▄ я█я┌п╬я┌ п©п╟п╨п╣я┌, я┤я┌п╬ п╠я▀ п╬п╠п╣я│п©п╣я┤п╦я┌я▄
+п╠п╣п╥п╬п©п╟я│п╫я┐я▌ я─п╟п╠п╬я┌я┐ п©я─п╦п╩п╬п╤п╣п╫п╦я▐.
+
+%prep
+%setup -q
+%patch -p1
+
+
+%build
+chmod a+rx scripts/*
+chmod a+rx cli/*
+
+%install -n %name-%version
+mkdir -p %buildroot{%_sbindir,%_sysconfdir/cron.d,%cacticonfdir,%cactidir/plugins,%_localstatedir/%name/rra,%_logdir/%name}+
+cp -a *.php README.md LICENSE %buildroot%cactidir
+cp -ar cli formats images include install lib locales mibs plugins resource scripts %buildroot%cactidir
+mv -f %buildroot{%cactidir/poller.php,%_sbindir/cacti-poller}+chmod 755 %buildroot%_sbindir/cacti-poller
+install -m 0640 include/config.php.dist %buildroot%cacticonfdir/config.php
+touch %buildroot%_logdir/%name/%name.log
+
+# you should run this sql if your database contains path to %{_datadir}...+cp %SOURCE5 docs/
+cp %SOURCE2 docs/README_ALT.txt
+cp %SOURCE7 docs/
+cp %SOURCE8 docs/
+ln -sf %_docdir/%name-doc-%version %buildroot%cactidir/docs
+
+
+# install cron
+cat << EOF > %buildroot%_sysconfdir/cron.d/cacti
+MAILTO=root
+
+*/5 * * * * cacti umask 022; exec /usr/sbin/cacti-poller > /dev/null
+EOF
+
+# logrotate
+install -D -m 0644 %SOURCE3 %buildroot%_sysconfdir/logrotate.d/cacti
+
+%pre
+%_sbindir/useradd -M -d %cactidir -r %username -G %webserver_group > /dev/null 2>&1 ||:
+if LANG=C %_bindir/id %username 2>/dev/null | \
+grep -qv "groups=[^[:space:]]*(%webserver_group)"; then
+echo 'Warning: User %username was not included in the group %webserver_group!'
+%_bindir/gpasswd -a %username %webserver_group
+echo ' Added user %username to group %webserver_group.'
+fi
+
+%post
+%post_service crond
+
+%triggerpostun -- %name < 0.8.7e-alt1
+# Migration from previous version
+if [ $2 -gt 0 ]; then
+echo "Fixing permissions and location rrd,log files after previous package:"
+mv -f %_var/www/html/%name/log/* %_logdir/%name/
+mv -f %_var/www/html/%name/rra/* %_localstatedir/%name/rra/
+chown -v root:%webserver_group %_logdir/%name/* %_localstatedir/%name/*
+chmod -v 660 %_logdir/%name/* %_localstatedir/%name/*
+fi
+
+%files
+%doc docs/README_ALT.txt docs/%name-rrdpath.sql CHANGELOG LICENSE README.md cacti.sql
+%config(noreplace) %_sysconfdir/cron.d/cacti
+%_sbindir/cacti-poller
+%dir %attr(750,root,%webserver_group) %cacticonfdir
+%attr(640,root,%webserver_group) %config(noreplace) %cacticonfdir/config.php
+%config(noreplace) %_sysconfdir/logrotate.d/%name
+%dir %cactidir
+%cactidir/*.php
+%cactidir/cli
+%cactidir/formats
+%cactidir/images
+%cactidir/include
+%cactidir/lib
+%cactidir/locales
+%cactidir/mibs
+%cactidir/plugins
+%cactidir/resource
+%dir %cactidir/scripts
+%attr(755,root,root) %cactidir/scripts/*
+
+%attr(755,root,%webserver_group) %dir %_localstatedir/%name
+%attr(2775,root,%webserver_group) %dir %_localstatedir/%name/rra
+%attr(730,root,%webserver_group) %dir %_logdir/%name
+%attr(660,root,%webserver_group) %ghost %_logdir/%name/cacti.log
+
+%files setup
+%cactidir/install
+
+%changelog
+* Thu Jul 13 2023 Anton Farygin <rider@altlinux.ru> 1.2.24-alt1
+- 1.2.24
+- Fixes:
+ + CVE-2022-46169 Unauthenticated Command Injection
+- switched to php8.0 by default
+
+* Sat Jul 17 2021 Alexey Shabalin <shaba@altlinux.org> 1.2.18-alt1
+- 1.2.18
+- Fixes:
+ + CVE-2020-35701 SQL Injection was possible due to incorrect validation order
+ + CVE-2020-14424 Lack of escaping on file input fields can lead to XSS exposure under midwinter theme
+
+* Fri Nov 27 2020 Aleksei Nikiforov <darktemplar@altlinux.org> 1.2.15-alt3
+- Fixed merge issue in lib/clog_webapi.php found by Alexander Makeenkov.
+
+* Wed Nov 25 2020 Aleksei Nikiforov <darktemplar@altlinux.org> 1.2.15-alt2
+- Fixed issues in 1.2.15 release.
+
+* Mon Nov 23 2020 Aleksei Nikiforov <darktemplar@altlinux.org> 1.2.15-alt1
+- Updated to upstream version 1.2.15 (Fixes: CVE-2020-13230, CVE-2020-13231).
+
+* Thu Mar 19 2020 Alexey Shabalin <shaba@altlinux.org> 1.2.10-alt3
+- fix syntax error in include/global.php (thx to vercha@)
+
+* Wed Mar 18 2020 Alexey Shabalin <shaba@altlinux.org> 1.2.10-alt2
+- package cacti.sql to doc dir
+
+* Sun Mar 15 2020 Alexey Shabalin <shaba@altlinux.org> 1.2.10-alt1
+- 1.2.10
+- Fixes:
+ + CVE-2019-17357 When viewing graphs, some input variables are not properly checked (SQL injection possible)
+ + CVE-2019-17358 When deserializating data, ensure basic sanitization has been performed
+ + CVE-2019-16723 Security issue allows to view all graphs
+ + CVE-2020-7106 Lack of escaping on some pages can lead to XSS exposure
+ + CVE-2020-7237 Remote Code Execution due to input validation failure in Performance Boost Debug Log
+ + CVE-2020-8813 When guest users have access to realtime graphs, remote code could be executed
+
+* Fri Apr 05 2019 Alexey Shabalin <shaba@altlinux.org> 1.2.3-alt1
+- 1.2.3
+
+* Tue Mar 05 2019 Alexey Shabalin <shaba@altlinux.org> 1.2.2-alt1
+- 1.2.2
+- drop php5 package, php7 package merge with main
+
+* Fri Jan 04 2019 Alexey Shabalin <shaba@altlinux.org> 1.2.0-alt1
+- 1.2.0
+
+* Thu Feb 16 2017 Alexey Shabalin <shaba@altlinux.ru> 1.0.3-alt1
+- 1.0.3
+- add php7 subpackage
+
+* Tue May 10 2016 Alexey Shabalin <shaba@altlinux.ru> 0.8.8h-alt1
+- 0.8.8h
+- fixed CVE-2014-2326,CVE-2014-2327,CVE-2014-2328,CVE-2014-5025,
+ CVE-2014-5026,CVE-2014-4002,CVE-2013-5588,CVE-2013-5589,
+ CVE-2015-4342,CVE-2015-4634,CVE-2015-8377,CVE-2015-8604,
+ CVE-2016-3659
+
+* Tue May 06 2014 Alexey Shabalin <shaba@altlinux.ru> 0.8.8b-alt2
+- fixed:
+ + CVE-2014-2326 Unspecified HTML Injection Vulnerability
+ + CVE-2014-2328 Unspecified Remote Command Execution Vulnerability
+ + CVE-2014-2709 shell escaping issues in lib/rrd.php
+ + CVE-2014-2708 SQL injection issues in graph_xport.php
+
+* Wed Aug 14 2013 Alexey Shabalin <shaba@altlinux.ru> 0.8.8b-alt1
+- 0.8.8b
+
+* Wed May 02 2012 Alexey Shabalin <shaba@altlinux.ru> 0.8.8a-alt1
+- 0.8.8a
+
+* Fri Apr 06 2012 Alexey Shabalin <shaba@altlinux.ru> 0.8.8-alt1
+- 0.8.8
+
+* Tue Jan 10 2012 Alexey Shabalin <shaba@altlinux.ru> 0.8.7i-alt2
+- add official patch settings_checkbox.patch
+
+* Wed Dec 21 2011 Alexey Shabalin <shaba@altlinux.ru> 0.8.7i-alt1
+- 0.8.7i
+
+* Wed Oct 05 2011 Alexey Shabalin <shaba@altlinux.ru> 0.8.7h-alt1
+- 0.8.7h
+
+* Mon Sep 27 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7g-alt3
+- add official patches:
+ + Fix issue with multi selection data source deactivation
+ + Graph List View Searching
+ + Repair various interface display issues
+ + Fix LDAP authenication with group restrictions enabled
+ + Update script server to properly process command line arguments that are quoted
+ + Fixes issue with Cacti ping library
+ + Fixes issue with 1 minute polling with 1 minute rra
+
+* Tue Jul 13 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7g-alt2
+- fix url_path in config.php
+
+* Mon Jul 12 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7g-alt1
+- 0.8.7g
+
+* Tue Jun 01 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7f-alt1
+- 0.8.7f:
+ + SQL injection and shell escaping issues reported by Bonsai Information Security
+ + Cross-site scripting issues reported by VUPEN Security
+ + MOPS-2010-023: Cacti Graph Viewer SQL Injection Vulnerability
+ + Fixed various issues with exporting and importing templates that contain special characters
+ + Fixed condition that could cause RRDtool to segfault
+ + Many fixes to html generation and presentation
+
+* Tue May 11 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7e-alt4
+- Adding official patch to fix sql vulnerability
+
+* Mon Apr 05 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7e-alt3
+- fix permition /var/lib/cacti
+
+* Tue Mar 30 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7e-alt2
+- add cacti/plugins/index.php
+
+* Wed Mar 24 2010 Alexey Shabalin <shaba@altlinux.ru> 0.8.7e-alt1
+- 0.8.7e
+- poller:
+ + in sbin
+ + no hide of errors in cron
+ + use exec to avoid /bin/sh in process table
+- cacti in /usr/share
+- log in /var/log/cacti
+- triggerpostun for migration
+- add cacti user to _webserver group
+
+* Wed Dec 10 2008 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.7b-alt4
+- Fix simlink /var/www/html/cacti/docs -> /usr/share/doc/cacti-doc-0.8.7b (Thanks at@)
+- Remove package cacti-config-php
+
+* Sat Nov 29 2008 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.7b-alt3
+- Add new subpackage %name-doc
+- Convert spec to UTF8
+- Add official patche reset_each_patch
+
+* Thu Mar 13 2008 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.7b-alt2
+- Add official patches
+- Fix url_path in include/global.php
+- Join sql scripts to one
+- Add link to docs
+- Add README_ALT.txt
+- Add version-release to Requires: cacti-config
+- Add Conflicts: cacti-config-php to cacti-config-php5
+- Add Conflicts: cacti-config-php5 to cacti-config-php
+
+* Tue Feb 19 2008 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.7b-alt1
+- New version
+- Update cacti-plugin-arch
+
+* Fri Nov 30 2007 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.7a-alt1
+- New version
+- Remove all patches (in upstream)
+
+* Fri Apr 13 2007 Slava Dubrovskiy <dubrsl@altlinux.org> 0.8.6j-alt1
+- Add official patches:
+ + %name-%version-thumbnail_graphs_not_working.patch
+ + %name-%version-graph_debug_lockup_fix.patch
+- Add net-snmp-utils in Requires
+
+* Mon Jan 29 2007 Slava Dubrovskiy <dubrsl@altlinux.ru> 0.8.6j-alt0
+- New version
+- Add official patches:
+ + %name-%version-ping_php_version4_snmpgetnext.patch
+ + %name-%version-tree_console_missing_hosts.patch
+- Add cacti-plugin-arch
+- Separate cactid in own package
+- Add BuildArch: noarch (#10675)
+- Add %_sysconfdir/cron.d/cacti
+- Add virtual packages for different depends
+
+* Sat Jan 13 2007 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6i-alt2
+- Security fixes (CVE-2006-6799)
+
+* Mon Dec 04 2006 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6i-alt1
+- New version
+- Spec cleanups
+- config.php was marked as config with noreplace
+
+* Fri Apr 14 2006 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6h-alt2
+- Fixed BuildRequires
+
+* Wed Apr 05 2006 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6h-alt1
+- New version
+- Spec cleanups
+
+* Sun Jul 10 2005 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6f-alt1
+- Many critical security bugfixes in upstream
+- Spec fixes (now daemon and main module may have different versions)
+
+* Fri Oct 22 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6b-alt1
+- New version
+
+* Sun Sep 19 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6-alt4
+- Removed BuildArch tag because our rpm doesn't support multiple buildarch's
+ in one spec ;-( Now php stuff has i586 arch ;-)
+
+* Fri Sep 17 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6-alt3
+- Spec fixups (correct %%setup macroses)
+
+* Thu Sep 16 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6-alt2
+- Spec update (information for upgrade)
+
+* Thu Sep 16 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.6-alt1
+- New upstream version (has many new features)
+- Russian translation for spec
+- cactid now in separated package
+- spec cleanups (permissions, path)
+
+* Mon Aug 09 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.5a-alt6
+- Added missing buildrequires (libssl and other)
+
+* Fri Aug 06 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.5a-alt5
+- New version
+
+* Fri Jul 09 2004 Andrew Kornilov <hiddenman@altlinux.ru> 0.8.5-alt4
+- New build
+
+* Fri Mar 12 2004 Andrew Kornilov <andy@eva.dp.ua> 0.8.5-alt3
+- Removed redundant docs from /var/www/html/cacti
+
+* Fri Mar 12 2004 Andrew Kornilov <andy@eva.dp.ua> 0.8.5-alt2
+- Added -M to useradd to skip homedir skeleton
+
+* Tue Mar 09 2004 Andrew Kornilov <andy@eva.dp.ua> 0.8.5-alt1
+- First alpha build for Sisyphus. All works, but...;-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 000000000..e958d9044
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,5 @@
+tar: release/@version@:.
+diff: release/@version@:. .
+spec: .gear/cacti.spec
+copy: altlinux/*
+
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 000000000..c970ed713
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+9e55ba79729142315110702db8aa8268ce5ea102 release/1.2.24
diff --git a/.gear/upstream/filter-tag b/.gear/upstream/filter-tag
new file mode 100755
index 000000000..501af7227
--- /dev/null
+++ b/.gear/upstream/filter-tag
@@ -0,0 +1 @@
+grep release/
diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes
new file mode 100644
index 000000000..b6682b12c
--- /dev/null
+++ b/.gear/upstream/remotes
@@ -0,0 +1,3 @@
+[remote "upstream"]
+ url = https://github.com/Cacti/cacti.git
+ fetch = +refs/heads/*:refs/remotes/upstream/*
diff --git a/.gear/upstream/transform-tag b/.gear/upstream/transform-tag
new file mode 100755
index 000000000..20136915f
--- /dev/null
+++ b/.gear/upstream/transform-tag
@@ -0,0 +1 @@
+sed -e 's,release/,,'
diff --git a/altlinux/cacti-apache.conf b/altlinux/cacti-apache.conf
new file mode 100644
index 000000000..5e06823e0
--- /dev/null
+++ b/altlinux/cacti-apache.conf
@@ -0,0 +1,21 @@
+#
+# Cacti: An rrd based graphing tool
+#
+# For example:
+# On httpd 2.4, change "Require host localhost" to "Require all granted".
+# On httpd 2.2, change "Allow from localhost" to "Allow from all".
+
+Alias /cacti /usr/share/cacti
+
+<Directory /usr/share/cacti>
+ <IfModule mod_authz_core.c>
+ # httpd 2.4
+ Require host localhost
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # httpd 2.2
+ Order deny,allow
+ Deny from all
+ Allow from localhost
+ </IfModule>
+</Directory>
diff --git a/altlinux/cacti-lighttpd.conf b/altlinux/cacti-lighttpd.conf
new file mode 100644
index 000000000..d36bc2647
--- /dev/null
+++ b/altlinux/cacti-lighttpd.conf
@@ -0,0 +1,24 @@
+
+alias.url += (
+ "/cacti" => "/usr/share/cacti",
+)
+
+$HTTP["url"] =~ "^/cacti/" {+ auth.require = (
+ "/disabled-cacti/" => (
+ "method" => "basic",
+ "realm" => "Cacti",
+ "require" => "valid-user"
+ )
+ )
+
+ auth.backend = "htpasswd"
+# auth.backend = "ldap"
+
+ # htpasswd config
+ auth.backend.htpasswd.userfile = "/etc/cacti/passwd"
+
+# auth.backend.ldap.hostname = "localhost"
+# auth.backend.ldap.base-dn = "ou=People,dc=example,dc=org"
+# auth.backend.ldap.filter = "(uid=$)"
+}
diff --git a/altlinux/cacti-readme.alt b/altlinux/cacti-readme.alt
new file mode 100644
index 000000000..4a17c4503
--- /dev/null
+++ b/altlinux/cacti-readme.alt
@@ -0,0 +1,23 @@
+п≈п╟п╪п╣я┤п╟п╫п╦я▐ п╨ я│п╠п╬я─п╨п╣ cacti п╡ ALT Linux:
+
+пёя│я┌п╟п╫п╬п╡п╨п╟.
+
+1. apt-get install cacti cacti-config-php5 (п╦п╩п╦ cacti-config-php7)
+2. п║п╢п╣п╩п╟я┌я▄ control php5-cli public п╦ apache-mod_php5
+3. п║п╬п╥п╢п╟я┌я▄ п╠п╟п╥я┐ п╦ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ п╡ mysql:
+ create database cacti;
+ grant all on cacti.* to cactiuser@localhost identified by "cactiuser";
+4. п≈п╟п©п╬п╩п╫п╦я┌я▄ я┌п╟п╠п╩п╦я├я┐ mysql:
+ mysql cacti < /usr/share/doc/cacti-$version/cacti.sql
+5. пёя│я┌п╟п╫п╬п╡п╦я┌я▄ п╫п╟я┤п╟п╩я▄п╫я▀п╣ п©п╟я─п╟п╪п╣я┌я─я▀ п╡ sql:
+ mysql -e "INSERT INTO settings (name, value) VALUES ('path_php_binary', '/usr/bin/php')" cacti+6. п²п╟я│я┌я─п╬п╦я┌я▄ п©п╟я─п╟п╪п╣я┌я─я▀ п╡ /etc/cacti/config.php
+7. п≈п╟п╧я┌п╦ п╡ cacti я┤п╣я─п╣п╥ п╠я─п╬я┐п╥п╣я─ http://<п╦п╪я▐ я┘п╬я│я┌п╟>/cacti
+ п╩п╬пЁп╦п╫/п©п╟я─п╬п╩я▄: admin/admin
+
+п▓п╫п╦п╪п╟п╫п╦п╣!!!
+п²п╟я┤п╦п╫п╟я▐ я│ п╡п╣я─я│п╦п╦ 0.8.7e-alt1 я─п╟я│п©п╬п╩п╬п╤п╣п╫п╦п╣ я└п╟п╧п╩п╬п╡ cacti п╦п╥п╪п╣п╫п╦п╩п╬я│я▄ п╡ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦п╦ я│ http://www.altlinux.org/WebPolicy
+п╟. /var/www/html/cacti -> /usr/share/cacti
+п╠. п╨п╬п╫я└п╦пЁп╦ п╡ /etc/cacti
+п╡. п╩п╬пЁ п╡ /var/log/cacti
+пЁ. poller п╫п╟я┘п╬п╢п╦я┌я│я▐ п╡ /usr/sbin - п╬п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ п╡п╟я┬ cron
diff --git a/altlinux/cacti-rrdpath.sql b/altlinux/cacti-rrdpath.sql
new file mode 100644
index 000000000..e34a29f53
--- /dev/null
+++ b/altlinux/cacti-rrdpath.sql
@@ -0,0 +1 @@
+update poller_item set rrd_path= replace(rrd_path, '/usr/share/cacti/rra', '/var/lib/cacti/rra') where rrd_path like '/usr/share/cacti/rra/%';
diff --git a/altlinux/cacti.logrotate b/altlinux/cacti.logrotate
new file mode 100644
index 000000000..d8a76d78f
--- /dev/null
+++ b/altlinux/cacti.logrotate
@@ -0,0 +1,8 @@
+/var/log/cacti/cacti.log {+ missingok
+ monthly
+ notifempty
+ compress
+ create 0664 root _webserver
+ su root _webserver
+}
diff --git a/cli/install_cacti.php b/cli/install_cacti.php
index abbe8b09a..289c2adc1 100755
--- a/cli/install_cacti.php
+++ b/cli/install_cacti.php
@@ -369,7 +369,7 @@ function display_help () {print ' Note: reusing an option_key will replace its value with the last one' . PHP_EOL;
print ' specified.' .PHP_EOL . PHP_EOL;
print ' --path - Sets path locations. Example: ' . PHP_EOL;
- print ' --path=cactilog:/usr/share/cacti/log/cacti.log' . PHP_EOL;
+ print ' --path=cactilog:/var/log/cacti.log' . PHP_EOL;
print ' --path=cactilog:c:\cacti\log\cacti.log' . PHP_EOL;
print ' Prefix: path_' . PHP_EOL;
print PHP_EOL;
diff --git a/include/global.php b/include/global.php
index c088e7cf4..adc5d50af 100644
--- a/include/global.php
+++ b/include/global.php
@@ -83,15 +83,15 @@ $disable_log_rotation = false;
$config = array();
/* Include configuration, or use the defaults */
-if (file_exists(dirname(__FILE__) . '/config.php')) {- if (!is_readable(dirname(__FILE__) . '/config.php')) {+if (file_exists('/etc/cacti/config.php')) {+ if (!is_readable('/etc/cacti/config.php')) { die('Configuration file include/config.php is present, but unreadable.' . PHP_EOL);}
- include(dirname(__FILE__) . '/config.php');
+ include('/etc/cacti/config.php');}
if (isset($config['cacti_version'])) {- die('Invalid include/config.php file detected.' . PHP_EOL);+ die('Invalid /etc/cacti/config.php file detected.' . PHP_EOL);exit;
}
@@ -238,7 +238,9 @@ if ($config['cacti_server_os'] == 'win32') { $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));}
$config['include_path'] = dirname(__FILE__);
-$config['rra_path'] = $config['base_path'] . '/rra';
+$config['rra_path'] = '/var/lib/cacti/rra';
+$config['log_path'] = '/var/log/cacti';
+$config['path_cactilog'] = '/var/log/cacti/cacti.log';
/* for multiple pollers, we need to know this location */
if (!isset($scripts_path)) {diff --git a/include/global_settings.php b/include/global_settings.php
index edf0f5f74..e8abaf563 100644
--- a/include/global_settings.php
+++ b/include/global_settings.php
@@ -169,10 +169,10 @@ $settings = array(
),
'path_cactilog' => array(
'friendly_name' => __('Cacti Log Path'),- 'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),+ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti.log)'),'method' => 'filepath',
'file_type' => 'ascii',
- 'default' => $config['base_path'] . '/log/cacti.log',
+ 'default' => $config['log_path'] . '/cacti.log',
'max_length' => '255',
'install_check' => 'writable',
'install_blank' => true
@@ -182,7 +182,7 @@ $settings = array(
'description' => __('If you are having issues with Cacti\'s Data Collectors, set this file path and the Data Collectors standard error will be redirected to this file'),'method' => 'filepath',
'file_type' => 'ascii',
- 'default' => $config['base_path'] . '/log/cacti_stderr.log',
+ 'default' => $config['log_path'] . '/cacti_stderr.log',
'max_length' => '255',
'install_check' => 'writable',
'install_optional' => true
diff --git a/install/functions.php b/install/functions.php
index 3424eec18..d5ddfea5e 100644
--- a/install/functions.php
+++ b/install/functions.php
@@ -730,14 +730,14 @@ function install_file_paths() {}
if (empty($input['path_cactilog']['default'])) {- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
+ $input['path_cactilog']['default'] = $config['log_path'] . '/cacti.log';
}
/* stderr log file path */
if (!config_value_exists('path_cactilog')) {$input['path_stderrlog'] = $settings['path']['path_stderrlog'];
if (empty($input['path_stderrlog']['default'])) {- $input['path_stderrlog']['default'] = $config['base_path'] . '/log/cacti.stderr.log';
+ $input['path_stderrlog']['default'] = $config['log_path'] . '/cacti.stderr.log';
}
} else {$input['path_stderrlog'] = $settings['path']['path_stderrlog'];
@@ -999,8 +999,8 @@ function log_install_to_file($section, $data, $flags = FILE_APPEND, $level = POL
$section = 'general';
}
$logfile = 'install' . '-' . $section;
- file_put_contents($config['base_path'] . '/log/' . $logfile . '.log', sprintf($format_log1, $day, $time, $levelname, $data, PHP_EOL), $flags);
- file_put_contents($config['base_path'] . '/log/install-complete.log', sprintf($format_log2, $day, $time, $sectionname, $levelname, $data, PHP_EOL), $flags);
+ file_put_contents($config['log_path'] . '/' . $logfile . '.log', sprintf($format_log1, $day, $time, $levelname, $data, PHP_EOL), $flags);
+ file_put_contents($config['log_path'] . '/install-complete.log', sprintf($format_log2, $day, $time, $sectionname, $levelname, $data, PHP_EOL), $flags);
}
}
diff --git a/lib/clog_webapi.php b/lib/clog_webapi.php
index c802f45b0..4344b658e 100644
--- a/lib/clog_webapi.php
+++ b/lib/clog_webapi.php
@@ -63,7 +63,7 @@ function clog_validate_filename(&$file, &$filepath, &$filename, $filecheck = fal
$logfile = read_config_option('path_cactilog'); if ($logfile == '') {- $logfile = $config['base_path'] . '/log/cacti.log';
+ $logfile = $config['log_path'] . '/cacti.log';
}
$errfile = read_config_option('path_stderrlog');@@ -393,7 +393,7 @@ function clog_get_logfiles() {$stderrLogBase = basename($stderrLogPath);
if ($configLogPath == '') {- $logPath = $config['base_path'] . '/log/';
+ $logPath = $config['log_path'] . '/';
} else {$logPath = dirname($configLogPath);
}
diff --git a/lib/functions.php b/lib/functions.php
index 4e716d536..55f3be25a 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -1196,9 +1196,10 @@ function cacti_log_file() {global $config;
$logfile = read_config_option('path_cactilog'); if ($logfile == '') {- $logfile = $config['base_path'] . '/log/cacti.log';
+ $logfile = $config['log_path'] . '/cacti.log';
+ } else {+ $config['log_path'] = $logfile;
}
- $config['log_path'] = $logfile;
return $logfile;
}
diff --git a/lib/installer.php b/lib/installer.php
index 4409b5b2d..0c7861412 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -3476,7 +3476,7 @@ class Installer implements JsonSerializable {$page_nr = 1;
$total_rows = 500;
- $logcontents = tail_file($config['base_path'] . '/log/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
+ $logcontents = tail_file($config['log_path'] . '/cacti.log', 100, -1, ' INSTALL:' , $page_nr, $total_rows);
$output_log = '';
foreach ($logcontents as $logline) {diff --git a/poller.php b/poller.php
index db66badb8..f3af860ab 100755
--- a/poller.php
+++ b/poller.php
@@ -31,7 +31,7 @@ if (function_exists('pcntl_async_signals')) { ini_set('output_buffering', 'Off');-require(__DIR__ . '/include/cli_check.php');
+require('/usr/share/cacti/include/cli_check.php');require_once($config['base_path'] . '/lib/poller.php');
require_once($config['base_path'] . '/lib/data_query.php');
require_once($config['base_path'] . '/lib/rrd.php');
@@ -507,7 +507,7 @@ while ($poller_runs_completed < $poller_runs) {$first_host = 0;
$last_host = 0;
$rrds_processed = 0;
- $webroot = addslashes(($config['cacti_server_os'] == 'win32') ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", '/') : dirname(__FILE__));
+ $webroot = $config['base_path'];
// update web paths for the poller
set_config_option('path_webroot', $webroot);@@ -1090,7 +1090,9 @@ function log_cacti_stats($loop_start, $method, $concurrent_processes, $max_threa
);
$cacti_stats = vsprintf('Time:%01.4f Method:%s Processes:%s Threads:%s Hosts:%s HostsPerProcess:%s DataSources:%s RRDsProcessed:%s', $perf_data);- cacti_log('STATS: ' . $cacti_stats , true, 'SYSTEM');+ if (read_config_option('log_verbosity') > POLLER_VERBOSITY_NONE) {+ cacti_log('STATS: ' . $cacti_stats , true, 'SYSTEM');+ }
// insert poller stats into the settings table
if ($poller_id > 1) {diff --git a/poller_maintenance.php b/poller_maintenance.php
index 700850ab1..4951dcce9 100755
--- a/poller_maintenance.php
+++ b/poller_maintenance.php
@@ -322,7 +322,7 @@ function logrotate_rotatenow() {$logs = array();
$log = read_config_option('path_cactilog'); if (empty($log)) {- $log = $config['base_path'] . '/log/cacti.log';
+ $log = $config['log_path'] . '/cacti.log';
}
$logs['Cacti'] = $log;