From 60436f9c10975cf18fb7303bdceb254f314a3e17 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Fri, 29 Jun 2012 17:04:09 -0300
Subject: bacula-client - after testing, change binaries to 8-stable and
 applied final fixes to gui option. Now daemon starts

---
 config/bacula-client/bacula-client.inc | 9 +++++----
 config/bacula-client/bacula-client.xml | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'config/bacula-client')

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>
-- 
cgit v1.2.3