Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365633 )
Change subject: aptrepo: drop files/log, use templates/log.erb
......................................................................
aptrepo: drop files/log, use templates/log.erb
For some reason the aptrepo repository had both a files/log file, and a
templates/log.erb template, with the former one being used and the
latter one just being unused.
Switch the puppet code to use the latter. The only variable that is
needed by the template is notify_address and it looks like this one is
set in the manifest already (presumably for this exact purpose).
Change-Id: I46b0502f5fe19748199c0c69cb171c62e99e6875
---
D modules/aptrepo/files/log
M modules/aptrepo/manifests/init.pp
2 files changed, 5 insertions(+), 8 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/aptrepo/files/log b/modules/aptrepo/files/log
deleted file mode 100644
index ed2996f..0000000
--- a/modules/aptrepo/files/log
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo -e "reprepro changes:\n$@" | mail -s "Reprepro changes" r...@wikimedia.org
\ No newline at end of file
diff --git a/modules/aptrepo/manifests/init.pp
b/modules/aptrepo/manifests/init.pp
index 9844a38..a689716 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -131,11 +131,11 @@
}
file { "${basedir}/conf/log":
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0755',
- source => 'puppet:///modules/aptrepo/log',
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ content => template('aptrepo/log.erb'),
}
file { "${basedir}/db":
--
To view, visit https://gerrit.wikimedia.org/r/365633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46b0502f5fe19748199c0c69cb171c62e99e6875
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
