From 3c29c5cfe7a8844bb7bea25fe00663208e6cbe2e Mon Sep 17 00:00:00 2001 From: Marcello Coutinho Date: Fri, 29 Jun 2012 16:01:03 -0300 Subject: bacula-client - fix more errors, almost done --- config/bacula-client/bacula-client.inc | 154 +++++++-------------- config/bacula-client/bacula-client.xml | 64 +++++++-- config/bacula-client/bacula-client_fd.xml | 83 +++++++---- config/bacula-client/bacula-client_view_config.php | 7 +- pkg_config.8.xml | 7 +- pkg_config.8.xml.amd64 | 4 +- 6 files changed, 173 insertions(+), 146 deletions(-) diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc index fd6e2d65..d64dd06b 100644 --- a/config/bacula-client/bacula-client.inc +++ b/config/bacula-client/bacula-client.inc @@ -4,7 +4,8 @@ /* bacula-client.inc part of pfSense (http://www.pfSense.com) - Copyright (C) 2012 Marcio Carlos + Copyright (C) 2012 Marcio Carlos Braga Antao + Copyright (C) 2012 Marcello Coutinho All rights reserved. Based on m0n0wall (http://m0n0.ch/wall) @@ -40,59 +41,7 @@ function baculaclient_custom_php_install_command(){ global $g, $config; - conf_mount_rw(); - unlink_if_exists("/usr/local/etc/rc.d/bacula-fd"); - $fd = fopen("/usr/local/etc/rc.d/bacula-client.sh", "w"); - if(!$fd) { - log_error("Could not open /usr/local/etc/rc.d/bacula-client.sh for writing."); - return; - } - - // Ensure bacula-fd has a+rx - exec("chmod a+rx /usr/local/etc/rc.d/bacula-client.sh"); - - $baculafd = << \ No newline at end of file diff --git a/config/bacula-client/bacula-client.xml b/config/bacula-client/bacula-client.xml index 3820944f..12eb48a2 100644 --- a/config/bacula-client/bacula-client.xml +++ b/config/bacula-client/bacula-client.xml @@ -1,13 +1,53 @@ - - Copyright (C) 2012 Marcio Carlos Braga Antao + + + . + 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. + */ +/* ========================================================================== */ + ]]> + Client Install for Bacula 5.2.6 Backup Bacula Server Installed in or network Currently there are no FAQ items provided. baculaclient 5.2.6 Bacula-Client: Setting - /pkg_edit.php?xml=bacula-client.xml&id=0 + /pkg.php?xml=bacula-client.xml /usr/local/pkg/bacula-client.inc installedpackages->package->baculaclient @@ -31,6 +71,12 @@
Services
bacula-client.xml + + bacula-fd.sh + Bacula-client + bacula-fd + bacula backup client + Directors @@ -39,8 +85,7 @@ FileDaemon - /pkg_edit.php?xml=bacula-client_fd.xml&id=0 - + /pkg_edit.php?xml=bacula-client_fd.xml View Configuration @@ -85,19 +130,18 @@ Password password - input + password 30 - Director tyoe type select - - - + + + This is a Local Director? diff --git a/config/bacula-client/bacula-client_fd.xml b/config/bacula-client/bacula-client_fd.xml index 6776838f..be9d3fd8 100644 --- a/config/bacula-client/bacula-client_fd.xml +++ b/config/bacula-client/bacula-client_fd.xml @@ -1,36 +1,55 @@ - Copyright (C) 2012 Marcio Carlos Braga Antao + + . + 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. + */ +/* ========================================================================== */ + ]]> + Client Install for Bacula 5.2.6 Backup Bacula Server Installed in or network Currently there are no FAQ items provided. - bacula-client_fd + baculaclientfd 5.2.6 Bacula-Client: FileDaemon Setting - /pkg_edit.php?xml=bacula-client_fd.xml&id=0 + /pkg_edit.php?xml=bacula-client_fd.xml /usr/local/pkg/bacula-client.inc installedpackages->package->baculaclient - - /usr/local/pkg/ - 0755 - http://www.pfsense.com/packages/config/bacula-client/bacula-client.inc - - - /usr/local/pkg/ - 0755 - http://www.pfsense.com/packages/config/bacula-client/bacula-client_fd.xml - - - /usr/local/www/ - 0755 - http://www.pfsense.com/packages/config/bacula-client/bacula-client_view_config.php - - - Bacula-client - bacula backup client -
Services
- bacula-client_fd.xml -
Directors @@ -38,7 +57,7 @@ FileDaemon - /pkg_edit.php?xml=bacula-client_fd.xml&id=0 + /pkg_edit.php?xml=bacula-client_fd.xml @@ -47,6 +66,19 @@ + + listtopic + Daemon + daemon + + + Daemon name + name + input + 25 + Name for File Daemon. Default : default + + File Daemon Port port @@ -60,6 +92,7 @@ jobs input 3 + Maximun Concurrent Jobs. Default : 20 diff --git a/config/bacula-client/bacula-client_view_config.php b/config/bacula-client/bacula-client_view_config.php index d0d16dc1..a89f1d48 100644 --- a/config/bacula-client/bacula-client_view_config.php +++ b/config/bacula-client/bacula-client_view_config.php @@ -3,7 +3,7 @@ bacula-client_view_config.php part of pfSense (http://www.pfsense.com/) Copyright (C) 2010 Scott Ullrich - Copyright (C) 2012 Márcio Carlos Antão + Copyright (C) 2012 M�rcio Carlos Ant�o All rights reserved. Redistribution and use in source and binary forms, with or without @@ -54,7 +54,8 @@ include("head.inc"); @@ -65,7 +66,7 @@ include("head.inc");
-