Fixes #29220: Disable CRL generation by default

theforeman · Feb 28, 2020 · 504ed85 · 504ed85
1 parent 1a3f465
commit 504ed85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -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,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -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

diff --git a/spec/classes/candlepin_spec.rb b/spec/classes/candlepin_spec.rb
@@ -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') }

diff --git a/templates/candlepin.conf.erb b/templates/candlepin.conf.erb
@@ -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