From 57450a642a65f63656ead899a40c53bc2bf58b74 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 24 Sep 2019 23:36:14 +0200 Subject: [PATCH] Remove bacula-monitor. This seems unused for now, but we can always bring it back if we think it necessary --- modules/bacula/manifests/init.pp | 2 -- modules/bacula/templates/bacula-dir.conf.erb | 9 --------- 2 files changed, 11 deletions(-) diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp index 8ebc4ee5c..78ef859da 100644 --- a/modules/bacula/manifests/init.pp +++ b/modules/bacula/manifests/init.pp @@ -4,13 +4,11 @@ class bacula ( String $bacula_operator_email = 'bacula-reports@admin.debian.org', String $bacula_director_name = 'debian-dir', - String $bacula_monitor_name = 'debian-mon', String $bacula_director_address = 'dinis.debian.org', String $bacula_storage_address = 'storace.debian.org', String $bacula_db_secret = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"), - String $bacula_monitor_secret = hkdf('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}"), String $bacula_ca_path = '/etc/ssl/debian/certs/ca.crt', String $bacula_ssl_client_cert = '/etc/ssl/debian/certs/thishost.crt', diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb index 03ed75b85..58b9c8536 100644 --- a/modules/bacula/templates/bacula-dir.conf.erb +++ b/modules/bacula/templates/bacula-dir.conf.erb @@ -125,15 +125,6 @@ Messages { append = "/var/lib/bacula/log" = all } -######################################################################## -# Console, limited # -######################################################################## -Console { - Name = <%= @bacula_monitor_name %> - Password = "<%= @bacula_monitor_secret %>" - CommandACL = status, .status -} - ######################################################################## # Jobdefinitions with defaults and stuff # ######################################################################## -- 2.20.1