bacula-client - include pfsense version check

4 files changed, 128 insertions, 115 deletions

diff --git a/config/bacula-client/bacula-client.inc b/config/bacula-client/bacula-client.inc
index 156b3763..94411809 100644
--- a/config/bacula-client/bacula-client.inc
+++ b/config/bacula-client/bacula-client.inc
@@ -1,113 +1,120 @@
-<?php

-

-/* ========================================================================== */

-/*

-    bacula-client.inc

-    part of pfSense (http://www.pfSense.com)

-    Copyright (C) 2012 Marcio Carlos Braga Antao

-    Copyright (C) 2012 Marcello Coutinho

-    All rights reserved.

-

-    Based on m0n0wall (http://m0n0.ch/wall)

-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.

-    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.

-                                                                              */

-/* ========================================================================== */

- require_once("config.inc");

- require_once("util.inc");

- 

-function baculaclient_custom_php_install_command(){

-	global $g, $config;

-	baculaclient_custom_php_write_config();	

-}

-

-function baculaclient_custom_php_deinstall_command(){

-	global $g, $config;

-

-	conf_mount_rw();

-

-	// 1. Delete our config file

-	unlink_if_exists("/usr/local/etc/bacula-fd.conf");

-

-	// 2. Re-run sshd config generation script

-	exec("/usr/local/etc/rc.d/bacula-fd.sh stop");

-	conf_mount_ro();

-}

-

-function baculaclient_custom_php_write_config(){

-	global $g, $config;

-	conf_mount_rw();

-	//check config_file

-	$startup_file="/usr/local/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);

-		file_put_contents("{$startup_file}.sh",$startup_script,LOCK_EX);

-		// Ensure bacula-fd has a+rx

-		exec("chmod a+rx {$startup_file}.sh");

-		}

-

-	//check config

-	if (is_array($config['installedpackages']['baculaclient']['config'])){

-		$baculaclient_conf="";

-		foreach ($config['installedpackages']['baculaclient']['config'] as $bc) {

-			// create Director

-			switch ($bc['type']){

-			case "Director":

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

-				Break;

-			case "Monitor":

-				$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 "Local":

-				$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";

-		// create FielDaemon

-			

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

-			$port = $config['installedpackages']['baculaclientfd']['config'][0]['port'];

-			$jobs = $config['installedpackages']['baculaclientfd']['config'][0]['jobs'];

-			}

-		else{

-			$port="9102";

-			$jobs="20";	

-			}

-		$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("/usr/local/etc/bacula-fd.conf",$baculaclient_conf,LOCK_EX);

-		exec("/usr/local/etc/rc.d/bacula-fd.sh restart");

-		// Mount Read-only

-		conf_mount_ro();

-		}

-	}

-

+<?php
+
+/* ========================================================================== */
+/*
+    bacula-client.inc
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2012 Marcio Carlos Braga Antao
+    Copyright (C) 2012-2013 Marcello Coutinho
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    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.
+                                                                              */
+/* ========================================================================== */
+ require_once("config.inc");
+ require_once("util.inc");
+ 
+ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version > 2.0)
+	define('BACULA_LOCALBASE', '/usr/pbi/bacula-' . php_uname("m"));
+else
+  define('BACULA_LOCALBASE','/usr/local');
+  
+function baculaclient_custom_php_install_command(){
+	global $g, $config;
+	baculaclient_custom_php_write_config();	
+}
+
+function baculaclient_custom_php_deinstall_command(){
+	global $g, $config;
+
+	conf_mount_rw();
+
+	// 1. Delete our config file
+	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");
+	conf_mount_ro();
+}
+
+function baculaclient_custom_php_write_config(){
+	global $g, $config;
+	conf_mount_rw();
+	//check config_file
+	$startup_file="/usr/local/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);
+		file_put_contents("{$startup_file}.sh",$startup_script,LOCK_EX);
+		// Ensure bacula-fd has a+rx
+		exec("chmod a+rx {$startup_file}.sh");
+		}
+
+	//check config
+	if (is_array($config['installedpackages']['baculaclient']['config'])){
+		$baculaclient_conf="";
+		foreach ($config['installedpackages']['baculaclient']['config'] as $bc) {
+			// create Director
+			switch ($bc['type']){
+			case "Director":
+				$baculaclient_conf .= "Director { \n\t Name = {$bc['director']}-dir #{$bc['description']}\n\t Password = \"{$bc['password']}\"\n\t}\n"; 
+				Break;
+			case "Monitor":
+				$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 "Local":
+				$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";
+		// create FielDaemon
+			
+		if (is_array($config['installedpackages']['baculaclientfd']['config'])){
+			$port = $config['installedpackages']['baculaclientfd']['config'][0]['port'];
+			$jobs = $config['installedpackages']['baculaclientfd']['config'][0]['jobs'];
+			}
+		else{
+			$port="9102";
+			$jobs="20";	
+			}
+		$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");
+		// Mount Read-only
+		conf_mount_ro();
+		}
+	}
+
 	?>
\ No newline at end of file
diff --git a/config/bacula-client/bacula-client_view_config.php b/config/bacula-client/bacula-client_view_config.php
index 7fa64cf4..021e1c15 100644
--- a/config/bacula-client/bacula-client_view_config.php
+++ b/config/bacula-client/bacula-client_view_config.php
@@ -34,6 +34,12 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 if(strstr($pfSversion, "1.2"))
 	$one_two = true;
 
+ $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+if ($pf_version > 2.0)
+	define('BACULA_LOCALBASE', '/usr/pbi/bacula-' . php_uname("m"));
+else
+  define('BACULA_LOCALBASE','/usr/local');
+	
 $pgtitle = "Bacula-Client: View Configuration";
 include("head.inc");
 
@@ -68,7 +74,7 @@ include("head.inc");
      						<td class="tabcont" >
 									<textarea id="varnishlogs" rows="50" cols="87%">
 <?php 
-	$config_file = file_get_contents("/usr/local/etc/bacula-fd.conf");
+	$config_file = file_get_contents(BACULA_LOCALBASE."/etc/bacula-fd.conf");
 	echo $config_file;
 ?>
 									</textarea>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 419f183e..9afa0ed1 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1719,7 +1719,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 1.0</version>
+		<version>5.2.6 pkg v 1.0.1</version>
 		<status>Stable</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 8cf9f54a..f821a4d5 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1706,7 +1706,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 1.0</version>
+		<version>5.2.6 pkg v 1.0.1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/bacula-client/bacula-client.xml</config_file>