X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=2c5d0533f037940c93c78212877b51d4f41a2153;hb=57ad37658ba4a8f9f8423dd617089c083e517aa3;hp=13e7595283ff0b3b352151ae796cd2ff96ce4f07;hpb=44688b3127634f8a9369c6419f45a706a39ee628;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 13e759528..2c5d0533f 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,100 +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']
-	}
-	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']
+  }
 
-	@ferm::rule { 'dsa-bacula-dir':
-		domain      => '(ip)',
-		description => 'Allow bacula access from localhost',
-		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_ip} localhost) ACCEPT",
-	}
+  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 { "/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
-			| 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 |>>
 }