From ed3ab565f9af8e121d8c7df3c493018910b077e2 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 3 Mar 2014 14:21:44 +0000 Subject: Update to 4.3 Support STAGE PR: ports/187029 --- .../files/patch-FlowViewer__Configuration.pm | 40 ++++++++++++---------- 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm') diff --git a/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm b/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm index 238969de25c1..434fef37c67e 100644 --- a/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm +++ b/net-mgmt/flowviewer/files/patch-FlowViewer__Configuration.pm @@ -1,6 +1,11 @@ ---- FlowViewer_Configuration.pm.orig 2013-11-20 17:01:30.000000000 +0600 -+++ FlowViewer_Configuration.pm 2013-11-20 17:14:57.000000000 +0600 -@@ -59,28 +59,28 @@ +--- FlowViewer_Configuration.pm.orig 2014-02-24 17:44:27.000000000 +0400 ++++ FlowViewer_Configuration.pm 2014-02-24 17:54:45.000000000 +0400 +@@ -56,31 +56,31 @@ + + # Service + +-$FlowViewer_service = "https"; # (http, or https) ++$FlowViewer_service = "http"; # (http, or https) # Directories and Files: @@ -10,29 +15,28 @@ -$graphs_short = "/FlowGrapher"; -$tracker_directory = "/var/www/html/FlowTracker"; -$tracker_short = "/FlowTracker"; +-$cgi_bin_directory = "/var/www/cgi-bin/FlowViewer_4.3"; +-$cgi_bin_short = "/cgi-bin/FlowViewer_4.3"; +-$work_directory = "/var/www/cgi-bin/FlowViewer_4.3/Flow_Working"; +-$save_directory = "/var/www/html/FlowViewer_Saves"; +-$save_short = "/FlowViewer_Saves"; +-$names_directory = "/var/www/cgi-bin/FlowViewer_4.3"; +-$filter_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_Filters"; +-$rrdtool_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_RRDtool"; +-$dashboard_directory = "/var/www/html/FlowViewer_Dashboard"; +$reports_directory = "%%FLOWVIEWERDIR%%/reports"; +$reports_short = "/FlowViewer/reports"; +$graphs_directory = "%%FLOWVIEWERDIR%%/graphs"; +$graphs_short = "/FlowViewer/graphs"; +$tracker_directory = "%%FLOWVIEWERDIR%%/tracker"; +$tracker_short = "/FlowViewer/tracker"; - $old_tracker_directory = "/var/www/html/FlowTracker_4.2"; --$cgi_bin_directory = "/var/www/cgi-bin/FlowViewer_4.2.1"; --$cgi_bin_short = "/cgi-bin/FlowViewer_4.2.1"; --$work_directory = "/var/www/cgi-bin/FlowViewer_4.2.1/Flow_Working"; --$save_directory = "/var/www/html/FlowViewer_Saves"; --$save_short = "/FlowViewer_Saves"; --$names_directory = "/var/www/cgi-bin/FlowViewer_4.2.1"; --$filter_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_Filters"; --$rrdtool_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_RRDtool"; --$dashboard_directory = "/var/www/html/FlowViewer_Dashboard"; +$cgi_bin_directory = "%%FLOWVIEWERDIR%%"; +$cgi_bin_short = "/FlowViewer"; +$work_directory = "%%FLOWVIEWERDIR%%/working"; +$save_directory = "%%FLOWVIEWERDIR%%/saves"; -+$save_short = "/FlowViewer/Saves"; ++$save_short = "/FlowViewer/saves"; +$names_directory = "%%FLOWVIEWERDIR%%/names"; -+$filter_directory = "%%FLOWVIEWERDIR%%/filters"; ++$filter_directory = "%%FLOWVIEWERDIR%%/filters"; +$rrdtool_directory = "%%FLOWVIEWERDIR%%/rrdtools"; +$dashboard_directory = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard"; $dashboard_short = "/FlowViewer_Dashboard"; @@ -41,8 +45,8 @@ -$exporter_directory = "/data/flows/all_routers"; -$flow_bin_directory = "/usr/local/flow-tools/bin"; -$rrdtool_bin_directory = "/usr/bin"; -+$flow_data_directory = "%%PREFIX%%/var/netflow/"; -+$exporter_directory = "%%PREFIX%%/var/netflow/all_routers"; ++$flow_data_directory = "/var/db/flows"; ++$exporter_directory = "/var/db/flows/all_routers"; +$flow_bin_directory = "%%PREFIX%%/bin"; +$rrdtool_bin_directory = "%%PREFIX%%/bin"; @@ -52,7 +56,7 @@ # Tracking parameters $actives_webpage = "index.html"; --$log_directory = "/var/www/cgi-bin/FlowViewer_4.2.1/logs"; +-$log_directory = "/var/www/cgi-bin/FlowViewer_4.3/logs"; +$log_directory = "%%FLOWVIEWERDIR%%/logs"; $log_collector_short= "Y"; $log_collector_med = "N"; -- cgit v1.2.3