Attachment #149240 for bug #194921

View | Details | Raw Unified | Return to bug 194921
Collapse All | Expand All




# $FreeBSD: head/net-mgmt/flowviewer/Makefile 346902 2014-03-03 14:21:44Z feld $

PORTNAME=	flowviewer
PORTVERSION=	4.5
CATEGORIES=	net-mgmt
MASTER_SITES=	SF/${PORTNAME}
DISTNAME=	FlowViewer_${DISTVERSION}


PLIST_SCRIPT=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \
		FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
		FlowMonitor.cgi FlowMonitor_Dashboard.cgi FlowMonitor_Display.cgi \
		FlowMonitor_DisplayPublic.cgi FlowMonitor_Dumper.cgi \
		FlowMonitor_Group.cgi FlowMonitor_Main.cgi FlowMonitor_Management.cgi \
		FlowMonitor_Replay.cgi FlowViewer.cgi dscan.suppress.dst dscan.suppress.src \
		FlowViewer_Main.cgi FlowViewer_Replay.cgi \
		FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \
		FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
		FlowMonitor_Collector FlowMonitor_Grapher \
		FlowMonitor_Recreate FlowMonitor_Thumbnail FlowViewer_CleanASCache \
		FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK \
		NamedInterfaces_Devices NamedInterfaces_Exporters
PLIST_DATA=	FG_button.png FM_button.png FV_button.png FlowViewer.css
PLIST_TOOLS=	flowcapture_restart resize_rrdtools flowmonitor_grapher_nonlazy \
		date_to_epoch_gm performance_check flowmonitor_restart \
		convert_pre40_filters analyze_flowmonitor_debug flowmonitor_grapher_recent \
		flow-capture-table.conf rsync_monitors epoch_to_date_local rwflowpack_start \
		epoch_to_date_gm rsync_htmls flowmonitor_archive_restore \
		date_to_epoch_local analyze_netflow_packets rsync_flows

PLIST_SUB+=	FLOWVIEWERDIR="${FLOWVIEWERDIR}" \

	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}
	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools
	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tmp ${STAGEDIR}${FLOWVIEWERDIR}/reports ${STAGEDIR}${FLOWVIEWERDIR}/graphs \
	${STAGEDIR}${FLOWVIEWERDIR}/monitor ${STAGEDIR}${FLOWVIEWERDIR}/working ${STAGEDIR}${FLOWVIEWERDIR}/saves \
	${STAGEDIR}${FLOWVIEWERDIR}/names ${STAGEDIR}${FLOWVIEWERDIR}/ipsets ${STAGEDIR}${FLOWVIEWERDIR}/filters \
	${STAGEDIR}${FLOWVIEWERDIR}/rrdtools ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Dashboard
.for i in ${PLIST_SCRIPT}
	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (FlowViewer_4.3.tar) = 740086dbf4b70aed625c650caddd4c010ea49d035253165b6087f2c12dc9188a	1	SHA256 (FlowViewer_4.5.tar) = c06b778bcfea55f8fff0c2d78fa0ed41137e41d37f00254674018f54b00e76ce
2	SIZE (FlowViewer_4.3.tar) = 1024000	2	SIZE (FlowViewer_4.5.tar) = 1443840




%%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
%%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi
%%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
%%FLOWVIEWERDIR%%/FlowMonitor.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Collector
%%FLOWVIEWERDIR%%/FlowMonitor_Dashboard.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Display.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_DisplayPublic.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Dumper.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Grapher
%%FLOWVIEWERDIR%%/FlowMonitor_Group.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Main.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Management.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Recreate
%%FLOWVIEWERDIR%%/FlowMonitor_Replay.cgi
%%FLOWVIEWERDIR%%/FlowMonitor_Thumbnail
%%FLOWVIEWERDIR%%/FlowTracker_Thumbnail
%%FLOWVIEWERDIR%%/FlowViewer.cgi
%%FLOWVIEWERDIR%%/FlowViewer_CleanASCache
%%FLOWVIEWERDIR%%/FlowViewer_CleanFiles

