X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=86c903d6d07cdb9390bac58beb136ce6f87d2efe;hb=891ab115f249a1c7e186cca9145989112353a5a0;hp=513d0968669cd58af5c1c1b829e02968003a39cd;hpb=b55d4eadb0e8691a612a43e3e8f4298a8fed1391;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 513d09686..86c903d6d 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,54 +1,109 @@
 class bacula::director inherits bacula {
 
-  package {
-    "bacula-director-pgsql": ensure => installed;
-    "bacula-common": ensure => installed;
-    "bacula-common-pgsql": ensure => installed;
-  }
-
-  service {
-    "bacula-director":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      require => Package["bacula-director-pgsql"];
-  }
-  file {
-    "/etc/bacula/conf.d":
-      ensure  => directory,
-      mode => 755,
-      group => bacula,
-      notify  => Exec["bacula-director restart"]
-      ;
-    "/etc/bacula/bacula-dir.conf":
-      content => template("bacula/bacula-dir.conf.erb"),
-      mode => 440,
-      group => bacula,
-      require => Package["bacula-director-pgsql"],
-      notify  => Exec["bacula-director restart"]
-      ;
-  }
-
-  exec {
-    "bacula-director restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
-  }
-
-  define bacula_client($client) {
-    # These must be kept in sync with the settings in bacula.pp
-    $bacula_client_name       = "$client-fd"
-    $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$client")
-
-    file {
-      "/etc/bacula/conf.d/$client.conf":
-      content => template("bacula/per-client.conf.erb"),
-      mode => 440,
-      group => bacula,
-      notify  => Exec["bacula-director restart"]
-      ;
-    }
-  }
-
-  bacula_client { allnodeinfo('hostname', '') }
+	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
+	}
+
+	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/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']
+	}
+
+	Bacula::Node<<| |>>
+
+	package { 'bacula-console':
+		ensure => installed;
+	}
+
+	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',
+	}
+
+	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 |>>
 }