summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2012-05-30 12:47:24 -0400
committerjim-p <jimp@pfsense.org>2012-05-30 12:47:24 -0400
commitbb39c28350d4a41158775672e4ef432990674c9f (patch)
tree611a85e620870df5b8c737f043b0f5858e17ee04 /usr/local
parent829fd8c1b81e088510bb0831f3c527732b601713 (diff)
downloadpfsense-bb39c28350d4a41158775672e4ef432990674c9f.zip
pfsense-bb39c28350d4a41158775672e4ef432990674c9f.tar.gz
Switch to ntpd from ports, add Services > NTP to select interfaces for binding. Respect old ntp settings in the process.
Conflicts: etc/inc/system.inc usr/local/www/fbegin.inc
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/sbin/ntpdate_sync_once.sh2
-rwxr-xr-xusr/local/www/fbegin.inc1
-rw-r--r--usr/local/www/services_ntpd.php132
-rw-r--r--usr/local/www/status_ntpd.php8
4 files changed, 138 insertions, 5 deletions
diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh
index f4a5256..cd5815d 100755
--- a/usr/local/sbin/ntpdate_sync_once.sh
+++ b/usr/local/sbin/ntpdate_sync_once.sh
@@ -26,5 +26,5 @@ if [ "$NOTSYNCED" = "true" ]; then
fi
if [ -f /var/etc/ntpd.conf ]; then
- /usr/sbin/ntpd -g -c /var/etc/ntpd.conf
+ /usr/local/bin/ntpd -g -c /var/etc/ntpd.conf
fi \ No newline at end of file
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index d6f9b9d..bd9abf7 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -125,6 +125,7 @@ if($g['services_dhcp_server_enable'])
$services_menu[] = array("Dynamic DNS", "/services_dyndns.php");
$services_menu[] = array("IGMP proxy", "/services_igmpproxy.php");
$services_menu[] = array("Load Balancer", "/load_balancer_pool.php");
+$services_menu[] = array(gettext("NTP"), "/services_ntpd.php");
$services_menu[] = array("OLSR", "/pkg_edit.php?xml=olsrd.xml&id=0");
$services_menu[] = array("PPPoE Server", "/vpn_pppoe.php");
$services_menu[] = array("RIP", "/pkg_edit.php?xml=routed.xml&id=0");
diff --git a/usr/local/www/services_ntpd.php b/usr/local/www/services_ntpd.php
new file mode 100644
index 0000000..86d4fb4
--- /dev/null
+++ b/usr/local/www/services_ntpd.php
@@ -0,0 +1,132 @@
+<?php
+/*
+ services_ntpd.php
+
+ Copyright (C) 2012 Jim Pingle
+ 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.
+*/
+/*
+ pfSense_MODULE: ntpd
+*/
+
+##|+PRIV
+##|*IDENT=page-services-ntpd
+##|*NAME=Services: NTP
+##|*DESCR=Allow access to the 'Services: NTP' page.
+##|*MATCH=services_ntpd.php*
+##|-PRIV
+
+require("guiconfig.inc");
+
+if (empty($config['ntpd']['interface']))
+ if (empty($config['openntpd']['config']['interface'])) {
+ $pconfig['interface'] = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']);
+ unset($config['installedpackages']['openntpd']);
+ } else
+ $pconfig['interface'] = array();
+else
+ $pconfig['interface'] = explode(",", $config['ntpd']['interface']);
+
+if ($_POST) {
+
+ unset($input_errors);
+ $pconfig = $_POST;
+
+ /* input validation */
+ $reqdfields = explode(" ", "interface");
+ $reqdfieldsn = array(gettext("Interface"));
+
+ do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+ if (!$input_errors) {
+ $config['ntpd']['interface'] = implode(",", $_POST['interface']);
+
+ write_config("Updated NTP Server Settings");
+
+ $retval = 0;
+ $retval = system_ntp_configure();
+ $savemsg = get_std_save_message($retval);
+
+ }
+}
+
+$pgtitle = array(gettext("Services"),gettext("NTP"));
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<form action="services_ntpd.php" method="post" name="iform" id="iform">
+<?php if ($input_errors) print_input_errors($input_errors); ?>
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td><div id="mainarea">
+<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
+<tr>
+ <td colspan="2" valign="top" class="listtopic"><?=gettext("NTP Server Configuration"); ?></td>
+</tr>
+<tr>
+ <td width="22%" valign="top" class="vncellreq">Interface(s)</td>
+ <td width="78%" class="vtable">
+<?php
+ $interfaces = get_configured_interface_with_descr();
+ $carplist = get_configured_carp_interface_list();
+ foreach ($carplist as $cif => $carpip)
+ $interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")";
+ $aliaslist = get_configured_ip_aliases_list();
+ foreach ($aliaslist as $aliasip => $aliasif)
+ $interfaces[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
+ $size = (count($interfaces) < 10) ? count($interfaces) : 10;
+?>
+ <select id="interface" name="interface[]" multiple="true" class="formselect" size="<?php echo $size; ?>">
+<?php
+ foreach ($interfaces as $iface => $ifacename) {
+ if (!is_ipaddr(get_interface_ip($iface)) && !is_ipaddr($iface))
+ continue;
+ echo "<option value='{$iface}'";
+ if (in_array($iface, $pconfig['interface']))
+ echo "selected";
+ echo ">{$ifacename}</option>\n";
+ } ?>
+ </select>
+ <br/>Interfaces without an IP address will not be shown.
+ <br/>
+ <br/>Selecting no interfaces will listen on all interfaces with a wildcard.
+ <br/>Selecting all interfaces will explicitly listen on only the interfaces/IPs specified.
+ </td>
+</tr>
+<tr>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" onclick="enable_change(true)">
+ </td>
+</tr>
+</table>
+</div></td></tr></table>
+</form>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/usr/local/www/status_ntpd.php b/usr/local/www/status_ntpd.php
index d3904f4..43cbdd8 100644
--- a/usr/local/www/status_ntpd.php
+++ b/usr/local/www/status_ntpd.php
@@ -29,8 +29,8 @@
POSSIBILITY OF SUCH DAMAGE.
*/
/*
- pfSense_BUILDER_BINARIES: /usr/sbin/ntpd /usr/bin/ntpq
- pfSense_MODULE: routing
+ pfSense_BUILDER_BINARIES: /usr/local/bin/ntpd /usr/local/bin/ntpq
+ pfSense_MODULE: ntpd
*/
##|+PRIV
@@ -42,7 +42,7 @@
require_once("guiconfig.inc");
-exec("/usr/bin/ntpq -pn | /usr/bin/tail +3", $ntpq_output);
+exec("/usr/local/bin/ntpq -pn | /usr/bin/tail +3", $ntpq_output);
$ntpq_servers = array();
foreach ($ntpq_output as $line) {
$server = array();
@@ -99,7 +99,7 @@ include("head.inc");
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td><div id="mainarea">
<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td>Status of the system's Network Time Protocol servers and clock.</td></tr>
+ <tr><td class="listtopic">Network Time Protocol Status</td></tr>
</table>
<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
<thead>
OpenPOWER on IntegriCloud