%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters
%%FLOWVIEWERDIR%%/dscan.suppress.dst
%%FLOWVIEWERDIR%%/dscan.suppress.src
%%FLOWVIEWERDIR%%/tools/analyze_flowmonitor_debug
%%FLOWVIEWERDIR%%/tools/analyze_netflow_packets
%%FLOWVIEWERDIR%%/tools/convert_pre40_filters
%%FLOWVIEWERDIR%%/tools/date_to_epoch_gm

%%FLOWVIEWERDIR%%/tools/epoch_to_date_local
%%FLOWVIEWERDIR%%/tools/flow-capture-table.conf
%%FLOWVIEWERDIR%%/tools/flowcapture_restart
%%FLOWVIEWERDIR%%/tools/flowmonitor_archive_restore
%%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_nonlazy
%%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_recent
%%FLOWVIEWERDIR%%/tools/flowmonitor_restart
%%FLOWVIEWERDIR%%/tools/performance_check
%%FLOWVIEWERDIR%%/tools/resize_rrdtools
%%FLOWVIEWERDIR%%/tools/rsync_flows
%%FLOWVIEWERDIR%%/tools/rsync_htmls
%%FLOWVIEWERDIR%%/tools/rsync_monitors
%%FLOWVIEWERDIR%%/tools/rwflowpack_start
%%FLOWVIEWERDIR%%/reports/FG_button.png
%%FLOWVIEWERDIR%%/reports/FM_button.png
%%FLOWVIEWERDIR%%/reports/FV_button.png
%%FLOWVIEWERDIR%%/reports/FlowViewer.css
@exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %%FLOWVIEWERDIR%%/tmp %%FLOWVIEWERDIR%%/reports %%FLOWVIEWERDIR%%/graphs %%FLOWVIEWERDIR%%/monitor  %%FLOWVIEWERDIR%%/working %%FLOWVIEWERDIR%%/saves %%FLOWVIEWERDIR%%/names %%FLOWVIEWERDIR%%/ipsets %%FLOWVIEWERDIR%%/filters %%FLOWVIEWERDIR%%/rrdtools %%FLOWVIEWERDIR%%/FlowViewer_Dashboard %%FLOWVIEWERDIR%%/tools
@dir %%WWWDIR%%/FlowViewer_Dashboard
@dir %%WWWDIR%%/filters
@dir %%WWWDIR%%/graphs
@dir %%WWWDIR%%/ipsets
@dir %%WWWDIR%%/monitor
@dir %%WWWDIR%%/names
@dir %%WWWDIR%%/rrdtools
@dir %%WWWDIR%%/saves
@dir %%WWWDIR%%/tmp
@dir %%WWWDIR%%/working
@dirrmtry %%FLOWVIEWERDIR%%/FlowViewer_Dashboard
@dirrmtry %%FLOWVIEWERDIR%%




--- FlowViewer_Configuration.pm.orig	2014-11-10 11:04:45.000000000 +0300
+++ FlowViewer_Configuration.pm	2014-11-10 11:25:39.000000000 +0300
@@ -64,36 +64,36 @@
 
 # Service
 

