From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 1 Dec 2016 10:18:48 +0000 (+0000)
Subject: Use proper bacula port in bacula-idle-restart
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e3aaf9e253e242ed83a566464c85edf4d609f153;p=mirror%2Fdsa-puppet.git

Use proper bacula port in bacula-idle-restart
---

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index ffeb4236e..c536a948b 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -36,7 +36,7 @@ class bacula {
 
 	file { '/usr/local/sbin/bacula-idle-restart':
 		mode    => '0555',
-		source  => 'puppet:///modules/bacula/bacula-idle-restart',
+		content  => template('bacula/bacula-idle-restart.erb'),
 	}
 
 }
diff --git a/modules/bacula/templates/bacula-idle-restart.erb b/modules/bacula/templates/bacula-idle-restart.erb
index 2f331aaae..a19101da9 100644
--- a/modules/bacula/templates/bacula-idle-restart.erb
+++ b/modules/bacula/templates/bacula-idle-restart.erb
@@ -10,10 +10,10 @@
 set -e
 
 if [ "$1" = "fd" ];then
-    PORT=9102
+    PORT=<%= bacula_client_port %>
     DIR="bacula-fd"
 elif [ "$1" = "sd" ]; then
-    PORT=9103
+    PORT=<%= bacula_storage_port %>
     DIR="bacula-sd"
 else
     # Usage