diff options
| author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-07-02 10:28:18 -0300 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-07-02 10:28:18 -0300 |
| commit | b6a19e94b93047f9822d61aaf2d478c09aecbae3 (patch) | |
| tree | 41c9cda38a5fc106e6207c5883197008b603ac73 | |
| parent | 8500dab01f26f87b8cf6d989527bd31dd0ffbf36 (diff) | |
| download | pfsense-packages-b6a19e94b93047f9822d61aaf2d478c09aecbae3.tar.gz pfsense-packages-b6a19e94b93047f9822d61aaf2d478c09aecbae3.tar.bz2 pfsense-packages-b6a19e94b93047f9822d61aaf2d478c09aecbae3.zip | |
bacula-client - merge latest djgel fixes to bacula-client as his pull request could not be merged.
| -rw-r--r-- | config/bacula-client/bacula-client.inc | 5 | ||||
| -rw-r--r-- | config/bacula-client/bacula-client.xml | 4 | ||||
| -rw-r--r-- | config/bacula-client/bacula-client_fd.xml | 8 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 5 insertions, 16 deletions
diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc index a8a89250..6b54229c 100644 --- a/config/bacula-client/bacula-client.inc +++ b/config/bacula-client/bacula-client.inc @@ -96,15 +96,12 @@ function baculaclient_custom_php_write_config(){ if (is_array($config['installedpackages']['baculaclientfd']['config'])){
$port = $config['installedpackages']['baculaclientfd']['config'][0]['port'];
$jobs = $config['installedpackages']['baculaclientfd']['config'][0]['jobs'];
- $filedaemon = $config['installedpackages']['baculaclientfd']['config'][0]['name'];
}
else{
- $filedaemon="default";
$port="9102";
$jobs="20";
}
- //$baculaclient_conf .= "FileDaemon { \n\t Name = {$filedaemon}-fd #\n\t FDport = {$port}\n\t WorkingDirectory = /var/db/bacula\n\t Pid Directory = /var/run\n\t Maximun Concurrent Jobs = {$jobs}\n \n}\n";
- $baculaclient_conf .= "FileDaemon { \n\t Name = {$filedaemon}-fd #\n\t FDport = {$port}\n\t WorkingDirectory = /var/db/bacula\n\t Pid Directory = /var/run\n\t}\n";
+ $baculaclient_conf .= "FileDaemon { \n\t Name = {$filedaemon}-fd #\n\t FDport = {$port}\n\t WorkingDirectory = /var/db/bacula\n\t Pid Directory = /var/run\n\tMaximum Concurrent Jobs = {$jobs}\n\t}\n";
file_put_contents("/usr/local/etc/bacula-fd.conf",$baculaclient_conf,LOCK_EX);
exec("/usr/local/etc/rc.d/bacula-fd.sh restart");
// Mount Read-only
diff --git a/config/bacula-client/bacula-client.xml b/config/bacula-client/bacula-client.xml index 018f47f9..054d7f08 100644 --- a/config/bacula-client/bacula-client.xml +++ b/config/bacula-client/bacula-client.xml @@ -135,7 +135,7 @@ <description><![CDATA[Enter password for Diector use to Access.]]></description>
</field>
<field>
- <fielddescr>Director tyoe</fielddescr>
+ <fielddescr>Director type</fielddescr>
<fieldname>type</fieldname>
<type>select</type>
<options>
@@ -143,7 +143,7 @@ <option><name>Local</name><value>Local</value></option>
<option><name>Monitor</name><value>Monitor</value></option>
</options>
- <description>This is a Local Director?</description>
+ <description>Director Type. You need at least one local director.</description>
</field>
</fields>
<custom_php_install_command>
diff --git a/config/bacula-client/bacula-client_fd.xml b/config/bacula-client/bacula-client_fd.xml index be9d3fd8..228ad66f 100644 --- a/config/bacula-client/bacula-client_fd.xml +++ b/config/bacula-client/bacula-client_fd.xml @@ -72,14 +72,6 @@ <name>daemon</name>
</field>
<field>
- <fielddescr>Daemon name</fielddescr>
- <fieldname>name</fieldname>
- <type>input</type>
- <size>25</size>
- <description>Name for File Daemon. Default : default </description>
- <required/>
- </field>
- <field>
<fielddescr>File Daemon Port</fielddescr>
<fieldname>port</fieldname>
<type>input</type>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 34f7a1f7..1c90def1 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1624,7 +1624,7 @@ <descr><![CDATA[Bacula is a set of Open Source, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds.]]></descr> <website>http://www.bacula.org/</website> <category>Services</category> - <version>5.2.6 pkg v 0.2.1</version> + <version>5.2.6 pkg v 0.2.2</version> <status>Beta</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/bacula-client/bacula-client.xml</config_file> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 032197b2..b6f0a95f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1600,7 +1600,7 @@ <descr><![CDATA[Bacula is a set of Open Source, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds.]]></descr> <website>http://www.bacula.org/</website> <category>Services</category> - <version>5.2.6 pkg v 0.2.1</version> + <version>5.2.6 pkg v 0.2.2</version> <status>Beta</status> <required_version>2.0</required_version> <config_file>http://www.pfsense.com/packages/config/bacula-client/bacula-client.xml</config_file> |