-$reports_short           = "/FlowViewer";
-$graphs_directory        = "/var/www/html/FlowGrapher";
-$graphs_short            = "/FlowGrapher";
-$monitor_directory       = "/var/www/html/FlowMonitor";
-$monitor_short           = "/FlowMonitor";
-$cgi_bin_directory       = "/var/www/cgi-bin/FlowViewer_4.5";
-$cgi_bin_short           = "/cgi-bin/FlowViewer_4.5";
-$work_directory          = "/var/www/cgi-bin/FlowViewer_4.5/Flow_Working";
-$save_directory          = "/var/www/html/FlowViewer_Saves";
-$save_short              = "/FlowViewer_Saves";
-$names_directory         = "/var/www/cgi-bin/FlowViewer_4.5";
-$ipset_directory         = "/var/www/cgi-bin/FlowViewer_4.5";     # Where FlowViewer can find IPset files
-$filter_directory        = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_Filters";  
-$rrdtool_directory       = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_RRDtool";
-$dashboard_directory     = "/var/www/html/FlowViewer_Dashboard";
+$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
+$reports_short           = "/FlowViewer/reports";
+$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
+$graphs_short            = "/FlowViewer/graphs";
+$monitor_directory       = "%%FLOWVIEWERDIR%%/monitor";
+$monitor_short           = "/FlowMonitor/monitor";
+$cgi_bin_directory       = "%%FLOWVIEWERDIR%%";
+$cgi_bin_short           = "/FlowViewer";
+$work_directory          = "%%FLOWVIEWERDIR%%/working";
+$save_directory          = "%%FLOWVIEWERDIR%%/saves";
+$save_short              = "/FlowViewer/saves";
+$names_directory         = "%%FLOWVIEWERDIR%%/names";
+$ipset_directory         = "%%FLOWVIEWERDIR%%/ipsets";     # Where FlowViewer can find IPset files
+$filter_directory        = "%%FLOWVIEWERDIR%%/filters";  
+$rrdtool_directory       = "%%FLOWVIEWERDIR%%/rrdtools";
+$dashboard_directory     = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard";
 $dashboard_short         = "/FlowViewer_Dashboard";
 #@other_dashboards       = ();          # Set to empty if you have just the one nominal Dashboard
-@other_dashboards        = ("/var/www/html/SOC","/var/www/html/NetOps");
+@other_dashboards        = ("%%FLOWVIEWERDIR%%/SOC","%%FLOWVIEWERDIR%%/NetOps");
 #@dashboard_titles       = ();          # Set to empty if you have just the one nominal Dashboard
 @dashboard_titles        = ("Performance","SOC","NetOps"); # titles must be in the same order as the directories
 
-$flow_data_directory     = "/data/flows";
-$exporter_directory      = "/data/flows/all_routers";

+$flow_bin_directory      = "%%PREFIX%%/bin";
+$rrdtool_bin_directory   = "%%PREFIX%%/bin";
 
 # SiLK parameters
 
@@ -207,7 +207,7 @@
 # Monitor parameters
  
 $actives_webpage    = "index.html";
-$log_directory      = "/var/www/cgi-bin/FlowViewer_4.5/logs";
+$log_directory      = "%%FLOWVIEWERDIR%%/logs";
 $log_collector_short= "Y";
 $log_collector_med  = "N";

Return to bug 194921

Lines 2-8 Link Here

