aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/cron/cron.php3
-rw-r--r--config/cron/cron.xml2
-rw-r--r--config/cron/cron_edit.php66
-rw-r--r--config/pfblockerng/pfblockerng.inc4
-rw-r--r--config/sarg/sarg.inc4
-rw-r--r--config/tftp2/tftp.inc3
-rw-r--r--config/tftp2/tftp.xml6
-rw-r--r--config/tftp2/tftp_files.php3
-rw-r--r--pkg_config.10.xml7
-rw-r--r--pkg_config.8.xml6
-rw-r--r--pkg_config.8.xml.amd646
11 files changed, 70 insertions, 40 deletions
diff --git a/config/cron/cron.php b/config/cron/cron.php
index 7d55b086..ec15a4cb 100644
--- a/config/cron/cron.php
+++ b/config/cron/cron.php
@@ -76,7 +76,8 @@ include("head.inc");
<tr><td>
<div>
Cron controls the scheduling of commands.<br /><br />
- For more information see: <a href='http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html'>http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html</a>
+ For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+ and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
</div>
</td></tr>
</table>
diff --git a/config/cron/cron.xml b/config/cron/cron.xml
index 181a4506..5e596b6b 100644
--- a/config/cron/cron.xml
+++ b/config/cron/cron.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>cronsettings</name>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<title>Cron Settings</title>
<include_file>/usr/local/pkg/cron.inc</include_file>
<menu>
diff --git a/config/cron/cron_edit.php b/config/cron/cron_edit.php
index b89c28e0..58389284 100644
--- a/config/cron/cron_edit.php
+++ b/config/cron/cron_edit.php
@@ -128,45 +128,57 @@ function show_advanced_config() {
<form action="cron_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="form">
<tr>
- <td width="25%" valign="top" class="vncellreq">minute</td>
- <td width="75%" class="vtable">
- <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Minute</td>
+ <td width="90%" class="vtable">
+ <input name="minute" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['minute']);?>" /><br/>
+ The minute(s) at which the command will be executed.<br/>
+ (0-59, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">hour</td>
- <td width="75%" class="vtable">
- <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Hour</td>
+ <td width="90%" class="vtable">
+ <input name="hour" type="text" class="formfld" id="hour" size="40" value="<?=htmlspecialchars($pconfig['hour']);?>" /><br/>
+ The day(s) of the month on which the command will be executed.<br/>
+ (1-31, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">mday</td>
- <td width="75%" class="vtable">
- <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Day of the Month</td>
+ <td width="90%" class="vtable">
+ <input name="mday" type="text" class="formfld" id="mday" size="40" value="<?=htmlspecialchars($pconfig['mday']);?>" /><br/>
+ The day(s) of the month on which the command will be executed.<br/>
+ (1-31, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">month</td>
- <td width="75%" class="vtable">
- <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Month of the Year</td>
+ <td width="90%" class="vtable">
+ <input name="month" type="text" class="formfld" id="month" size="40" value="<?=htmlspecialchars($pconfig['month']);?>" /><br/>
+ The month(s) of the year during which the command will be executed.<br/>
+ (1-12, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">wday</td>
- <td width="75%" class="vtable">
- <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" />
+ <td width="10%" valign="top" class="vncellreq">Day of the Week</td>
+ <td width="90%" class="vtable">
+ <input name="wday" type="text" class="formfld" id="wday" size="40" value="<?=htmlspecialchars($pconfig['wday']);?>" /><br/>
+ The day(s) of the week on which the command will be executed.<br/>
+ (0-7, 7=Sun or use names, ranges, or divided, *=all)
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">who</td>
- <td width="75%" class="vtable">
- <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" />
+ <td width="10%" valign="top" class="vncellreq">User</td>
+ <td width="90%" class="vtable">
+ <input name="who" type="text" class="formfld" id="who" size="40" value="<?=htmlspecialchars($pconfig['who']);?>" /><br/>
+ The user executing the command (typically "root")
</td>
</tr>
<tr>
- <td width="25%" valign="top" class="vncellreq">command</td>
- <td width="75%" class="vtable">
- <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea>
+ <td width="10%" valign="top" class="vncellreq">Command</td>
+ <td width="90%" class="vtable">
+ <textarea rows="3" cols="68" name="command" id="command"><?=htmlspecialchars($pconfig['command']);?></textarea><br/>
+ The <strong>full path</strong> to the command, plus parameters.
</td>
</tr>
<tr>
@@ -178,6 +190,18 @@ function show_advanced_config() {
<?php endif; ?>
</td>
</tr>
+ <tr class="listtopic">
+ <td colspan="2">Help</td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ 'Using "*" for a time entry means "all" or "every", and is the same as a range from first to last.
+ <br/>Ranges may also be used, for example "1-5" in the "Day of Week" field means Monday through Friday.
+ <br/>Time entries may be divided and will be executed when they divide evenly, for example "*/15" in the Minute field means "Every 15 minutes".
+ <br/><br/>For more information see: <a href="http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html">FreeBSD Handbook - Configuring cron(8)</a>
+ and <a href="https://www.freebsd.org/cgi/man.cgi?query=crontab&amp;sektion=5">crontab(5) man page</a>.
+ </td>
+ </tr>
</table>
</form>
<br />
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index af57cc90..7bfc6f0e 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -1326,7 +1326,7 @@ function pfb_download_failure($alias, $header, $pfbfolder, $vtype, $list_url) {
// Query Firewall aliastables
$result = find_reported_header($ip, "{$pfbfolder}/*", TRUE);
if (!empty($result)) {
- $log = " [ {$ip} ] Firewall IP block found in: [ {$result} ]\n";
+ $log = " [ {$ip} ] Firewall IP block found in: [ {$result[1]} | {$result[0]} ]\n";
pfb_logger("{$log}", 2);
$pfbfound = TRUE;
}
@@ -4780,4 +4780,4 @@ function pfblockerng_do_xmlrpc_sync($sync_to_ip, $port, $protocol, $username, $p
}
return $success;
}
-?>
+?> \ No newline at end of file
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc
index 22e70c95..253dab9d 100644
--- a/config/sarg/sarg.inc
+++ b/config/sarg/sarg.inc
@@ -94,7 +94,9 @@ function sarg_check_dirs() {
if (is_dir($pbidir) && !is_link($pbidir)) {
rmdir_recursive($pbidir);
}
- symlink("/usr/local/sarg-reports", "{$pbidir}");
+ if (!is_link($pbidir)) {
+ symlink("/usr/local/sarg-reports", "{$pbidir}");
+ }
}
// images
diff --git a/config/tftp2/tftp.inc b/config/tftp2/tftp.inc
index 75ddaac8..baf753c9 100644
--- a/config/tftp2/tftp.inc
+++ b/config/tftp2/tftp.inc
@@ -28,6 +28,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+require_once("filter.inc");
+require_once("util.inc");
+
function tftp_byte_convert($bytes) {
if ($bytes <= 0) {
return '0 Byte';
diff --git a/config/tftp2/tftp.xml b/config/tftp2/tftp.xml
index f45a344a..350999dd 100644
--- a/config/tftp2/tftp.xml
+++ b/config/tftp2/tftp.xml
@@ -42,13 +42,12 @@
/* ====================================================================================== */
]]>
</copyright>
- <name>tftp Settings</name>
- <version>2.2.3</version>
+ <name>tftpsettings</name>
+ <version>2.2.4</version>
<title>TFTP: Settings</title>
<include_file>/usr/local/pkg/tftp.inc</include_file>
<menu>
<name>TFTP</name>
- <tooltiptext>Add or Remove files for TFTP.</tooltiptext>
<section>Services</section>
<configfile>tftp.xml</configfile>
<url>/tftp_files.php</url>
@@ -58,7 +57,6 @@
<executable>inetd</executable>
<description>TFTP Daemon</description>
</service>
- <configpath>installedpackages->$packagename</configpath>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<item>https://packages.pfsense.org/packages/config/tftp2/tftp.inc</item>
diff --git a/config/tftp2/tftp_files.php b/config/tftp2/tftp_files.php
index e2e81ed4..4cb34024 100644
--- a/config/tftp2/tftp_files.php
+++ b/config/tftp2/tftp_files.php
@@ -28,6 +28,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
+require_once("config.inc");
require_once("guiconfig.inc");
require_once("util.inc");
require_once("/usr/local/pkg/tftp.inc");
@@ -117,13 +118,13 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "TFTP: Settings/Files";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle">TFTP: Settings/Files</p>
<?php
$savemsg = $_GET["savemsg"];
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 3f567932..da44946a 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -337,7 +337,7 @@
<pkginfolink/>
<port_category>ftp</port_category>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
- <version>2.2.3</version>
+ <version>2.2.4</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -371,10 +371,11 @@
<descr>The cron utility is used to manage commands on a schedule.</descr>
<category>System</category>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.2</required_version>
<configurationfile>cron.xml</configurationfile>
+ <maximum_version>2.2.999</maximum_version>
</package>
<package>
<name>vHosts</name>
@@ -634,7 +635,7 @@
<config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file>
<pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
<depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi>
- <version>0.6.9</version>
+ <version>0.6.10</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<port_category>www</port_category>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 8f4b28e7..398d172b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -383,7 +383,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>2.2.3</version>
+ <version>2.2.4</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -423,7 +423,7 @@
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>cron.xml</configurationfile>
@@ -640,7 +640,7 @@
<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
<depends_on_package_pbi>sarg-2.3.6_2-i386.pbi</depends_on_package_pbi>
- <version>2.3.6_2 pkg v0.6.9</version>
+ <version>2.3.6_2 pkg v0.6.10</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>sarg.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 851ee03e..80d9d879 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -383,7 +383,7 @@
<pkginfolink/>
<config_file>https://packages.pfsense.org/packages/config/tftp2/tftp.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>2.2.3</version>
+ <version>2.2.4</version>
<status>Stable</status>
<required_version>2.0</required_version>
<configurationfile>tftp.xml</configurationfile>
@@ -423,7 +423,7 @@
<pkginfolink></pkginfolink>
<config_file>https://packages.pfsense.org/packages/config/cron/cron.xml</config_file>
<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>RC</status>
<required_version>2.1</required_version>
<configurationfile>cron.xml</configurationfile>
@@ -640,7 +640,7 @@
<depends_on_package>sarg-2.3.6_2.tbz</depends_on_package>
<depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package>
<depends_on_package_pbi>sarg-2.3.6_2-amd64.pbi</depends_on_package_pbi>
- <version>2.3.6_2 pkg v0.6.9</version>
+ <version>2.3.6_2 pkg v0.6.10</version>
<status>Release</status>
<required_version>2.1</required_version>
<configurationfile>sarg.xml</configurationfile>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 18:40:32 +0000