X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=09f0d0de81ffe2c4e0eb9af90a6f345abedaefbb;hb=8b22735de3dd63392e79167a9c7865963f8cb5b4;hp=63de0de3e805385e3222d6c53a141c592573ba68;hpb=93adaa925209eb347451bf8faf2799c2f59ed968;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp index 63de0de3e..09f0d0de8 100644 --- a/modules/bacula/manifests/storage.pp +++ b/modules/bacula/manifests/storage.pp @@ -47,7 +47,7 @@ class bacula::storage inherits bacula { ferm::rule { 'dsa-bacula-sd': domain => '(ip ip6)', description => 'Allow bacula-sd access from director and clients (i.e. all of Debian)', - rule => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN 5.153.231.125 5.153.231.126) ACCEPT; }', + rule => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN) ACCEPT; }', notarule => true, } @@ -59,22 +59,22 @@ class bacula::storage inherits bacula { } file { "${bacula_backup_path}/Catalog": - ensure => directory, - mode => '0755', - owner => bacula, - group => bacula, + ensure => directory, + mode => '0755', + owner => bacula, + group => bacula, ; } package { 'python3-psycopg2': ensure => installed } file { '/usr/local/bin/bacula-unlink-removed-volumes': - source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes', - mode => '0555', + source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes', + mode => '0555', } - file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, } + file { '/etc/cron.d/puppet-bacula-storage-stuff': ensure => absent, } concat::fragment { 'puppet-crontab--bacula-storage': - target => '/etc/cron.d/puppet-crontab', - content => @(EOF) + target => '/etc/cron.d/puppet-crontab', + content => @(EOF) @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v | EOF }