(-)Makefile (-16 / +16 lines)
2	# $FreeBSD: head/net-mgmt/flowviewer/Makefile 346902 2014-03-03 14:21:44Z feld $	2	# $FreeBSD: head/net-mgmt/flowviewer/Makefile 346902 2014-03-03 14:21:44Z feld $
3		3
4	PORTNAME= flowviewer	4	PORTNAME= flowviewer
5	PORTVERSION= 4.3	5	PORTVERSION= 4.5
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7	MASTER_SITES= SF/${PORTNAME}	7	MASTER_SITES= SF/${PORTNAME}
8	DISTNAME= FlowViewer_${DISTVERSION}	8	DISTNAME= FlowViewer_${DISTVERSION}
Lines 27-49 Link Here
27		27
28	PLIST_SCRIPT= FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \	28	PLIST_SCRIPT= FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \
29	FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \	29	FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
30	FlowTracker.cgi FlowTracker_Dashboard.cgi FlowTracker_Display.cgi \	30	FlowMonitor.cgi FlowMonitor_Dashboard.cgi FlowMonitor_Display.cgi \
31	FlowTracker_DisplayPublic.cgi FlowTracker_Dumper.cgi \	31	FlowMonitor_DisplayPublic.cgi FlowMonitor_Dumper.cgi \
32	FlowTracker_Group.cgi FlowTracker_Main.cgi FlowTracker_Management.cgi \	32	FlowMonitor_Group.cgi FlowMonitor_Main.cgi FlowMonitor_Management.cgi \
33	FlowTracker_Replay.cgi FlowViewer.cgi dscan.suppress.dst dscan.suppress.src \	33	FlowMonitor_Replay.cgi FlowViewer.cgi dscan.suppress.dst dscan.suppress.src \
34	FlowViewer_Main.cgi FlowViewer_Replay.cgi \	34	FlowViewer_Main.cgi FlowViewer_Replay.cgi \
35	FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \	35	FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \
36	FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \	36	FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
37	FlowTracker_AltDashboard FlowTracker_Collector FlowTracker_Grapher \	37	FlowMonitor_Collector FlowMonitor_Grapher \
38	FlowTracker_Recreate FlowTracker_Thumbnail FlowViewer_CleanASCache \	38	FlowMonitor_Recreate FlowMonitor_Thumbnail FlowViewer_CleanASCache \
39	FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK \	39	FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK \
40	NamedInterfaces_Devices NamedInterfaces_Exporters	40	NamedInterfaces_Devices NamedInterfaces_Exporters
41	PLIST_DATA= FG_button.png FT_button.png FV_button.png FlowViewer.css	41	PLIST_DATA= FG_button.png FM_button.png FV_button.png FlowViewer.css
42	PLIST_TOOLS= flowcapture_restart resize_rrdtools flowtracker_grapher_nonlazy \	42	PLIST_TOOLS= flowcapture_restart resize_rrdtools flowmonitor_grapher_nonlazy \
43	date_to_epoch_gm performance_check flowtracker_restart \	43	date_to_epoch_gm performance_check flowmonitor_restart \
44	convert_pre40_filters analyze_flowtracker_debug flowtracker_grapher_recent \	44	convert_pre40_filters analyze_flowmonitor_debug flowmonitor_grapher_recent \
45	flow-capture-table.conf rsync_trackings epoch_to_date_local rwflowpack_start \	45	flow-capture-table.conf rsync_monitors epoch_to_date_local rwflowpack_start \
46	epoch_to_date_gm rsync_htmls flowtracker_archive_restore \	46	epoch_to_date_gm rsync_htmls flowmonitor_archive_restore \
47	date_to_epoch_local analyze_netflow_packets rsync_flows	47	date_to_epoch_local analyze_netflow_packets rsync_flows
48		48
49	PLIST_SUB+= FLOWVIEWERDIR="${FLOWVIEWERDIR}" \	49	PLIST_SUB+= FLOWVIEWERDIR="${FLOWVIEWERDIR}" \
Lines 71-79 Link Here
71	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}	71	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}
72	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools	72	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools
73	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist	73	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
74	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tmp ${STAGEDIR}${FLOWVIEWERDIR}/reports \	74	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tmp ${STAGEDIR}${FLOWVIEWERDIR}/reports ${STAGEDIR}${FLOWVIEWERDIR}/graphs \
75	${STAGEDIR}${FLOWVIEWERDIR}/graphs ${STAGEDIR}${FLOWVIEWERDIR}/tracker ${STAGEDIR}${FLOWVIEWERDIR}/working \	75	${STAGEDIR}${FLOWVIEWERDIR}/monitor ${STAGEDIR}${FLOWVIEWERDIR}/working ${STAGEDIR}${FLOWVIEWERDIR}/saves \
76	${STAGEDIR}${FLOWVIEWERDIR}/saves ${STAGEDIR}${FLOWVIEWERDIR}/names ${STAGEDIR}${FLOWVIEWERDIR}/filters \	76	${STAGEDIR}${FLOWVIEWERDIR}/names ${STAGEDIR}${FLOWVIEWERDIR}/ipsets ${STAGEDIR}${FLOWVIEWERDIR}/filters \
77	${STAGEDIR}${FLOWVIEWERDIR}/rrdtools ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Dashboard	77	${STAGEDIR}${FLOWVIEWERDIR}/rrdtools ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Dashboard
78	.for i in ${PLIST_SCRIPT}	78	.for i in ${PLIST_SCRIPT}
79	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}	79	@${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}

Lines 5-24 Link Here

