From 9cecb6be81f29a7857a07c9af489c00656edd507 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 31 Mar 2021 11:54:09 +0200
Subject: [PATCH] Remove old email.yaml and cronjob cleanups

This removes cleanup of email.yaml introduced in
e6ead4595d3008040e56a55cc40a424ee5cb87d7. It also removes cleanup of
crons introduced in 14fce641b88c189e06596262d0ce99f859336fe1. Both of
them should be deployed long enough that we can assume they're gone.
---
 manifests/config.pp          | 11 -----------
 manifests/init.pp            |  2 +-
 spec/classes/foreman_spec.rb |  9 +--------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 42adbc672..ac4a729de 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -48,11 +48,6 @@
     content => template('foreman/database.yml.erb'),
   }
 
-  # email.yaml support has been removed in 1.16.
-  file { '/etc/foreman/email.yaml':
-    ensure => absent,
-  }
-
   if $foreman::use_foreman_service {
     if $foreman::apache {
       include apache
@@ -110,12 +105,6 @@
     }
   }
 
-  # remove crons previously installed here, they've moved to the package's
-  # cron.d file
-  cron { ['clear_session_table', 'expire_old_reports', 'daily summary']:
-    ensure  => absent,
-  }
-
   if $foreman::apache  {
     class { 'foreman::config::apache':
       passenger               => $foreman::passenger,
diff --git a/manifests/init.pp b/manifests/init.pp
index b49cce316..8c469e77e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -179,7 +179,7 @@
 #
 # $hsts_enabled::                 Should HSTS enforcement in https requests be enabled
 #
-# $cors_domains::                 List of domains that show be allowed for Cross-Origin Resource Sharing. This requires Foreman 1.22+
+# $cors_domains::                 List of domains that show be allowed for Cross-Origin Resource Sharing
 #
 # $foreman_service_puma_threads_min::     Minimum number of threads for Puma. Relevant only when Puma service is used and ignored when Passenger is used.
 #
diff --git a/spec/classes/foreman_spec.rb b/spec/classes/foreman_spec.rb
index d9d1ba812..c14dd8ae8 100644
--- a/spec/classes/foreman_spec.rb
+++ b/spec/classes/foreman_spec.rb
@@ -72,12 +72,7 @@
           )
         }
 
-        it 'should remove old crons' do
-          should contain_cron('clear_session_table').with_ensure('absent')
-          should contain_cron('expire_old_reports').with_ensure('absent')
-          should contain_cron('daily summary').with_ensure('absent')
-        end
-
+        # apache
         it 'should contain foreman::config::apache' do
           passenger_ruby = if facts[:osfamily] == 'RedHat' && facts[:os]['release']['major'] == '7'
                              '/usr/bin/tfm-ruby'
@@ -392,7 +387,6 @@
       context 'with email configured for SMTP' do
         let(:params) { super().merge(email_delivery_method: 'smtp') }
 
-        it { should contain_file('/etc/foreman/email.yaml').with_ensure('absent') }
         it { should contain_foreman_config_entry('delivery_method').with_value('smtp') }
         it { should contain_foreman_config_entry('smtp_authentication').with_value('') }
 
@@ -404,7 +398,6 @@
 
       describe 'with email configured for sendmail' do
         let(:params) { super().merge(email_delivery_method: 'sendmail') }
-        it { should contain_file('/etc/foreman/email.yaml').with_ensure('absent') }
         it { should contain_foreman_config_entry('delivery_method').with_value('sendmail') }
 
         describe 'with sample parameters' do