Alexandros Kosiaris has submitted this change and it was merged.
Change subject: otrs: Remove the otrs cron file
......................................................................
otrs: Remove the otrs cron file
In otrs 5.0.x the usual cron file does not exist. All of the cronjobs
have been migrated to the OTRS daemon. Remove the crontab file from the
repo. Remove the safeguard around Debian Jessie as well since the old
installation will very soon cease to exist
Change-Id: I6ba018486a1d801bd47bc1409fbd519e57d0f2cf
---
D modules/otrs/files/crontab.otrs
M modules/otrs/manifests/init.pp
2 files changed, 9 insertions(+), 60 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/otrs/files/crontab.otrs b/modules/otrs/files/crontab.otrs
deleted file mode 100644
index 11bfa9b..0000000
--- a/modules/otrs/files/crontab.otrs
+++ /dev/null
@@ -1,31 +0,0 @@
-# installed by puppet, see puppet/files/otrs/crontab.otrs
-
-MAILTO="r...@wikimedia.org"
-
-# delete expired cache every Sunday AM
-20 0 * * 0 otrs /opt/otrs/bin/otrs.DeleteCache.pl --expired > /dev/null 2>&1
-30 0 * * 0 otrs /opt/otrs/bin/otrs.LoaderCache.pl -o delete > /dev/null 2>&1
-
-# start generic agent (db) every 10 min
-*/10 * * * * otrs /opt/otrs/bin/otrs.GenericAgent.pl -c db > /dev/null 2>&1
-
-# start generic agent (non-db) every 20 min
-*/20 * * * * otrs /opt/otrs/bin/otrs.GenericAgent.pl > /dev/null 2>&1
-
-# check for pending jobs every 120 min
-45 */2 * * * otrs /opt/otrs/bin/otrs.PendingJobs.pl > /dev/null 2>&1
-
-# check daily the spool directory of OTRS
-10 0 * * * otrs /opt/otrs/bin/otrs.cleanup > /dev/null 2>&1
-
-# rebuild ticket index for OTRS daily
-01 01 * * * otrs /opt/otrs/bin/otrs.RebuildTicketIndex.pl > /dev/null 2>&1
-
-# delete old/idle session ids every 2 hours
-55 */2 * * * otrs /opt/otrs/bin/otrs.DeleteSessionIDs.pl --expired >
/dev/null 2>&1
-
-# unlock old locked tickets hourly
-35 * * * * otrs /opt/otrs/bin/otrs.UnlockTickets.pl --timeout > /dev/null
2>&1
-
-# NOTE: This is here for completeness. It is NOT to be used under systemd
otherwise it WILL cause problems
-# */5 * * * * otrs /opt/otrs/bin/otrs.Scheduler.pl -w 1 > /dev/null 2>&1
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index d042a81..7479b9b 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -134,35 +134,15 @@
source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
}
- # TODO: Remove the safeguard once we are jessie only
- # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since
that
- # should not bite back as after the move the 3.2.x install we have will be
- # decomissioned
- if os_version('debian >= jessie') {
- # TODO: Remove this after the migration to 5.0.x is complete
- file { '/etc/cron.d/otrs':
- ensure => absent,
- }
-
- base::service_unit { 'otrs-daemon':
- ensure => present,
- upstart => false,
- systemd => true,
- refresh => true,
- service_params => {
- enable => true,
- hasstatus => true,
- hasrestart => false,
- }
- }
- }
- else {
- file { '/etc/cron.d/otrs':
- ensure => 'file',
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/otrs/crontab.otrs',
+ base::service_unit { 'otrs-daemon':
+ ensure => present,
+ upstart => false,
+ systemd => true,
+ refresh => true,
+ service_params => {
+ enable => true,
+ hasstatus => true,
+ hasrestart => false,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/269703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba018486a1d801bd47bc1409fbd519e57d0f2cf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