(-)pkg-plist (-34 / +31 lines)
5	%%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi	5	%%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
6	%%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi	6	%%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi
7	%%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi	7	%%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
8	%%FLOWVIEWERDIR%%/FlowTracker.cgi	8	%%FLOWVIEWERDIR%%/FlowMonitor.cgi
9	%%FLOWVIEWERDIR%%/FlowTracker_AltDashboard	9	%%FLOWVIEWERDIR%%/FlowMonitor_Collector
10	%%FLOWVIEWERDIR%%/FlowTracker_Collector	10	%%FLOWVIEWERDIR%%/FlowMonitor_Dashboard.cgi
11	%%FLOWVIEWERDIR%%/FlowTracker_Dashboard.cgi	11	%%FLOWVIEWERDIR%%/FlowMonitor_Display.cgi
12	%%FLOWVIEWERDIR%%/FlowTracker_Display.cgi	12	%%FLOWVIEWERDIR%%/FlowMonitor_DisplayPublic.cgi
13	%%FLOWVIEWERDIR%%/FlowTracker_DisplayPublic.cgi	13	%%FLOWVIEWERDIR%%/FlowMonitor_Dumper.cgi
14	%%FLOWVIEWERDIR%%/FlowTracker_Dumper.cgi	14	%%FLOWVIEWERDIR%%/FlowMonitor_Grapher
15	%%FLOWVIEWERDIR%%/FlowTracker_Grapher	15	%%FLOWVIEWERDIR%%/FlowMonitor_Group.cgi
16	%%FLOWVIEWERDIR%%/FlowTracker_Group.cgi	16	%%FLOWVIEWERDIR%%/FlowMonitor_Main.cgi
17	%%FLOWVIEWERDIR%%/FlowTracker_Main.cgi	17	%%FLOWVIEWERDIR%%/FlowMonitor_Management.cgi
18	%%FLOWVIEWERDIR%%/FlowTracker_Management.cgi	18	%%FLOWVIEWERDIR%%/FlowMonitor_Recreate
19	%%FLOWVIEWERDIR%%/FlowTracker_Recreate	19	%%FLOWVIEWERDIR%%/FlowMonitor_Replay.cgi
20	%%FLOWVIEWERDIR%%/FlowTracker_Replay.cgi	20	%%FLOWVIEWERDIR%%/FlowMonitor_Thumbnail
21	%%FLOWVIEWERDIR%%/FlowTracker_Thumbnail
22	%%FLOWVIEWERDIR%%/FlowViewer.cgi	21	%%FLOWVIEWERDIR%%/FlowViewer.cgi
23	%%FLOWVIEWERDIR%%/FlowViewer_CleanASCache	22	%%FLOWVIEWERDIR%%/FlowViewer_CleanASCache
24	%%FLOWVIEWERDIR%%/FlowViewer_CleanFiles	23	%%FLOWVIEWERDIR%%/FlowViewer_CleanFiles
Lines 36-42 Link Here
36	%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters	35	%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters
37	%%FLOWVIEWERDIR%%/dscan.suppress.dst	36	%%FLOWVIEWERDIR%%/dscan.suppress.dst
38	%%FLOWVIEWERDIR%%/dscan.suppress.src	37	%%FLOWVIEWERDIR%%/dscan.suppress.src
39	%%FLOWVIEWERDIR%%/tools/analyze_flowtracker_debug	38	%%FLOWVIEWERDIR%%/tools/analyze_flowmonitor_debug
40	%%FLOWVIEWERDIR%%/tools/analyze_netflow_packets	39	%%FLOWVIEWERDIR%%/tools/analyze_netflow_packets
41	%%FLOWVIEWERDIR%%/tools/convert_pre40_filters	40	%%FLOWVIEWERDIR%%/tools/convert_pre40_filters
42	%%FLOWVIEWERDIR%%/tools/date_to_epoch_gm	41	%%FLOWVIEWERDIR%%/tools/date_to_epoch_gm
Lines 45-74 Link Here
45	%%FLOWVIEWERDIR%%/tools/epoch_to_date_local	44	%%FLOWVIEWERDIR%%/tools/epoch_to_date_local
46	%%FLOWVIEWERDIR%%/tools/flow-capture-table.conf	45	%%FLOWVIEWERDIR%%/tools/flow-capture-table.conf
47	%%FLOWVIEWERDIR%%/tools/flowcapture_restart	46	%%FLOWVIEWERDIR%%/tools/flowcapture_restart
48	%%FLOWVIEWERDIR%%/tools/flowtracker_archive_restore	47	%%FLOWVIEWERDIR%%/tools/flowmonitor_archive_restore
49	%%FLOWVIEWERDIR%%/tools/flowtracker_grapher_nonlazy	48	%%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_nonlazy
50	%%FLOWVIEWERDIR%%/tools/flowtracker_grapher_recent	49	%%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_recent
51	%%FLOWVIEWERDIR%%/tools/flowtracker_restart	50	%%FLOWVIEWERDIR%%/tools/flowmonitor_restart
52	%%FLOWVIEWERDIR%%/tools/performance_check	51	%%FLOWVIEWERDIR%%/tools/performance_check
53	%%FLOWVIEWERDIR%%/tools/resize_rrdtools	52	%%FLOWVIEWERDIR%%/tools/resize_rrdtools
54	%%FLOWVIEWERDIR%%/tools/rsync_flows	53	%%FLOWVIEWERDIR%%/tools/rsync_flows
55	%%FLOWVIEWERDIR%%/tools/rsync_htmls	54	%%FLOWVIEWERDIR%%/tools/rsync_htmls
56	%%FLOWVIEWERDIR%%/tools/rsync_trackings	55	%%FLOWVIEWERDIR%%/tools/rsync_monitors
57	%%FLOWVIEWERDIR%%/tools/rwflowpack_start	56	%%FLOWVIEWERDIR%%/tools/rwflowpack_start
58	%%FLOWVIEWERDIR%%/reports/FG_button.png	57	%%FLOWVIEWERDIR%%/reports/FG_button.png
59	%%FLOWVIEWERDIR%%/reports/FT_button.png	58	%%FLOWVIEWERDIR%%/reports/FM_button.png
60	%%FLOWVIEWERDIR%%/reports/FV_button.png	59	%%FLOWVIEWERDIR%%/reports/FV_button.png
61	%%FLOWVIEWERDIR%%/reports/FlowViewer.css	60	%%FLOWVIEWERDIR%%/reports/FlowViewer.css
62	@exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %%FLOWVIEWERDIR%%/tmp %%FLOWVIEWERDIR%%/reports %%FLOWVIEWERDIR%%/graphs %%FLOWVIEWERDIR%%/tracker %%FLOWVIEWERDIR%%/working %%FLOWVIEWERDIR%%/saves %%FLOWVIEWERDIR%%/names %%FLOWVIEWERDIR%%/filters %%FLOWVIEWERDIR%%/rrdtools %%FLOWVIEWERDIR%%/FlowViewer_Dashboard %%FLOWVIEWERDIR%%/tools	61	@exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %%FLOWVIEWERDIR%%/tmp %%FLOWVIEWERDIR%%/reports %%FLOWVIEWERDIR%%/graphs %%FLOWVIEWERDIR%%/monitor %%FLOWVIEWERDIR%%/working %%FLOWVIEWERDIR%%/saves %%FLOWVIEWERDIR%%/names %%FLOWVIEWERDIR%%/ipsets %%FLOWVIEWERDIR%%/filters %%FLOWVIEWERDIR%%/rrdtools %%FLOWVIEWERDIR%%/FlowViewer_Dashboard %%FLOWVIEWERDIR%%/tools
63	@dirrmtry %%FLOWVIEWERDIR%%/working	62	@dir %%WWWDIR%%/FlowViewer_Dashboard
64	@dirrmtry %%FLOWVIEWERDIR%%/tracker	63	@dir %%WWWDIR%%/filters
65	@dirrmtry %%FLOWVIEWERDIR%%/tools	64	@dir %%WWWDIR%%/graphs
66	@dirrmtry %%FLOWVIEWERDIR%%/tmp	65	@dir %%WWWDIR%%/ipsets
67	@dirrmtry %%FLOWVIEWERDIR%%/saves	66	@dir %%WWWDIR%%/monitor
68	@dirrmtry %%FLOWVIEWERDIR%%/rrdtools	67	@dir %%WWWDIR%%/names
69	@dirrmtry %%FLOWVIEWERDIR%%/reports	68	@dir %%WWWDIR%%/rrdtools
70	@dirrmtry %%FLOWVIEWERDIR%%/names	69	@dir %%WWWDIR%%/saves
71	@dirrmtry %%FLOWVIEWERDIR%%/graphs	70	@dir %%WWWDIR%%/tmp
72	@dirrmtry %%FLOWVIEWERDIR%%/filters	71	@dir %%WWWDIR%%/working
73	@dirrmtry %%FLOWVIEWERDIR%%/FlowViewer_Dashboard
74	@dirrmtry %%FLOWVIEWERDIR%%

