Giuseppe Lavagetto has submitted this change and it was merged. Change subject: standard::mail::sender: move template to module ......................................................................
standard::mail::sender: move template to module Change-Id: Ib8f28a9292bd4e9dc8197f737e54c501a316ac5b --- M modules/standard/manifests/mail/sender.pp R modules/standard/templates/mail/exim4.minimal.labs.erb R modules/standard/templates/mail/exim4.minimal.labtest.erb R modules/standard/templates/mail/exim4.minimal.production.erb 4 files changed, 1 insertion(+), 1 deletion(-) Approvals: Elukey: Looks good to me, but someone else must approve Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/standard/manifests/mail/sender.pp b/modules/standard/manifests/mail/sender.pp index b3cfbfb..5b31fa7 100644 --- a/modules/standard/manifests/mail/sender.pp +++ b/modules/standard/manifests/mail/sender.pp @@ -1,6 +1,6 @@ class standard::mail::sender { class { 'exim4': queuerunner => 'queueonly', - config => template("mail/exim4.minimal.${::realm}.erb"), + config => template("standard/mail/exim4.minimal.${::realm}.erb"), } } diff --git a/templates/mail/exim4.minimal.labs.erb b/modules/standard/templates/mail/exim4.minimal.labs.erb similarity index 100% rename from templates/mail/exim4.minimal.labs.erb rename to modules/standard/templates/mail/exim4.minimal.labs.erb diff --git a/templates/mail/exim4.minimal.labtest.erb b/modules/standard/templates/mail/exim4.minimal.labtest.erb similarity index 100% rename from templates/mail/exim4.minimal.labtest.erb rename to modules/standard/templates/mail/exim4.minimal.labtest.erb diff --git a/templates/mail/exim4.minimal.production.erb b/modules/standard/templates/mail/exim4.minimal.production.erb similarity index 100% rename from templates/mail/exim4.minimal.production.erb rename to modules/standard/templates/mail/exim4.minimal.production.erb -- To view, visit https://gerrit.wikimedia.org/r/310782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib8f28a9292bd4e9dc8197f737e54c501a316ac5b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits