bacula directori and storage: whitespace change only

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index d0e0fa5..2c5d053 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,109 +1,109 @@
 class bacula::director inherits bacula {
 
-       package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
-               ensure => installed
-       }
+  package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
+    ensure => installed
+  }
 
-       service { 'bacula-director':
-               ensure    => running,
-               enable    => true,
-               hasstatus => true,
-               require   => Package['bacula-director-pgsql']
-       }
-       dsa_systemd::override { 'bacula-director':
-               content => @(EOT)
-                       [Unit]
-                       After=unbound.service
-                       | EOT
-       }
+  service { 'bacula-director':
+    ensure    => running,
+    enable    => true,
+    hasstatus => true,
+    require   => Package['bacula-director-pgsql']
+  }
+  dsa_systemd::override { 'bacula-director':
+    content => @(EOT)
+      [Unit]
+      After=unbound.service
+      | EOT
+  }
 
-       exec { 'bacula-director reload':
-               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               command     => 'service bacula-director reload',
-               refreshonly => true,
-       }
+  exec { 'bacula-director reload':
+    path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+    command     => 'service bacula-director reload',
+    refreshonly => true,
+  }
 
-       file { '/etc/bacula/conf.d':
-               ensure  => directory,
-               mode    => '0755',
-               group   => bacula,
-               purge   => true,
-               force   => true,
-               recurse => true,
-               source  => 'puppet:///files/empty/',
-               notify  => Exec['bacula-director reload']
-       }
+  file { '/etc/bacula/conf.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    source  => 'puppet:///files/empty/',
+    notify  => Exec['bacula-director reload']
+  }
 
-       file { '/etc/bacula/bacula-dir.conf':
-               content => template('bacula/bacula-dir.conf.erb'),
-               mode    => '0440',
-               group   => bacula,
-               require => Package['bacula-director-pgsql'],
-               notify  => Exec['bacula-director reload']
-       }
+  file { '/etc/bacula/bacula-dir.conf':
+    content => template('bacula/bacula-dir.conf.erb'),
+    mode    => '0440',
+    group   => bacula,
+    require => Package['bacula-director-pgsql'],
+    notify  => Exec['bacula-director reload']
+  }
 
-       file { '/etc/bacula/conf.d/empty.conf':
-               content => '',
-               mode    => '0440',
-               group   => bacula,
-               require => Package['bacula-director-pgsql'],
-               notify  => Exec['bacula-director reload']
-       }
+  file { '/etc/bacula/conf.d/empty.conf':
+    content => '',
+    mode    => '0440',
+    group   => bacula,
+    require => Package['bacula-director-pgsql'],
+    notify  => Exec['bacula-director reload']
+  }
 
-       Bacula::Node<<| |>>
+  Bacula::Node<<| |>>
 
-       package { 'bacula-console':
-               ensure => installed;
-       }
+  package { 'bacula-console':
+    ensure => installed;
+  }
 
-       file { '/etc/bacula/bconsole.conf':
-               content => template('bacula/bconsole.conf.erb'),
-               mode    => '0640',
-               group   => bacula,
-               require => Package['bacula-console']
-       }
+  file { '/etc/bacula/bconsole.conf':
+    content => template('bacula/bconsole.conf.erb'),
+    mode    => '0640',
+    group   => bacula,
+    require => Package['bacula-console']
+  }
 
-       package { 'python3-psycopg2': ensure => installed }
-       file { '/etc/bacula/scripts/volume-purge-action':
-               mode    => '0555',
-               source  => 'puppet:///modules/bacula/volume-purge-action',
-               ;
-       }
-       file { '/etc/bacula/scripts/volumes-delete-old':
-               mode    => '0555',
-               source  => 'puppet:///modules/bacula/volumes-delete-old',
-               ;
-       }
-       file { '/etc/bacula/storages-list.d':
-               ensure  => directory,
-               mode    => '0755',
-               group   => bacula,
-               purge   => true,
-               force   => true,
-               recurse => true,
-               source  => 'puppet:///files/empty/',
-       }
-       file { '/usr/local/sbin/dsa-bacula-scheduler':
-               source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
-               mode    => '0555',
-       }
+  package { 'python3-psycopg2': ensure => installed }
+  file { '/etc/bacula/scripts/volume-purge-action':
+    mode    => '0555',
+    source  => 'puppet:///modules/bacula/volume-purge-action',
+    ;
+  }
+  file { '/etc/bacula/scripts/volumes-delete-old':
+    mode    => '0555',
+    source  => 'puppet:///modules/bacula/volumes-delete-old',
+    ;
+  }
+  file { '/etc/bacula/storages-list.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    source  => 'puppet:///files/empty/',
+  }
+  file { '/usr/local/sbin/dsa-bacula-scheduler':
+    source  => 'puppet:///modules/bacula/dsa-bacula-scheduler',
+    mode    => '0555',
+  }
 
-       file { "/etc/cron.d/puppet-bacula-stuff": ensure => absent, }
-       concat::fragment { 'dsa-puppet-stuff--bacula-director':
-               target => '/etc/cron.d/dsa-puppet-stuff',
-               content  => @(EOF)
-                       @daily root chronic /etc/bacula/scripts/volume-purge-action -v
-                       @daily root chronic /etc/bacula/scripts/volumes-delete-old -v
-                       */3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
-                       | EOF
-       }
+  file { "/etc/cron.d/puppet-bacula-stuff": ensure => absent, }
+  concat::fragment { 'dsa-puppet-stuff--bacula-director':
+    target => '/etc/cron.d/dsa-puppet-stuff',
+    content  => @(EOF)
+      @daily root chronic /etc/bacula/scripts/volume-purge-action -v
+      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v
+      */3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
+      | EOF
+  }
 
