Merge branch 'main' into stable

This commit is contained in:
Micke Nordin 2024-08-14 14:49:32 +02:00
commit 728b152f85
2 changed files with 11 additions and 2 deletions

View file

@ -56,6 +56,17 @@ class sunetdrive::script (
} }
$site_name = $config['site_name'] $site_name = $config['site_name']
$user_bucket_name = $config['user_bucket_name'] $user_bucket_name = $config['user_bucket_name']
if $config['user_scans'] {
$config['user_scans'].each |$job| {
sunet::scriptherder::cronjob { $job['name']:
cmd => "ssh -t -l script ${job['server']} /usr/bin/sudo /usr/local/bin/occ ${job['container']} files:scan ${job['user']}",
hour => $job['hour'],
minute => $job['minute'],
ok_criteria => ['exit_status=0','max_age=1d'],
warn_criteria => ['exit_status=1','max_age=2d'],
}
}
}
# It is a start that will get us user buckets and primary buckets # It is a start that will get us user buckets and primary buckets
$backup_projects = $location $backup_projects = $location

View file

@ -42,8 +42,6 @@ class sunetdrive::sitemonitornaemon() {
} }
file { '/etc/naemon/conf.d/sunetdrive_thruk_templates.conf': file { '/etc/naemon/conf.d/sunetdrive_thruk_templates.conf':
ensure => present, ensure => present,
owner => 'naemon',
group => 'naemon',
content => template('sunetdrive/monitor/sunetdrive_thruk_templates.conf.erb'), content => template('sunetdrive/monitor/sunetdrive_thruk_templates.conf.erb'),
mode => '0644', mode => '0644',
} }