X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=fddbf78518a75de31c29078f274e8a482bc051ed;hb=d49be3517efb578b3bdd6d8226e4d0cc4a116eea;hp=a4b2103414ba6a8413545103c1416698b74e25e8;hpb=e6efdc867353ad0870bb01e10af314f75246c8e4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index a4b210341..fddbf7851 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -11,12 +11,12 @@ class bacula {
 	$bacula_pool_name         = 'debian'
 
 	# use IP address for ferm.
-	$bacula_director_ip       = '5.153.231.19'
+	$bacula_director_ip_addrs = '5.153.231.19 2001:41c8:1000:21::21:19'
 	$bacula_director_address  = 'dinis.debian.org'
 	$bacula_director_port     = 9101
-	$bacula_storage_address   = 'backuphost.debian.org'
+	$bacula_storage_address   = 'storace.debian.org'
 	$bacula_storage_port      = 9103
-	$bacula_client_port       = 9102
+	$bacula_client_port       = hiera('bacula_fd_port', 9102)
 	$bacula_db_address        = 'danzi.debian.org'
 	$bacula_db_port           = 5433
 
@@ -30,13 +30,16 @@ class bacula {
 
 	$bacula_ca_path           = '/etc/ssl/debian/certs/ca.crt'
 	$bacula_ssl_client_cert   = '/etc/ssl/debian/certs/thishost.crt'
-	$bacula_ssl_client_key    = '/etc/ssl/debian/keys/thishost.key'
+	$bacula_ssl_client_key    = '/etc/ssl/private/thishost.key'
 	$bacula_ssl_server_cert   = '/etc/ssl/debian/certs/thishost-server.crt'
-	$bacula_ssl_server_key    = '/etc/ssl/debian/keys/thishost-server.key'
+	$bacula_ssl_server_key    = '/etc/ssl/private/thishost-server.key'
+
+	$bacula_dsa_client_list   = '/etc/bacula/dsa-clients'
+	$tag_bacula_dsa_client_list = "bacula::dsa::clientlist"
 
 	file { '/usr/local/sbin/bacula-idle-restart':
 		mode    => '0555',
-		source  => 'puppet:///modules/bacula/bacula-idle-restart',
+		content  => template('bacula/bacula-idle-restart.erb'),
 	}
 
 }