From owner-svn-ports-head@FreeBSD.ORG Sat Aug 16 07:08:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 833214A2; Sat, 16 Aug 2014 07:08:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63F6226CF; Sat, 16 Aug 2014 07:08:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7G78eqk072644; Sat, 16 Aug 2014 07:08:40 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7G78dt9072641; Sat, 16 Aug 2014 07:08:39 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201408160708.s7G78dt9072641@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 16 Aug 2014 07:08:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365066 - head/net-mgmt/cacti/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Aug 2014 07:08:40 -0000 Author: pi Date: Sat Aug 16 07:08:39 2014 New Revision: 365066 URL: http://svnweb.freebsd.org/changeset/ports/365066 QAT: https://qat.redports.org/buildarchive/r365066/ Log: net-mgmt/cacti: update pkg-message - /var/log/cacti/cacti.log -> /var/log/cacti/log - hint how to update database after hier(7) adaptions - Submitter is now maintainer PR: 192618 Submitted by: Dennis Glatting Modified: head/net-mgmt/cacti/files/patch-include__global_settings.php head/net-mgmt/cacti/files/patch-install__index.php head/net-mgmt/cacti/files/pkg-message.in Modified: head/net-mgmt/cacti/files/patch-include__global_settings.php ============================================================================== --- head/net-mgmt/cacti/files/patch-include__global_settings.php Sat Aug 16 03:47:14 2014 (r365065) +++ head/net-mgmt/cacti/files/patch-include__global_settings.php Sat Aug 16 07:08:39 2014 (r365066) @@ -5,10 +5,10 @@ "path_cactilog" => array( "friendly_name" => "Cacti Log File Path", - "description" => "The path to your Cacti log file (if blank, defaults to /log/cacti.log)", -+ "description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti.log)", ++ "description" => "The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)", "method" => "filepath", - "default" => $config["base_path"] . "/log/cacti.log", -+ "default" => "/var/log/cacti/cacti.log", ++ "default" => "/var/log/cacti/log", "max_length" => "255" ), "pollerpaths_header" => array( Modified: head/net-mgmt/cacti/files/patch-install__index.php ============================================================================== --- head/net-mgmt/cacti/files/patch-install__index.php Sat Aug 16 03:47:14 2014 (r365065) +++ head/net-mgmt/cacti/files/patch-install__index.php Sat Aug 16 07:08:39 2014 (r365066) @@ -5,7 +5,7 @@ $input["path_cactilog"]["default"] = read_config_option("path_cactilog"); } else { - $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log"; -+ $input["path_cactilog"]["default"] = "/var/log/cacti/cacti.log"; ++ $input["path_cactilog"]["default"] = "/var/log/cacti/log"; } /* SNMP Version */ Modified: head/net-mgmt/cacti/files/pkg-message.in ============================================================================== --- head/net-mgmt/cacti/files/pkg-message.in Sat Aug 16 03:47:14 2014 (r365065) +++ head/net-mgmt/cacti/files/pkg-message.in Sat Aug 16 07:08:39 2014 (r365066) @@ -67,6 +67,17 @@ NOTEs as of 10Aug2014: manage them using newsyslog. b) Cacti RRD files are now found under /var/db/cacti/rra. + If you have an existing Cacti installation these paths are also + found in Cacti's SQL database and MUST be updated. These two SQL + commands should do the trick: + + UPDATE settings SET value='/var/log/cacti/log' \ + WHERE name='path_cactilog'; + + UPDATE poller_item SET rrd_path=\ + REPLACE(rrd_path,'/usr/local/share/cacti/rra','/var/db/cacti/rra') \ + WHERE rrd_path REGEXP '^/usr/local/share/cacti/rra'; + 2) The PERL paths in the Cacti PERL scripts have been updated to /usr/local/bin.