Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mod 'puppet-augeasproviders_ssh', '6.0.0'
mod 'puppet-augeasproviders_sysctl', '3.1.0'
mod 'puppet-archive', '7.1.0'
mod 'puppet-consul', '10.0.0'
mod 'puppet-cron', '5.0.0'
mod 'puppet-epel', '5.0.0'
mod 'puppet-extlib', '7.0.0'
mod 'puppet-fail2ban', '4.2.0'
Expand Down
24 changes: 11 additions & 13 deletions site/profile/manifests/freeipa.pp
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@
Array[String] $hbac_services = ['sshd', 'jupyterhub-login'],
Boolean $enable_mokey = true,
) {
include cron

file { '/etc/ipa':
ensure => directory,
Expand Down Expand Up @@ -525,19 +526,16 @@
Service["dirsrv@${ds_domain}"] -> Service <| tag == 'profile::accounts' and title == 'mkhome' |>
Service["dirsrv@${ds_domain}"] -> Service <| tag == 'profile::accounts' and title == 'mkproject' |>

logrotate::rule { 'pki-tomcat':
path => '/var/log/pki/pki-tomcat/ca/*.log',
rotate => 5,
ifempty => false,
copytruncate => false,
olddir => false,
size => '5M',
compress => true,
create => true,
create_mode => '0640',
create_owner => 'pkiuser',
create_group => 'pkiuser',
postrotate => '/bin/systemctl restart pki-tomcatd@pki-tomcat.service > /dev/null 2>/dev/null || true',
# pki-tomcat has its own log rotation mechanism, but it does not properly clean file older than 7 days.
cron::job { 'clean_pki-tomcat_ca_debuglog':
minute => '49',
hour => '3',
date => '*',
month => '*',
weekday => '*',
user => 'root',
command => 'find /var/log/pki/pki-tomcat/ca -maxdepth 1 -name debug.*.log -mtime +7 -delete',
description => 'clean pki-tomcat debug logs',
}

# httpd-core rpm installs /etc/logrotate.d/httpd with postrotate = /bin/systemctl reload httpd
Expand Down