stop using virtual resources for ferm::rule

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 2c5ed34..3027930 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -18,7 +18,6 @@ class bacula::client inherits bacula {
        package { ['bacula-fd']:
                ensure => installed
        }
-       include stretch::network_online
 
        service { 'bacula-fd':
                ensure    => running,
@@ -64,10 +63,8 @@ class bacula::client inherits bacula {
                file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
                        ensure  => absent,
                }
-               systemd::override { 'bacula-fd':
+               dsa_systemd::override { 'bacula-fd':
                        content => @(EOT)
-                               [Unit]
-                               After=network-online.target
                                [Service]
                                ExecStart=
                                ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
@@ -77,12 +74,12 @@ class bacula::client inherits bacula {
                file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
                        ensure  => absent,
                }
-               systemd::override { 'bacula-fd':
+               dsa_systemd::override { 'bacula-fd':
                        ensure  => absent,
                }
        }
 
-       @ferm::rule { 'dsa-bacula-fd':
+       ferm::rule { 'dsa-bacula-fd':
                domain      => '(ip ip6)',
                description => 'Allow bacula access from storage and director',
                rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) ACCEPT",