From 22c884d104498547356e6144b6a0c22300085b22 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 2 Jan 2015 12:44:50 -0200
Subject: Fix bacula-fd.conf path, it fixes #3729

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

diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc
index 94411809..233de4b6 100644
--- a/config/bacula-client/bacula-client.inc
+++ b/config/bacula-client/bacula-client.inc
@@ -59,7 +59,7 @@ function baculaclient_custom_php_deinstall_command(){
 	unlink_if_exists(BACULA_LOCALBASE."/etc/bacula-fd.conf");
 
 	// 2. Re-run sshd config generation script
-	exec("/usr/local/etc/rc.d/bacula-fd.sh stop");
+	exec(BACULA_LOCALBASE . "/etc/rc.d/bacula-fd.sh stop");
 	conf_mount_ro();
 }
 
@@ -67,11 +67,12 @@ function baculaclient_custom_php_write_config(){
 	global $g, $config;
 	conf_mount_rw();
 	//check config_file
-	$startup_file="/usr/local/etc/rc.d/bacula-fd";
+	$startup_file=BACULA_LOCALBASE . "/etc/rc.d/bacula-fd";
 	if (file_exists($startup_file)){
 		$startup_script=file_get_contents($startup_file);
 		$startup_script=preg_replace("/NO/","YES",$startup_script);
 		$startup_script=preg_replace("@/usr/local/etc/bacula-fd.conf@",BACULA_LOCALBASE."/etc/bacula-fd.conf",$startup_script);
+		$startup_script=preg_replace("@" . BACULA_LOCALBASE . "/etc/bacula/bacula-fd.conf@",BACULA_LOCALBASE."/etc/bacula-fd.conf",$startup_script);
 		file_put_contents("{$startup_file}.sh",$startup_script,LOCK_EX);
 		// Ensure bacula-fd has a+rx
 		exec("chmod a+rx {$startup_file}.sh");
@@ -111,10 +112,10 @@ function baculaclient_custom_php_write_config(){
 			}
 		$baculaclient_conf .= "FileDaemon { \n\t Name = {$LocalDirector}-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(BACULA_LOCALBASE."/etc/bacula-fd.conf",$baculaclient_conf,LOCK_EX);
-		exec("/usr/local/etc/rc.d/bacula-fd.sh restart");
+		exec(BACULA_LOCALBASE . "/etc/rc.d/bacula-fd.sh restart");
 		// Mount Read-only
 		conf_mount_ro();
 		}
 	}
 
-	?>
\ No newline at end of file
+	?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 72bc03c5..c66f7909 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1232,7 +1232,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>7.0.5 pkg v 1.0.3</version>
+		<version>7.0.5 pkg v 1.0.4</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 6c858027..da853b8f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1636,7 +1636,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.12_3 pkg v 1.0.3</version>
+		<version>5.2.12_3 pkg v 1.0.4</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d3705b7c..251d7214 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1623,7 +1623,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.12_3 pkg v 1.0.3</version>
+		<version>5.2.12_3 pkg v 1.0.4</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/bacula-client/bacula-client.xml</config_file>
-- 
cgit v1.2.3