-       concat { $bacula::bacula_dsa_client_list:
-       }
-       concat::fragment { 'bacula-dsa-client-list::header' :
-               target => $bacula::bacula_dsa_client_list,
-               content  => "",
-               order  => '00',
-       }
-       Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
+  concat { $bacula::bacula_dsa_client_list:
+  }
+  concat::fragment { 'bacula-dsa-client-list::header' :
+    target => $bacula::bacula_dsa_client_list,
+    content  => "",
+    order  => '00',
+  }
+  Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
 }

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index fc18a62..afe7def 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,90 +1,89 @@
 class bacula::storage inherits bacula {
+  package { 'bacula-sd':
+    ensure => installed
+  }
 
-       package { 'bacula-sd':
-               ensure => installed
-       }
+  service { 'bacula-sd':
+    ensure    => running,
+    enable    => true,
+    hasstatus => true,
+  }
+  dsa_systemd::override { 'bacula-sd':
+    content => @(EOT)
+      [Service]
+      Group=bacula
+      SupplementaryGroups=ssl-cert
+      | EOT
+  }
 
-       service { 'bacula-sd':
-               ensure    => running,
-               enable    => true,
-               hasstatus => true,
-       }
-       dsa_systemd::override { 'bacula-sd':
-               content => @(EOT)
-                       [Service]
-                       Group=bacula
-                       SupplementaryGroups=ssl-cert
-                       | EOT
-       }
+  exec { 'bacula-sd restart-when-idle':
+    path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+    command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"',
+    refreshonly => true,
+    subscribe   => File[$bacula_ssl_server_cert],
+    require     => File['/usr/local/sbin/bacula-idle-restart'],
+  }
 
-       exec { 'bacula-sd restart-when-idle':
-               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"',
-               refreshonly => true,
-               subscribe   => File[$bacula_ssl_server_cert],
-               require     => File['/usr/local/sbin/bacula-idle-restart'],
-       }
 
+  file { '/etc/bacula/bacula-sd.conf':
+    content => template('bacula/bacula-sd.conf.erb'),
+    mode    => '0640',
+    group   => bacula,
+    notify  => Exec['bacula-sd restart-when-idle']
+  }
 
-       file { '/etc/bacula/bacula-sd.conf':
-               content => template('bacula/bacula-sd.conf.erb'),
-               mode    => '0640',
-               group   => bacula,
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  file { '/etc/bacula/storage-conf.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    source  => 'puppet:///files/empty/',
+    notify  => Exec['bacula-sd restart-when-idle']
+  }
 
-       file { '/etc/bacula/storage-conf.d':
-               ensure  => directory,
-               mode    => '0755',
-               group   => bacula,
-               purge   => true,
-               force   => true,
-               recurse => true,
-               source  => 'puppet:///files/empty/',
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  ferm::rule { 'dsa-bacula-sd-v4':
+    domain      => '(ip)',
+    description => 'Allow bacula-sd access from director and clients',
+    rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4 5.153.231.125 5.153.231.126) ACCEPT; }',
+    notarule    => true,
+  }
 
-       ferm::rule { 'dsa-bacula-sd-v4':
-               domain      => '(ip)',
-               description => 'Allow bacula-sd access from director and clients',
-               rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4 5.153.231.125 5.153.231.126) ACCEPT; }',
-               notarule    => true,
-       }
+  ferm::rule { 'dsa-bacula-sd-v6':
+    domain      => '(ip6)',
+    description => 'Allow bacula-sd access from director and clients',
+    rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
+    notarule    => true,
+  }
 
-       ferm::rule { 'dsa-bacula-sd-v6':
-               domain      => '(ip6)',
-               description => 'Allow bacula-sd access from director and clients',
-               rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
-               notarule    => true,
-       }
+  file { '/etc/bacula/storage-conf.d/empty.conf':
+    content => '',
+    mode    => '0440',
+    group   => bacula,
+    notify  => Exec['bacula-sd restart-when-idle']
+  }
 
-       file { '/etc/bacula/storage-conf.d/empty.conf':
-               content => '',
-               mode    => '0440',
-               group   => bacula,
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  file { "${bacula_backup_path}/Catalog":
+    ensure  => directory,
+    mode    => '0755',
+    owner   => bacula,
+    group   => bacula,
+    ;
+  }
 
-       file { "${bacula_backup_path}/Catalog":
-               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',
+  }
+  file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, }
+  concat::fragment { 'dsa-puppet-stuff--bacula-storage':
+    target => '/etc/cron.d/dsa-puppet-stuff',
+    content  => @(EOF)
+      @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
+      | EOF
+  }
 
-       package { 'python3-psycopg2': ensure => installed }
-       file { '/usr/local/bin/bacula-unlink-removed-volumes':
-               source  => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
-               mode    => '0555',
-       }
-       file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, }
-       concat::fragment { 'dsa-puppet-stuff--bacula-storage':
-               target => '/etc/cron.d/dsa-puppet-stuff',
-               content  => @(EOF)
-                       @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
-                       | EOF
-       }
-
-       Bacula::Storage_per_node<<| |>>
+  Bacula::Storage_per_node<<| |>>
 }