Lines 1-6 Link Here

(-)files/patch-FlowViewer__Configuration.pm (-18 / +25 lines)
1	--- FlowViewer_Configuration.pm.orig 2014-02-24 17:44:27.000000000 +0400	1	--- FlowViewer_Configuration.pm.orig 2014-11-10 11:04:45.000000000 +0300
2	+++ FlowViewer_Configuration.pm 2014-02-24 17:54:45.000000000 +0400	2	+++ FlowViewer_Configuration.pm 2014-11-10 11:25:39.000000000 +0300
3	@@ -56,31 +56,31 @@	3	@@ -64,36 +64,36 @@
4		4
5	# Service	5	# Service
6		6
Lines 13-45 Link Here
13	-$reports_short = "/FlowViewer";	13	-$reports_short = "/FlowViewer";
14	-$graphs_directory = "/var/www/html/FlowGrapher";	14	-$graphs_directory = "/var/www/html/FlowGrapher";
15	-$graphs_short = "/FlowGrapher";	15	-$graphs_short = "/FlowGrapher";
16	-$tracker_directory = "/var/www/html/FlowTracker";	16	-$monitor_directory = "/var/www/html/FlowMonitor";
17	-$tracker_short = "/FlowTracker";	17	-$monitor_short = "/FlowMonitor";
18	-$cgi_bin_directory = "/var/www/cgi-bin/FlowViewer_4.3";	18	-$cgi_bin_directory = "/var/www/cgi-bin/FlowViewer_4.5";
19	-$cgi_bin_short = "/cgi-bin/FlowViewer_4.3";	19	-$cgi_bin_short = "/cgi-bin/FlowViewer_4.5";
20	-$work_directory = "/var/www/cgi-bin/FlowViewer_4.3/Flow_Working";	20	-$work_directory = "/var/www/cgi-bin/FlowViewer_4.5/Flow_Working";
21	-$save_directory = "/var/www/html/FlowViewer_Saves";	21	-$save_directory = "/var/www/html/FlowViewer_Saves";
22	-$save_short = "/FlowViewer_Saves";	22	-$save_short = "/FlowViewer_Saves";
23	-$names_directory = "/var/www/cgi-bin/FlowViewer_4.3";	23	-$names_directory = "/var/www/cgi-bin/FlowViewer_4.5";
24	-$filter_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_Filters";	24	-$ipset_directory = "/var/www/cgi-bin/FlowViewer_4.5"; # Where FlowViewer can find IPset files
25	-$rrdtool_directory = "/var/www/cgi-bin/FlowTracker_Files/FlowTracker_RRDtool";	25	-$filter_directory = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_Filters";
		26	-$rrdtool_directory = "/var/www/cgi-bin/FlowMonitor_Files/FlowMonitor_RRDtool";
