Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #29220: Disable CRL generation by default #145

Merged
merged 1 commit into from
Feb 28, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@
#
# @param expired_pools_schedule
# Quartz schedule notation for how often to run the ExpiredPoolsJob

#
# @param certificate_revocation_list_task_schedule
# Quartz schedule notation for how often to run CRL generation
class candlepin (
Boolean $manage_db = $candlepin::params::manage_db,
Boolean $init_db = $candlepin::params::init_db,
Expand Down
3 changes: 3 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
# default to run every 24 hours
$expired_pools_schedule = '0 0 0 * * ?'

# default to disabling the task
$certificate_revocation_list_task_schedule='0 0 0 1 1 ?'

$user_groups = []

$env_filtering_enabled = true
Expand Down
1 change: 1 addition & 0 deletions spec/classes/candlepin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
'candlepin.crl.file=/var/lib/candlepin/candlepin-crl.crl',
'log4j.logger.org.hibernate.internal.SessionImpl=ERROR',
'pinsetter.org.candlepin.pinsetter.tasks.ExpiredPoolsJob.schedule=0 0 0 * * ?',
'pinsetter.org.candlepin.pinsetter.tasks.CertificateRevocationListTask.schedule=0 0 0 1 1 ?',
])
end
it { is_expected.to contain_file('/etc/tomcat/tomcat.conf') }
Expand Down
2 changes: 2 additions & 0 deletions templates/candlepin.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ candlepin.ca_key_password=<%= scope['candlepin::ca_key_password'] %>
# Quartz schedule notation for how often to run the ExpiredPoolsJob
pinsetter.org.candlepin.pinsetter.tasks.ExpiredPoolsJob.schedule=<%= scope['candlepin::expired_pools_schedule'] %>

pinsetter.org.candlepin.pinsetter.tasks.CertificateRevocationListTask.schedule=<%= scope['candlepin::certificate_revocation_list_task_schedule'] %>

# Required for https://hibernate.atlassian.net/browse/HHH-12927
log4j.logger.org.hibernate.internal.SessionImpl=ERROR

Expand Down