From 1ad7f60ae4b5a726a6485392afa24c25bf53f663 Mon Sep 17 00:00:00 2001 From: paladox Date: Thu, 23 Jan 2025 13:00:21 +0000 Subject: [PATCH] mediawiki: move backup-all-wikis-ia cron to jobrunner class * Only run it where mediawiki::jobqueue::runner::cron is set to true --- modules/mediawiki/manifests/init.pp | 42 ----------------------------- 1 file changed, 42 deletions(-) diff --git a/modules/mediawiki/manifests/init.pp b/modules/mediawiki/manifests/init.pp index e1ba8aaee6..cfd23ee9e9 100644 --- a/modules/mediawiki/manifests/init.pp +++ b/modules/mediawiki/manifests/init.pp @@ -35,48 +35,6 @@ } } - if lookup('jobrunner::intensive', {'default_value' => false}) { - if ($facts['os']['distro']['codename'] == 'bookworm') { - stdlib::ensure_packages(['python3-internetarchive']) - } else { - stdlib::ensure_packages( - 'internetarchive', - { - ensure => '3.3.0', - provider => 'pip3', - before => File['/usr/local/bin/iaupload'], - require => Package['python3-pip'], - }, - ) - } - - file { '/usr/local/bin/iaupload': - ensure => present, - mode => '0755', - source => 'puppet:///modules/mediawiki/bin/iaupload.py', - } - - file { '/usr/local/bin/backupwikis': - ensure => 'present', - mode => '0755', - source => 'puppet:///modules/mediawiki/bin/backupwikis', - } - - file { '/opt/backups': - ensure => directory, - owner => 'www-data', - group => 'www-data', - mode => '0755', - } - - cron { 'backup-all-wikis-ia': - ensure => present, - command => '/usr/local/bin/backupwikis /srv/mediawiki/cache/public.php > /var/log/iabackup-backup.log 2>&1', - user => 'www-data', - monthday => ['1'], - } - } - git::clone { '3d2png': ensure => 'latest', directory => '/srv/3d2png',