26	-$dashboard_directory = "/var/www/html/FlowViewer_Dashboard";	27	-$dashboard_directory = "/var/www/html/FlowViewer_Dashboard";
27	+$reports_directory = "%%FLOWVIEWERDIR%%/reports";	28	+$reports_directory = "%%FLOWVIEWERDIR%%/reports";
28	+$reports_short = "/FlowViewer/reports";	29	+$reports_short = "/FlowViewer/reports";
29	+$graphs_directory = "%%FLOWVIEWERDIR%%/graphs";	30	+$graphs_directory = "%%FLOWVIEWERDIR%%/graphs";
30	+$graphs_short = "/FlowViewer/graphs";	31	+$graphs_short = "/FlowViewer/graphs";
31	+$tracker_directory = "%%FLOWVIEWERDIR%%/tracker";	32	+$monitor_directory = "%%FLOWVIEWERDIR%%/monitor";
32	+$tracker_short = "/FlowViewer/tracker";	33	+$monitor_short = "/FlowMonitor/monitor";
33	+$cgi_bin_directory = "%%FLOWVIEWERDIR%%";	34	+$cgi_bin_directory = "%%FLOWVIEWERDIR%%";
34	+$cgi_bin_short = "/FlowViewer";	35	+$cgi_bin_short = "/FlowViewer";
35	+$work_directory = "%%FLOWVIEWERDIR%%/working";	36	+$work_directory = "%%FLOWVIEWERDIR%%/working";
36	+$save_directory = "%%FLOWVIEWERDIR%%/saves";	37	+$save_directory = "%%FLOWVIEWERDIR%%/saves";
37	+$save_short = "/FlowViewer/saves";	38	+$save_short = "/FlowViewer/saves";
38	+$names_directory = "%%FLOWVIEWERDIR%%/names";	39	+$names_directory = "%%FLOWVIEWERDIR%%/names";
		40	+$ipset_directory = "%%FLOWVIEWERDIR%%/ipsets"; # Where FlowViewer can find IPset files
