removed weak ssh key; added new admin key

[mirror/dsa-puppet.git] / modules / bacula / manifests / init.pp

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 0cf33bd..c536a94 100644 (file)
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -16,7 +16,7 @@ class bacula {
        $bacula_director_port     = 9101
        $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,13 @@ 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'
 
        file { '/usr/local/sbin/bacula-idle-restart':
                mode    => '0555',
-               source  => 'puppet:///modules/bacula/bacula-idle-restart',
+               content  => template('bacula/bacula-idle-restart.erb'),
        }
 
 }