mv packages to config dir to match web layout

2 files changed, 0 insertions, 354 deletions

diff --git a/packages/bandwidthd/bandwidthd.inc b/packages/bandwidthd/bandwidthd.inc
deleted file mode 100644
index 262530ce..00000000
--- a/packages/bandwidthd/bandwidthd.inc
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	bandwidthd.inc
-	Copyright (C) 2006 Scott Ullrich
-	part of pfSense
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-function bandwidthd_install_deinstall() {
-	conf_mount_rw();
-	config_lock();
-	exec("cd /var/db/pkg/ && pkg_delete `ls | grep bandwidthd`");
-	exec("rm /usr/local/etc/rc.d/bandwidthd*");
-	exec("rm -rf /usr/local/bandwidthd*");
-	exec("rm /usr/local/www/bandwidthd");
-	conf_mount_ro();
-	config_unlock();
-}
-
-function bandwidthd_install_config() {
-	global $config, $g;
-
-	conf_mount_rw();
-	config_lock();
-
-	/* user defined values */
-	$meta_refresh = $config['installedpackages']['bandwidthd']['config'][0]['metarefresh'];
-	if($meta_refresh)
-		$meta_refresh = "meta_refresh $meta_refresh\n";
-	$graph = $config['installedpackages']['bandwidthd']['config'][0]['graph'];
-	if($graph)
-		$graph = "graph true\n";
-	$filter_text = $config['installedpackages']['bandwidthd']['config'][0]['filter'];
-	if($filter_text)
-		$filter_text = "filter $filter_text\n";
-	$recover_cdf = $config['installedpackages']['bandwidthd']['config'][0]['recovercdf'];
-	if($recover_cdf)
-		$recover_cdf = "recover_cdf true\n";
-	$output_cdf = $config['installedpackages']['bandwidthd']['config'][0]['outputcdf'];
-	if($output_cdf)
-		$output_cdf = "output_cdf true\n";
-	$promiscuous = $config['installedpackages']['bandwidthd']['config'][0]['promiscuous'];
-	if($promiscuous)
-		$promiscuous = "promiscuous true\n";
-	$graph_cutoff = $config['installedpackages']['bandwidthd']['config'][0]['graphcutoff'];
-	if($graph_cutoff)
-		$graph_cutoff = "graph_cutoff $graph_cutoff\n";
-	$skip_intervals = $config['installedpackages']['bandwidthd']['config'][0]['skipintervals'];
-	if($skip_intervals)
-		$skip_intervals = "skip_intervals $skip_intervals\n";
-
-	if($config['installedpackages']['bandwidthd']['config'][0]['active_interface']){
-		$ifdescrs = array($config['installedpackages']['bandwidthd']['config'][0]['active_interface']);
-	} else {
-		log_error("You should specify a interface for bandwidthd to listen on.  exiting.");
-	}
-
-	/* initialize to "" */
-	$subnets = "";
-	//$ifdescrs = array("lan", "wan");
-	//for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) {
-		//$ifdescrs['opt' . $j] = "opt" . $j;
-	//}
-	if(is_array($ifdescrs)) {
-		foreach($ifdescrs as $int) {
-			/* calculate interface subnet information */
-			$ifcfg = &$config['interfaces'][$int];
-			$subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']);
-			$subnetmask = gen_subnet_mask($ifcfg['subnet']);
-			if($subnet == "pppoe") {
-				$subnet = find_interface_ip("ng0");
-				if($subnet)
-					$subnets .= "subnet {$subnet}/32\n";
-			} else {
-				if($subnet)
-					$subnets .= "subnet {$subnet}/{$ifcfg['subnet']}\n";
-			}
-		}
-	}
-
-	/* initialize to "" */
-	$dev = "";
-	if(is_array($ifdescrs)) {
-		foreach($ifdescrs as $ifdescr) {
-			$descr = convert_friendly_interface_to_real_interface_name($ifdescr);
-			$dev .= "dev \"$descr\"\n";
-		}
-	}
-
-	$config_file = <<<EOF
-#
-# This file was automatically generated by the pfSense
-# package management system.  Changing this file
-# will lead to it being overwritten again when
-# the package manage resyncs.
-#
-####################################################
-# Bandwidthd.conf
-#
-# Commented out options are here to provide
-# documentation and represent defaults
-
-# Subnets to collect statistics on.  Traffic that
-# matches none of these subnets will be ignored.
-# Syntax is either IP Subnet Mask or CIDR
-$subnets
-
-# Device to listen on
-# Bandwidthd listens on the first device it detects
-# by default.  Run "bandwidthd -l" for a list of
-# devices.
-$dev
-
-###################################################
-# Options that don't usually get changed
-
-# An interval is 2.5 minutes, this is how many
-# intervals to skip before doing a graphing run
-$skip_inervals
-
-# Graph cutoff is how many k must be transfered by an
-# ip before we bother to graph it
-$graph_cutoff
-
-#Put interface in promiscuous mode to score to traffic
-#that may not be routing through the host machine.
-$promiscuous
-
-#Log data to cdf file htdocs/log.cdf
-$output_cdf
-
-#Read back the cdf file on startup
-$recover_cdf
-
-#Libpcap format filter string used to control what bandwidthd see's
-#Please always include "ip" in the string to avoid strange problems
-$filter_text
-
-#Draw Graphs - This default to true to graph the traffic bandwidthd is recording
-#Usually set this to false if you only want cdf output or
-#you are using the database output option.  Bandwidthd will use very little
-#ram and cpu if this is set to false.
-$graph
-
-#Set META REFRESH seconds (default 150, use 0 to disable).
-$meta_refresh
-
-EOF;
-
-	$fd = fopen("/usr/local/bandwidthd/etc/bandwidthd.conf","w");
-	if(!$fd) {
-		log_error("could not open /usr/local/bandwidthd/etc/bandwidthd.conf for writing");
-		exit;
-	}
-	fwrite($fd, $config_file);
-	fclose($fd);
-
-	/* write out rc.d start/stop file */
-	write_rcfile(array(
-			"file" => "bandwidthd.sh",
-			"start" => "/usr/local/bandwidthd/bandwidthd /usr/local/bandwidthd/etc/bandwidthd.conf",
-			"stop" => "/usr/bin/killall bandwidthd"
-		)
-	);
-
-	exec("rm /usr/local/www/bandwidthd");
-	exec("/bin/ln -s /usr/local/bandwidthd/htdocs /usr/local/www/bandwidthd");
-
-	exec("echo \"Please start bandwidthd to populate this directory.\" > /usr/local/bandwidthd/htdocs/index.html");
-
-	conf_mount_ro();
-	config_unlock();
-
-	stop_service("bandwidthd");
-	start_service("bandwidthd");
-
-}
-
-?>
\ No newline at end of file
diff --git a/packages/bandwidthd/bandwidthd.xml b/packages/bandwidthd/bandwidthd.xml
deleted file mode 100644
index 7d91ce77..00000000
--- a/packages/bandwidthd/bandwidthd.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
-<packagegui>
-        <copyright>
-        <![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>bandwidthd</name>
-	<version>1.0</version>
-	<title>Bandwidthd</title>
-	<aftersaveredirect>/pkg_edit.php?xml=bandwidthd.xml&amp;id=0</aftersaveredirect>
-	<include_file>/usr/local/pkg/bandwidthd.inc</include_file>
-	<menu>
-		<name>BandwidthD</name>
-		<tooltiptext></tooltiptext>
-		<section>Services</section>
-		<url>/pkg_edit.php?xml=bandwidthd.xml&amp;id=0</url>
-	</menu>
-	<service>
-			<name>bandwidthd</name>
-			<rcfile>bandwidthd.sh</rcfile>
-			<executable>bandwidthd</executable>
-    </service>
-	<tabs>
-		<tab>
-			<text>BandwidthD</text>
-			<url>/pkg_edit.php?xml=bandwidthd.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
-			<text>Access BandwidthD</text>
-			<url>/bandwidthd</url>
-		</tab>
-	</tabs>
-	<configpath>installedpackages->package->bandwidthd</configpath>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/bandwidthd/bandwidthd.inc</item>
-	</additional_files_needed>
-	<fields>
-		<field>
-			<fielddescr>interface</fielddescr>
-			<fieldname>active_interface</fieldname>
-			<description>The interface that bandwidthd will bind to.</description>
-			<type>interfaces_selection</type>
-			<required/>
-			<default_value>lan</default_value>
-		</field>	
-		<field>
-			<fielddescr>Skip intervals</fielddescr>
-			<fieldname>skipintervals</fieldname>
-			<description></description>
-			<type>input</type>
-			<value>1024</value>
-		</field>
-		<field>
-			<fielddescr>Graph cutoff</fielddescr>
-			<fieldname>graphcutoff</fieldname>
-			<description>Graph cutoff is how many k must be transfered by an ip before we bother to graph it</description>
-			<type>input</type>
-			<value>1024</value>
-		</field>
-		<field>
-			<fielddescr>promiscuous</fielddescr>
-			<fieldname>promiscuous</fieldname>
-			<description>Put interface in promiscuous mode to score to traffic that may not be routing through the host machine.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>output_cdf</fielddescr>
-			<fieldname>outputcdf</fieldname>
-			<description>Log data to cdf file htdocs/log.cdf</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>recover_cdf</fielddescr>
-			<fieldname>recovercdf</fieldname>
-			<description>Read back the cdf file on startup</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>filter</fielddescr>
-			<fieldname>filter</fieldname>
-			<description>Libpcap format filter string used to control what bandwidthd see's.  Please always include "ip" in the string to avoid strange problems.</description>
-			<type>input</type>
-			<value>ip</value>
-		</field>
-		<field>
-			<fielddescr>Draw Graphs</fielddescr>
-			<fieldname>drawgraphs</fieldname>
-			<description>This default to true to graph the traffic bandwidthd is recording.  Usually set this to false if you only want cdf output or you are using the database output option.  Bandwidthd will use very little ram and cpu if this is set to false.</description>
-			<type>checkbox</type>
-			<value>checked</value>
-		</field>
-		<field>
-			<fielddescr>Meta Refresh</fielddescr>
-			<fieldname>meta_refresh</fieldname>
-			<description>Set META REFRESH seconds (default 150, use 0 to disable).</description>
-			<type>input</type>
-			<value>150</value>
-		</field>
-	</fields>
-	<custom_php_resync_config_command>
-		bandwidthd_install_config();
-	</custom_php_resync_config_command>
-	<custom_php_install_command>
-		bandwidthd_install_config();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		bandwidthd_install_deinstall();
-	</custom_php_deinstall_command>
-</packagegui>