From 520941e130cf37017af44cc6055fe23d5a817de9 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 27 Mar 2012 16:12:13 -0400 Subject: Generalize more references. --- config/zebedee/zebedee.inc | 4 +- config/zebedee/zebedee.xml | 2 +- config/zebedee/zebedee_sync.xml | 232 ++++++++++++++++++++-------------------- 3 files changed, 119 insertions(+), 119 deletions(-) diff --git a/config/zebedee/zebedee.inc b/config/zebedee/zebedee.inc index d66a269b..90a538e7 100755 --- a/config/zebedee/zebedee.inc +++ b/config/zebedee/zebedee.inc @@ -311,7 +311,7 @@ function zebedee_do_xmlrpc_sync($sync_to_ip, $password) { $cli->setCredentials('admin', $password); $resp = $cli->send($msg, "250"); if(!$resp) { - $error = "A communications error occurred while attempting zebedee XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while attempting zebedee XMLRPC sync with {$url}:{$port} (exec_php)."; log_error($error); file_notice("sync_settings", $error, "zebedee Settings Sync", ""); } elseif($resp->faultCode()) { @@ -321,7 +321,7 @@ function zebedee_do_xmlrpc_sync($sync_to_ip, $password) { log_error($error); file_notice("sync_settings", $error, "zebedee Settings Sync", ""); } else { - log_error("zebedee XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php)."); + log_error("zebedee XMLRPC reload data success with {$url}:{$port} (exec_php)."); } } diff --git a/config/zebedee/zebedee.xml b/config/zebedee/zebedee.xml index 9e3061a0..b56fa1a6 100644 --- a/config/zebedee/zebedee.xml +++ b/config/zebedee/zebedee.xml @@ -163,7 +163,7 @@ input 60 - This specifies the external name are put in client.zbd file in field serverhost. Ex: 200.111.111.22 or zebedee.pfsense.org + This specifies the external name are put in client.zbd file in field serverhost. Ex: 200.111.111.22 or zebedee.example.com diff --git a/config/zebedee/zebedee_sync.xml b/config/zebedee/zebedee_sync.xml index e2649fc8..2a4a4e14 100644 --- a/config/zebedee/zebedee_sync.xml +++ b/config/zebedee/zebedee_sync.xml @@ -1,117 +1,117 @@ - - - - - - - Copyright (C) 2011 Marcello Coutinho - Copyright (C) 2011 Jorge Lustosa - 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. - */ -/* ========================================================================== */ - ]]> - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. - zebedeesync - 1.1 - Zebedee: Manual Sync - /usr/local/pkg/zebedee.inc - - - Settings - /pkg_edit.php?xml=zebedee.xml&id=0 - - - Tunnels - /pkg_edit.php?xml=zebedee_tunnels.xml&id=0 - - - Keys - /zebedee_keys.php - - - XMLRPC Sync - /pkg_edit.php?xml=zebedee_sync.xml&id=0 - - - - View config files - /zebedee_view_config.php - - - View log files - /zebedee_log.php - - - installedpackages->package->zebedee - - - listtopic - temp - Enable Zebedee configuration sync - - - Automatically sync Zebedee configuration changes - synconchanges - pfSense will automatically sync changes to the hosts defined below. - checkbox - - - Remote Server - none - rowhelper - - - IP Address - ipaddress - IP Address of remote server - input - 20 - - - Password - password - Password for remote server. - password - 20 - - - - - - zebedee_sync_on_changes(); - - - unset($_POST['temp']); - + + + + + + + Copyright (C) 2011 Marcello Coutinho + Copyright (C) 2011 Jorge Lustosa + 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. + */ +/* ========================================================================== */ + ]]> + + Describe your package here + Describe your package requirements here + Currently there are no FAQ items provided. + zebedeesync + 1.1 + Zebedee: Manual Sync + /usr/local/pkg/zebedee.inc + + + Settings + /pkg_edit.php?xml=zebedee.xml&id=0 + + + Tunnels + /pkg_edit.php?xml=zebedee_tunnels.xml&id=0 + + + Keys + /zebedee_keys.php + + + XMLRPC Sync + /pkg_edit.php?xml=zebedee_sync.xml&id=0 + + + + View config files + /zebedee_view_config.php + + + View log files + /zebedee_log.php + + + installedpackages->package->zebedee + + + listtopic + temp + Enable Zebedee configuration sync + + + Automatically sync Zebedee configuration changes + synconchanges + Automatically sync changes to the hosts defined below. + checkbox + + + Remote Server + none + rowhelper + + + IP Address + ipaddress + IP Address of remote server + input + 20 + + + Password + password + Password for remote server. + password + 20 + + + + + + zebedee_sync_on_changes(); + + + unset($_POST['temp']); + \ No newline at end of file -- cgit v1.2.3