X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=dd5395df664d533aaae971551c31c222e323a5da;hb=c439349f1c3acd30786d8687df778b2654a509a0;hp=2c5d0533f037940c93c78212877b51d4f41a2153;hpb=57ad37658ba4a8f9f8423dd617089c083e517aa3;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 2c5d0533f..dd5395df6 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -1,9 +1,59 @@ -class bacula::director inherits bacula { +# our bacula director +# +# @param pool_name A token to be used in pool names +# @param db_address hostname of the postgres server for the catalog DB +# @param db_port port of the postgres server for the catalog DB +# @param db_name DB name for the catalog DB +# @param db_user username for the postgres server for the catalog DB +# @param db_password password for the postgres server for the catalog DB +# @param port_dir Port that the director should listen on +# @param db_sslca SSL CA store for DB access +# @param director_name bacula name of this dir instance +# @param director_address address of this dir instance that other instances should connect to (dns name) +# @param messages_name name of the Messages Resource +class bacula::director( + String $db_address = 'localhost', + Integer $db_port = 5432, + String $db_name = 'bacula', + String $db_user = 'bacula', + String $db_password = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"), + String $pool_name = 'bacula', + Integer $port_dir = 9101, + Optional[String] $db_sslca = undef, + String $director_name = "${::fqdn}-dir", + Stdlib::Host $director_address = $::fqdn, + String $messages_name = "Msg-${::fqdn}", +) inherits bacula { - package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']: - ensure => installed + # used by e.g. bconsole + $director_secret = hkdf('/etc/puppet/secret', "bacula-dir-${::fqdn}") + # the RestoreFiles Job needs a Pool and a client. Any valid pool and client. + $some_pool_name = "poolfull-${pool_name}-${director_address}" + $some_client_name = "${director_address}-fd" + + # let the SD know we exist + @@bacula::storage::director{ $::fqdn: + tag => 'bacula::to-storage', + director_name => $director_name, + director_address => $director_address, + messages_name => $messages_name, + } + # let FDs know we exist + @@bacula::client::director{ $::fqdn: + tag => "bacula::to-fd::${director_address}", + director_name => $director_name, + director_address => $director_address, + messages_name => $messages_name, } + ensure_packages ( [ + 'bacula-director-pgsql', + 'bacula-common', + 'bacula-common-pgsql' + ], { + ensure => 'installed', + }) + service { 'bacula-director': ensure => running, enable => true, @@ -13,7 +63,7 @@ class bacula::director inherits bacula { dsa_systemd::override { 'bacula-director': content => @(EOT) [Unit] - After=unbound.service + After=network-online.target unbound.service | EOT } @@ -30,7 +80,6 @@ class bacula::director inherits bacula { purge => true, force => true, recurse => true, - source => 'puppet:///files/empty/', notify => Exec['bacula-director reload'] } @@ -50,7 +99,8 @@ class bacula::director inherits bacula { notify => Exec['bacula-director reload'] } - Bacula::Node<<| |>> + Bacula::Director::Client_from_storage<<| tag == "bacula::to-director::${::fqdn}" |>> + Bacula::Director::Client <<| tag == "bacula::to-director::${::fqdn}" |>> package { 'bacula-console': ensure => installed; @@ -65,13 +115,13 @@ class bacula::director inherits bacula { package { 'python3-psycopg2': ensure => installed } file { '/etc/bacula/scripts/volume-purge-action': - mode => '0555', - source => 'puppet:///modules/bacula/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', + mode => '0555', + source => 'puppet:///modules/bacula/volumes-delete-old', ; } file { '/etc/bacula/storages-list.d': @@ -81,29 +131,37 @@ class bacula::director inherits 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', + 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) + file { '/etc/cron.d/puppet-bacula-stuff': ensure => absent, } + concat::fragment { 'puppet-crontab--bacula-director': + target => '/etc/cron.d/puppet-crontab', + 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 + @daily root chronic /etc/bacula/scripts/volumes-delete-old -v --token '${pool_name}' + */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', + ensure_newline => true, } Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>> + + @@ferm::rule::simple { "bacula::director-to-fd::${::fqdn}": + tag => "bacula::director-to-fd::${::fqdn}", + description => 'Allow bacula-fd from the bacula-director', + port => '7', # overridden on collecting + saddr => $bacula::public_addresses, + } + @@ferm::rule::simple { "bacula::director-to-storage::${::fqdn}": + tag => 'bacula::director-to-storage', + description => 'Allow bacula-storage access from the bacula-director', + chain => 'bacula-sd', + saddr => $bacula::public_addresses, + } }