bacula-client - after testing, change binaries to 8-stable and applied final fixes to gui option. Now daemon starts

4 files changed, 13 insertions, 12 deletions

diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc
index d64dd06b..a8a89250 100644
--- a/config/bacula-client/bacula-client.inc
+++ b/config/bacula-client/bacula-client.inc
@@ -83,14 +83,14 @@ function baculaclient_custom_php_write_config(){
 				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-mon #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t Monitor = yes\n\t}\n";

 				break;

 			case "Monitor":

-				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-dir #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t}\n"; 

-				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-mon #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t Monitor = yes\n\t}\n"; 

+				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-dir #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t}\n";

+				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-mon #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t Monitor = yes\n\t}\n";

 				}

 				$LocalDirector = $bc['director'];

 			}

 		

 		// create Messages

-		$baculaclient_conf .= "Messages { \n\t Name = Standard \n\t director  = {$LocalDirector}-dir = all, !skipped, !restored\n\t \n}\n";

+		$baculaclient_conf .= "Messages { \n\t Name = Standard \n\t director  = {$LocalDirector}-dir = all, !skipped, !restored\n\t}\n";

 		// create FielDaemon

 			

 		if (is_array($config['installedpackages']['baculaclientfd']['config'])){

@@ -103,7 +103,8 @@ function baculaclient_custom_php_write_config(){
 			$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 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";

 		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 12eb48a2..018f47f9 100644
--- a/config/bacula-client/bacula-client.xml
+++ b/config/bacula-client/bacula-client.xml
@@ -71,12 +71,12 @@
 		<section>Services</section>

 		<configfile>bacula-client.xml</configfile>

 	</menu>

-	<services>

+	<service>

 		<rcfile>bacula-fd.sh</rcfile>

 		<name>Bacula-client</name>

 		<executable>bacula-fd</executable>

 		<description>bacula backup client</description>

-	</services>

+	</service>

 	<tabs>

 		<tab>

 			<text>Directors</text>

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e3b801cc..e732219d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1624,12 +1624,12 @@
 		<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</version>
+		<version>5.2.6 pkg v 0.2.1</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>
-		<depends_on_package_base_url>http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/i386/packages-8.1-release/All/</depends_on_package_base_url>
-		<depends_on_package>bacula-client-5.0.0_1.tbz</depends_on_package>
+		<depends_on_package_base_url>http://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/All/</depends_on_package_base_url>
+		<depends_on_package>bacula-client-5.2.6.tbz</depends_on_package>
 		<build_port_path>/usr/ports/sysutils/bacula-client</build_port_path>
 		<build_pbi>
 			<port>sysutils/bacula-client</port>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 9a5014fd..00592adf 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1600,12 +1600,12 @@
 		<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.1</version>
+		<version>5.2.6 pkg v 0.2.1</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>
-		<depends_on_package_base_url>http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/ports/amd64/packages-8.1-release/All/</depends_on_package_base_url>
-		<depends_on_package>bacula-client-5.0.0_1.tbz</depends_on_package>
+		<depends_on_package_base_url>http://ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-8-stable/All/</depends_on_package_base_url>
+		<depends_on_package>bacula-client-5.2.6.tbz</depends_on_package>
 		<build_port_path>/usr/ports/sysutils/bacula-client</build_port_path>
 		<build_pbi>
 			<port>sysutils/bacula-client</port>