ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332447 )
Change subject: change snapshots manifests to use the shell scripts instead of
templates
......................................................................
change snapshots manifests to use the shell scripts instead of templates
Change-Id: I3f4eed40b5eab20fdcfdb07925c47a47ad10cf44
---
M modules/snapshot/manifests/cron/centralauthdump.pp
M modules/snapshot/manifests/cron/cirrussearch.pp
M modules/snapshot/manifests/cron/contentxlation.pp
M modules/snapshot/manifests/cron/dumplists.pp
M modules/snapshot/manifests/cron/mediaperprojectlists.pp
M modules/snapshot/manifests/cron/wikidatadumps/common.pp
6 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/cron/centralauthdump.pp
b/modules/snapshot/manifests/cron/centralauthdump.pp
index b448378..0290dc3 100644
--- a/modules/snapshot/manifests/cron/centralauthdump.pp
+++ b/modules/snapshot/manifests/cron/centralauthdump.pp
@@ -5,10 +5,10 @@
$confsdir = $snapshot::dumps::dirs::confsdir
file { '/usr/local/bin/dumpcentralauth.sh':
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => template('snapshot/cron/dumpcentralauth.sh.erb'),
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/snapshot/cron/dumpcentralauth.sh',
}
# used by script to find the name of the corresponding db.php file
diff --git a/modules/snapshot/manifests/cron/cirrussearch.pp
b/modules/snapshot/manifests/cron/cirrussearch.pp
index 6fa3476..075564a 100644
--- a/modules/snapshot/manifests/cron/cirrussearch.pp
+++ b/modules/snapshot/manifests/cron/cirrussearch.pp
@@ -18,10 +18,10 @@
$scriptpath = '/usr/local/bin/dumpcirrussearch.sh'
file { $scriptpath:
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => template('snapshot/cron/dumpcirrussearch.sh.erb'),
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/snapshot/cron/dumpcirrussearch.sh',
}
cron { 'cirrussearch-dump':
diff --git a/modules/snapshot/manifests/cron/contentxlation.pp
b/modules/snapshot/manifests/cron/contentxlation.pp
index 464b44c..0fc177f 100644
--- a/modules/snapshot/manifests/cron/contentxlation.pp
+++ b/modules/snapshot/manifests/cron/contentxlation.pp
@@ -10,10 +10,10 @@
$scriptpath = '/usr/local/bin/dumpcontentxlation.sh'
file { $scriptpath:
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => template('snapshot/cron/dumpcontentxlation.sh.erb'),
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/snapshot/cron/dumpcontentxlation.sh',
}
cron { 'xlation-cleanup':
diff --git a/modules/snapshot/manifests/cron/dumplists.pp
b/modules/snapshot/manifests/cron/dumplists.pp
index dcf2b6c..7b578bb 100644
--- a/modules/snapshot/manifests/cron/dumplists.pp
+++ b/modules/snapshot/manifests/cron/dumplists.pp
@@ -4,12 +4,12 @@
include ::snapshot::dumps::dirs
file { '/usr/local/bin/list-last-good-dumps.sh':
- ensure => 'present',
- path => '/usr/local/bin/list-last-good-dumps.sh',
- mode => '0755',
- owner => $user,
- group => 'root',
- content => template('snapshot/cron/list-last-good-dumps.sh.erb'),
+ ensure => 'present',
+ path => '/usr/local/bin/list-last-good-dumps.sh',
+ mode => '0755',
+ owner => $user,
+ group => 'root',
+ source => 'puppet:///modules/snapshot/cron/list-last-good-dumps.sh',
}
file { '/usr/local/bin/list-last-n-good-dumps.py':
ensure => 'present',
diff --git a/modules/snapshot/manifests/cron/mediaperprojectlists.pp
b/modules/snapshot/manifests/cron/mediaperprojectlists.pp
index dc7e66f..c79a46c 100644
--- a/modules/snapshot/manifests/cron/mediaperprojectlists.pp
+++ b/modules/snapshot/manifests/cron/mediaperprojectlists.pp
@@ -4,12 +4,12 @@
include ::snapshot::dumps::dirs
file { '/usr/local/bin/create-media-per-project-lists.sh':
- ensure => 'present',
- path => '/usr/local/bin/create-media-per-project-lists.sh',
- mode => '0755',
- owner => $user,
- group => 'root',
- content =>
template('snapshot/cron/create-media-per-project-lists.sh.erb'),
+ ensure => 'present',
+ path => '/usr/local/bin/create-media-per-project-lists.sh',
+ mode => '0755',
+ owner => $user,
+ group => 'root',
+ source =>
'puppet:///modules/snapshot/cron/create-media-per-project-lists.sh',
}
cron { 'list-media-per-project':
diff --git a/modules/snapshot/manifests/cron/wikidatadumps/common.pp
b/modules/snapshot/manifests/cron/wikidatadumps/common.pp
index c1bd833..2850513 100644
--- a/modules/snapshot/manifests/cron/wikidatadumps/common.pp
+++ b/modules/snapshot/manifests/cron/wikidatadumps/common.pp
@@ -1,9 +1,9 @@
class snapshot::cron::wikidatadumps::common {
file { '/usr/local/bin/wikidatadumps-shared.sh':
- mode => '0755',
- owner => 'root',
- group => 'root',
- content => template('snapshot/cron/wikidatadumps-shared.sh.erb'),
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/snapshot/cron/wikidatadumps-shared.sh',
}
file { '/var/log/wikidatadump':
--
To view, visit https://gerrit.wikimedia.org/r/332447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f4eed40b5eab20fdcfdb07925c47a47ad10cf44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
