aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/filemgr/filemgr.xml2
-rw-r--r--config/filemgr/rbfminc/file_editor_style.css5
-rw-r--r--config/filemgr/rbfminc/rename.tmp5
-rw-r--r--config/lcdproc-dev/lcdproc.inc5
-rw-r--r--config/lcdproc-dev/lcdproc_client.php6
-rw-r--r--config/mailreport/mail_reports.inc17
-rw-r--r--config/mailreport/mailreport.xml2
-rw-r--r--config/mailreport/status_mail_report_add_graph.php7
-rw-r--r--config/nrpe2/nrpe2.inc9
-rw-r--r--config/nrpe2/nrpe2.xml9
-rwxr-xr-xconfig/sarg/sarg_about.php4
-rw-r--r--pkg_config.10.xml15
-rw-r--r--pkg_config.7.xml2
-rw-r--r--pkg_config.8.xml15
-rw-r--r--pkg_config.8.xml.amd6413
15 files changed, 74 insertions, 42 deletions
diff --git a/config/filemgr/filemgr.xml b/config/filemgr/filemgr.xml
index 5c44ba13..c2a7ac42 100644
--- a/config/filemgr/filemgr.xml
+++ b/config/filemgr/filemgr.xml
@@ -31,7 +31,7 @@
<requirements>none</requirements>
<faq>https://forum.pfsense.org/index.php/topic,26974.0.html</faq>
<name>File Manager</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<title>Settings</title>
<include_file>/usr/local/pkg/filemgr.inc</include_file>
<menu>
diff --git a/config/filemgr/rbfminc/file_editor_style.css b/config/filemgr/rbfminc/file_editor_style.css
index 93b34ca7..df026a5f 100644
--- a/config/filemgr/rbfminc/file_editor_style.css
+++ b/config/filemgr/rbfminc/file_editor_style.css
@@ -2,8 +2,7 @@
/* CSS Document */
body,td,th {
- font-family: Arial, Helvetica, sans-serif;
-
+ font-family: Tahoma, sans-serif;
color: #000000;
}
@@ -100,7 +99,7 @@ img {
border-left: 1px solid #666666;
margin: 0px;
padding: 0px;
- font: 11px Arial, Helvetica, sans-serif;
+ font: 11px Tahoma, sans-serif;
}
.column1 {
margin: 0px;
diff --git a/config/filemgr/rbfminc/rename.tmp b/config/filemgr/rbfminc/rename.tmp
index 285e19d1..266e38d4 100644
--- a/config/filemgr/rbfminc/rename.tmp
+++ b/config/filemgr/rbfminc/rename.tmp
@@ -6,14 +6,15 @@ if($user_login == 'ok'){
include "functions.php";
-?><html>
+?>
+<html>
<head>
<title>Rename</title>
</head>
<body>
<script type="text/javascript">
//<![CDATA[
-<?
+<?php
//print_r($_POST);
if($_POST['o'] != $_POST['n']){
if(@rename($_POST['cf'].$_POST['o'], $_POST['cf'].$_POST['n'])){
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index 00768cd7..73827721 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -308,7 +308,8 @@
$config_text .= "[{$lcdproc_config['driver']}]\n";
$config_text .= "driverpath=/usr/local/lib/lcdproc/\n";
$config_text .= "ConnectionType={$lcdproc_config['connection_type']}\n";
- $config_text .= "Device={$realport}\n";
+ if($lcdproc_config['comport'] != "none")
+ $config_text .= "Device={$realport}\n";
$config_text .= "Port=0x378\n";
$config_text .= "Speed=0\n";
$config_text .= "Keypad=yes\n";
@@ -502,7 +503,7 @@ EOD;
restart_service(LCDPROC_SERVICE_NAME);
}
}
- if((! $lcdproc_config['driver']) || ($lcdproc_config['comport'] == "none")) {
+ if((! $lcdproc_config['driver']) || (! $lcdproc_config['comport'])) {
/* no parameters user does not want lcdproc running */
/* lets stop the service and remove the rc file */
if(file_exists(LCDPROC_RCFILE)) {
diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php
index 5306c903..922ed14e 100644
--- a/config/lcdproc-dev/lcdproc_client.php
+++ b/config/lcdproc-dev/lcdproc_client.php
@@ -554,11 +554,11 @@
/* format speed in bits/sec, input: bytes/sec
Code from: graph.php ported to PHP*/
if ($speed < 125000)
- {return sprintf("%3d.1 Kbps", $speed / 125);}
+ {return sprintf("%5.1f Kbps", $speed / 125);}
if ($speed < 125000000)
- {return sprintf("%3d.1 Mbps", $speed / 125000);}
+ {return sprintf("%5.1f Mbps", $speed / 125000);}
// else
- return sprintf("%3d.1 Gbps", $speed / 125000000);
+ return sprintf("%5.1f Gbps", $speed / 125000000);
}
function add_summary_declaration(&$lcd_cmds, $name) {
diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc
index 0119457a..6dddf7cd 100644
--- a/config/mailreport/mail_reports.inc
+++ b/config/mailreport/mail_reports.inc
@@ -35,13 +35,13 @@ require_once("filter.inc");
require_once("rrd.inc");
$graph_length = array(
- "8hour" => 28800,
+ "eighthour" => 28800,
"day" => 86400,
"week" => 604800,
"month" => 2764800,
"quarter" => 8035200,
"year" => 31622400,
- "4year" => 126489600);
+ "fouryear" => 126489600);
$logfile_friendly = array(
"dhcpd" => "DHCP",
@@ -88,6 +88,7 @@ function get_dates($curperiod, $graph) {
$offset = 0;
}
switch($graph) {
+ case "eighthour":
case "8hour":
if($curhour < 24)
$starthour = 16;
@@ -142,6 +143,7 @@ function get_dates($curperiod, $graph) {
if($offset != 0)
$end = mktime(0, 0, 0, 1, 0, (($curyear + $offset) +1));
break;
+ case "fouryear":
case "4year":
$start = mktime(0, 0, 0, 1, 0, (($curyear - 3) + $offset));
if($offset != 0)
@@ -1263,4 +1265,15 @@ function get_friendly_log_name($logfile) {
return $friendly;
}
+function fixup_graph_timespan($timespan) {
+ switch ($timespan) {
+ case "8hour":
+ return "eighthour";
+ case "4year":
+ return "fouryear";
+ default:
+ return $timespan;
+ }
+}
+
?>
diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml
index 9239f82e..803e205b 100644
--- a/config/mailreport/mailreport.xml
+++ b/config/mailreport/mailreport.xml
@@ -37,7 +37,7 @@
]]>
</copyright>
<name>mailreport</name>
- <version>2.0.12</version>
+ <version>2.1</version>
<title>Status: Email Reports</title>
<additional_files_needed>
<prefix>/usr/local/bin/</prefix>
diff --git a/config/mailreport/status_mail_report_add_graph.php b/config/mailreport/status_mail_report_add_graph.php
index 3f629d56..d6f0d362 100644
--- a/config/mailreport/status_mail_report_add_graph.php
+++ b/config/mailreport/status_mail_report_add_graph.php
@@ -130,16 +130,16 @@ $custom_databases = array_merge($dbheader_custom, $databases);
$styles = array('inverse' => gettext('Inverse'),
'absolute' => gettext('Absolute'));
-$graphs = array("8hour", "day", "week", "month", "quarter", "year", "4year");
+$graphs = array("eighthour", "day", "week", "month", "quarter", "year", "fouryear");
$periods = array("absolute" => gettext("Absolute Timespans"), "current" => gettext("Current Period"), "previous" => gettext("Previous Period"));
$graph_length = array(
- "8hour" => 28800,
+ "eighthour" => 28800,
"day" => 86400,
"week" => 604800,
"month" => 2764800,
"quarter" => 8035200,
"year" => 31622400,
- "4year" => 126489600);
+ "fouryear" => 126489600);
if ($_POST) {
unset($_POST['__csrf_magic']);
@@ -219,6 +219,7 @@ include("head.inc");
<select name="timespan" class="formselect" style="z-index: -10;">
<?php
foreach (array_keys($graph_length) as $timespan) {
+ $pconfig['timespan'] = fixup_graph_timespan($pconfig['timespan']);
echo "<option value=\"$timespan\"";
if ($timespan == $pconfig['timespan']) echo " selected";
echo ">" . htmlspecialchars(ucwords($timespan)) . "</option>\n";
diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 7b249368..c515ab99 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -47,6 +47,7 @@ function nrpe2_custom_php_install_command() {
$config['installedpackages']['nrpe2']['config'][0]['server_address'] = $ip;
$config['installedpackages']['nrpe2']['config'][0]['server_port'] = 5666;
$config['installedpackages']['nrpe2']['config'][0]['allowed_hosts'] = "127.0.0.1";
+ $config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'] = "on";
}
if (!is_array($config['installedpackages']['nrpe2']['config'][0]['row'])) {
@@ -170,6 +171,12 @@ function nrpe2_custom_php_write_config() {
$server_port = $config['installedpackages']['nrpe2']['config'][0]['server_port'];
$allowed_hosts = $config['installedpackages']['nrpe2']['config'][0]['allowed_hosts'];
+ $dont_blame_nrpe = $config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'];
+ if ($config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'] == "on") {
+ $dont_blame_nrpe = 1;
+ } else {
+ $dont_blame_nrpe = 0;
+ }
$fd = fopen(NRPE_CONFIG_DIR . '/nrpe.cfg', 'w');
$nrpe_cfg = <<<EOD
@@ -179,7 +186,7 @@ server_port={$server_port}
nrpe_user=nagios
nrpe_group=nagios
allowed_hosts={$allowed_hosts}
-dont_blame_nrpe=0
+dont_blame_nrpe={$dont_blame_nrpe}
debug=0
command_timeout=60
connection_timeout=300
diff --git a/config/nrpe2/nrpe2.xml b/config/nrpe2/nrpe2.xml
index fec09d06..8d6f0b09 100644
--- a/config/nrpe2/nrpe2.xml
+++ b/config/nrpe2/nrpe2.xml
@@ -63,6 +63,13 @@
<required/>
</field>
<field>
+ <fielddescr>Allow Arguments (dont_blame_nrpe)</fielddescr>
+ <fieldname>dont_blame_nrpe</fieldname>
+ <description>Check this to enable accept NRPE arguments (Default: 0)</description>
+ <type>checkbox</type>
+ </field>
+
+ <field>
<type>listtopic</type>
<name>Commands</name>
<fieldname>temp</fieldname>
@@ -109,7 +116,7 @@
<required/>
</rowhelperfield>
<rowhelperfield>
- <fielddescr>Extra Options</fielddescr>
+ <fielddescr>Extra Options (Example: -s Z \$ARG1\$ \$ARG2\$)</fielddescr>
<fieldname>extra</fieldname>
<description>Warning! Use at your own risk, incorrect settings here may prevent NRPE from starting!</description>
<type>input</type>
diff --git a/config/sarg/sarg_about.php b/config/sarg/sarg_about.php
index 573dc5ee..fba456b2 100755
--- a/config/sarg/sarg_about.php
+++ b/config/sarg/sarg_about.php
@@ -73,7 +73,7 @@ include("head.inc");
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Sarg Site");?></td>
- <td width="78%" class="vtable"><?=gettext("<a target=_new href='http://sarg.sourceforge.net/welcome.php'>Squid Analysis Report Generator</a><br><br>");?>
+ <td width="78%" class="vtable"><?=gettext("<a target=_new href='http://sarg.sourceforge.net/'>Squid Analysis Report Generator</a><br><br>");?>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic"><?=gettext("About sarg package"); ?></td>
@@ -83,7 +83,7 @@ include("head.inc");
<td width="78%" class="vtable"><?=gettext("Package Created by <a target=_new href='https://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell"><?=gettext("Donatios ");?></td>
+ <td width="22%" valign="top" class="vncell"><?=gettext("Donations ");?></td>
<td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='https://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br>
If you want that your donation goes to this package developer, make a note on donation forwarding it to me.<br><br>");?></td>
</tr>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 88cd951d..73eef873 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -53,12 +53,12 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.5_17 pkg v 0.3.5</version>
+ <version>9.9.5P1_5 pkg v 0.3.5</version>
<status>RC</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
<configurationfile>bind.xml</configurationfile>
- <depends_on_package_pbi>bind-9.9.5_17-##ARCH##.pbi</depends_on_package_pbi>
+ <depends_on_package_pbi>bind-9.9.5P1_5-##ARCH##.pbi</depends_on_package_pbi>
<build_pbi>
<custom_name>bind</custom_name>
<port>dns/bind99</port>
@@ -99,7 +99,7 @@
<category>Diagnostics</category>
<pkginfolink>https://forum.pfsense.org/index.php/topic,26974.0.html</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/filemgr/filemgr.xml</config_file>
- <version>0.1.3</version>
+ <version>0.1.4</version>
<status>Beta</status>
<required_version>2.2</required_version>
<maintainer>tom@tomschaefer.org</maintainer>
@@ -797,8 +797,9 @@
<build_pbi>
<ports_before>security/krb5</ports_before>
<port>net/freeradius2</port>
+ <ports_after>shells/bash</ports_after>
</build_pbi>
- <build_options>freeradius_SET_FORCE=KERBEROS MYSQL PGSQL PERL PYTHON LDAP</build_options>
+ <build_options>freeradius_SET_FORCE=KERBEROS MYSQL PGSQL PERL PYTHON LDAP SSL_PORT</build_options>
</package>
<package>
<name>bandwidthd</name>
@@ -971,7 +972,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.9</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1176,7 +1177,7 @@
</build_pbi>
<build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.15_3 v2.2</version>
+ <version>2.15_4 v2.2</version>
<status>Beta</status>
<required_version>2.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
@@ -1216,7 +1217,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.12</version>
+ <version>2.1</version>
<status>Stable</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index fad0b9da..3cb69795 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -22,7 +22,7 @@
<category>Diagnostics</category>
<pkginfolink>https://forum.pfsense.org/index.php/topic,26974.0.html</pkginfolink>
<config_file>http://packages.pfsense.org/packages/config/filemgr/filemgr.xml</config_file>
- <version>0.1.3</version>
+ <version>0.1.4</version>
<status>Beta</status>
<required_version>1.2.2</required_version>
<maintainer>tom@tomschaefer.org</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 40cd348b..4e788ab9 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -53,13 +53,13 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.5_10 pkg v 0.3.5</version>
+ <version>9.9.5P1_5 pkg v 0.3.5</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
<configurationfile>bind.xml</configurationfile>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <depends_on_package_pbi>bind-9.9.5_10-i386.pbi</depends_on_package_pbi>
+ <depends_on_package_pbi>bind-9.9.5P1_5-i386.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/dns/bind99</build_port_path>
<build_pbi>
<custom_name>bind</custom_name>
@@ -100,7 +100,7 @@
<category>Diagnostics</category>
<pkginfolink>https://forum.pfsense.org/index.php/topic,26974.0.html</pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/filemgr/filemgr.xml</config_file>
- <version>0.1.3</version>
+ <version>0.1.4</version>
<status>Beta</status>
<required_version>2.0</required_version>
<maintainer>tom@tomschaefer.org</maintainer>
@@ -1079,8 +1079,9 @@
<build_pbi>
<ports_before>security/krb5</ports_before>
<port>net/freeradius2</port>
+ <ports_after>shells/bash</ports_after>
</build_pbi>
- <build_options>freeradius_SET=KERBEROS MYSQL PGSQL PERL PYTHON LDAP</build_options>
+ <build_options>freeradius_SET=KERBEROS MYSQL PGSQL PERL PYTHON LDAP SSL_PORT</build_options>
</package>
<package>
<name>bandwidthd</name>
@@ -1278,7 +1279,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.9</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1592,7 +1593,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_3 v2.2</version>
+ <version>2.12_4 v2.2</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
@@ -1635,7 +1636,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.12</version>
+ <version>2.1</version>
<status>Stable</status>
<required_version>2.0</required_version>
<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 8611401d..44df04ae 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -53,13 +53,13 @@
<descr><![CDATA[The most widely used name server software]]></descr>
<website>http://www.isc.org/downloads/BIND/</website>
<category>Services</category>
- <version>9.9.5_10 pkg v 0.3.5</version>
+ <version>9.9.5P1_5 pkg v 0.3.5</version>
<status>RC</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/bind/bind.xml</config_file>
<configurationfile>bind.xml</configurationfile>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <depends_on_package_pbi>bind-9.9.5_10-amd64.pbi</depends_on_package_pbi>
+ <depends_on_package_pbi>bind-9.9.5P1_5-amd64.pbi</depends_on_package_pbi>
<build_port_path>/usr/ports/dns/bind99</build_port_path>
<build_pbi>
<custom_name>bind</custom_name>
@@ -1066,8 +1066,9 @@
<build_pbi>
<ports_before>security/krb5</ports_before>
<port>net/freeradius2</port>
+ <ports_after>shells/bash</ports_after>
</build_pbi>
- <build_options>freeradius_SET=KERBEROS MYSQL PGSQL PERL PYTHON LDAP</build_options>
+ <build_options>freeradius_SET=KERBEROS MYSQL PGSQL PERL PYTHON LDAP SSL_PORT</build_options>
</package>
<package>
<name>bandwidthd</name>
@@ -1265,7 +1266,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.6 pkg v. 0.9.9</version>
+ <version>lcdproc-0.5.6 pkg v. 0.9.10</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
@@ -1579,7 +1580,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_3 v2.2</version>
+ <version>2.12_4 v2.2</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
@@ -1622,7 +1623,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.12</version>
+ <version>2.1</version>
<status>Stable</status>
<required_version>2.0</required_version>
<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 02:28:33 +0000