39	+$filter_directory = "%%FLOWVIEWERDIR%%/filters";	41	+$filter_directory = "%%FLOWVIEWERDIR%%/filters";
40	+$rrdtool_directory = "%%FLOWVIEWERDIR%%/rrdtools";	42	+$rrdtool_directory = "%%FLOWVIEWERDIR%%/rrdtools";
41	+$dashboard_directory = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard";	43	+$dashboard_directory = "%%FLOWVIEWERDIR%%/FlowViewer_Dashboard";
42	$dashboard_short = "/FlowViewer_Dashboard";	44	$dashboard_short = "/FlowViewer_Dashboard";
		45	#@other_dashboards = (); # Set to empty if you have just the one nominal Dashboard
		46	-@other_dashboards = ("/var/www/html/SOC","/var/www/html/NetOps");
		47	+@other_dashboards = ("%%FLOWVIEWERDIR%%/SOC","%%FLOWVIEWERDIR%%/NetOps");
		48	#@dashboard_titles = (); # Set to empty if you have just the one nominal Dashboard
		49	@dashboard_titles = ("Performance","SOC","NetOps"); # titles must be in the same order as the directories
43		50
44	-$flow_data_directory = "/data/flows";	51	-$flow_data_directory = "/data/flows";
45	-$exporter_directory = "/data/flows/all_routers";	52	-$exporter_directory = "/data/flows/all_routers";
Lines 50-62 Link Here
50	+$flow_bin_directory = "%%PREFIX%%/bin";	57	+$flow_bin_directory = "%%PREFIX%%/bin";
51	+$rrdtool_bin_directory = "%%PREFIX%%/bin";	58	+$rrdtool_bin_directory = "%%PREFIX%%/bin";
52		59
53	$silk_data_directory = "/data/flows";	60	# SiLK parameters
54	$silk_bin_directory = "/usr/local/bin";	61
55	@@ -167,7 +167,7 @@	62	@@ -207,7 +207,7 @@
56	# Tracking parameters	63	# Monitor parameters
57		64
58	$actives_webpage = "index.html";	65	$actives_webpage = "index.html";
59	-$log_directory = "/var/www/cgi-bin/FlowViewer_4.3/logs";	66	-$log_directory = "/var/www/cgi-bin/FlowViewer_4.5/logs";
60	+$log_directory = "%%FLOWVIEWERDIR%%/logs";	67	+$log_directory = "%%FLOWVIEWERDIR%%/logs";
61	$log_collector_short= "Y";	68	$log_collector_short= "Y";
62	$log_collector_med = "N";	69	$log_collector_med = "N";