[MediaWiki-commits] [Gerrit] operations/puppet[production]: exim: move templates to the role module
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: exim: move templates to the role module .. exim: move templates to the role module Change-Id: I60dd84e00a582846c471874442571c00f6d09a6e --- M modules/role/manifests/lists/server.pp M modules/role/manifests/mail/mx.pp M modules/role/manifests/phabricator/main.pp M modules/role/manifests/requesttracker/server.pp R modules/role/templates/exim/exim4.conf.mailman.erb R modules/role/templates/exim/exim4.conf.mx.erb R modules/role/templates/exim/exim4.conf.phab.erb R modules/role/templates/exim/exim4.conf.rt.erb R modules/role/templates/exim/system_filter.conf.erb R modules/role/templates/exim/system_filter.conf.mailman.erb 10 files changed, 8 insertions(+), 10 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/lists/server.pp b/modules/role/manifests/lists/server.pp index 4f411e4..b6ef2c4 100644 --- a/modules/role/manifests/lists/server.pp +++ b/modules/role/manifests/lists/server.pp @@ -44,8 +44,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.mailman.erb'), -filter => template('exim/system_filter.conf.mailman.erb'), +config => template('role/exim/exim4.conf.mailman.erb'), +filter => template('role/exim/system_filter.conf.mailman.erb'), require => [ Class['spamassassin'], Interface::Ip['lists.wikimedia.org_v4'], @@ -174,4 +174,3 @@ rule => 'proto tcp dport 783 { saddr (127.0.0.1 ::1) ACCEPT; }' } } - diff --git a/modules/role/manifests/mail/mx.pp b/modules/role/manifests/mail/mx.pp index c9457a8..4f9a3d1 100644 --- a/modules/role/manifests/mail/mx.pp +++ b/modules/role/manifests/mail/mx.pp @@ -36,8 +36,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.mx.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.mx.erb'), +filter => template('role/exim/system_filter.conf.erb'), require => Class['spamassassin'], } include exim4::ganglia diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index d7b0951..093329d 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -120,8 +120,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.phab.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.phab.erb'), +filter => template('role/exim/system_filter.conf.erb'), } include exim4::ganglia diff --git a/modules/role/manifests/requesttracker/server.pp b/modules/role/manifests/requesttracker/server.pp index 45fcf8a..a07d05f 100644 --- a/modules/role/manifests/requesttracker/server.pp +++ b/modules/role/manifests/requesttracker/server.pp @@ -15,8 +15,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.rt.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.rt.erb'), +filter => template('role/exim/system_filter.conf.erb'), } include exim4::ganglia @@ -34,4 +34,3 @@ } } - diff --git a/templates/exim/exim4.conf.mailman.erb b/modules/role/templates/exim/exim4.conf.mailman.erb similarity index 100% rename from templates/exim/exim4.conf.mailman.erb rename to modules/role/templates/exim/exim4.conf.mailman.erb diff --git a/templates/exim/exim4.conf.mx.erb b/modules/role/templates/exim/exim4.conf.mx.erb similarity index 100% rename from templates/exim/exim4.conf.mx.erb rename to modules/role/templates/exim/exim4.conf.mx.erb diff --git a/templates/exim/exim4.conf.phab.erb b/modules/role/templates/exim/exim4.conf.phab.erb similarity index 100% rename from templates/exim/exim4.conf.phab.erb rename to modules/role/templates/exim/exim4.conf.phab.erb diff --git a/templates/exim/exim4.conf.rt.erb b/modules/role/templates/exim/exim4.conf.rt.erb similarity index 100% rename from templates/exim/exim4.conf.rt.erb rename to modules/role/templates/exim/exim4.conf.rt.erb diff --git a/templates/exim/system_filter.conf.erb b/modules/role/templates/exim/system_filter.conf.erb similarity index 100% rename from templates/exim/system_filter.conf.erb rename to modules/role/templates/exim/system_filter.conf.erb diff --git a/templates/exim/system_filter.conf.mailman.erb b/modules/role/templates/exim/system_filter.conf.mailman.erb similarity index 100% rename from templates/exim/system_filter.conf.mailman.erb rename to modules/role/templates/exim/system_filter.conf.mailman.erb -- To view, visit https://gerrit.wikimedia.org/r/310838 To unsubscribe, visit https://gerrit
[MediaWiki-commits] [Gerrit] operations/puppet[production]: exim: move templates to the role module
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/310838 Change subject: exim: move templates to the role module .. exim: move templates to the role module Change-Id: I60dd84e00a582846c471874442571c00f6d09a6e --- M modules/role/manifests/lists/server.pp M modules/role/manifests/mail/mx.pp M modules/role/manifests/phabricator/main.pp M modules/role/manifests/requesttracker/server.pp R modules/role/templates/exim/exim4.conf.mailman.erb R modules/role/templates/exim/exim4.conf.mx.erb R modules/role/templates/exim/exim4.conf.phab.erb R modules/role/templates/exim/exim4.conf.rt.erb R modules/role/templates/exim/system_filter.conf.erb R modules/role/templates/exim/system_filter.conf.mailman.erb 10 files changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/310838/1 diff --git a/modules/role/manifests/lists/server.pp b/modules/role/manifests/lists/server.pp index 4f411e4..b6ef2c4 100644 --- a/modules/role/manifests/lists/server.pp +++ b/modules/role/manifests/lists/server.pp @@ -44,8 +44,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.mailman.erb'), -filter => template('exim/system_filter.conf.mailman.erb'), +config => template('role/exim/exim4.conf.mailman.erb'), +filter => template('role/exim/system_filter.conf.mailman.erb'), require => [ Class['spamassassin'], Interface::Ip['lists.wikimedia.org_v4'], @@ -174,4 +174,3 @@ rule => 'proto tcp dport 783 { saddr (127.0.0.1 ::1) ACCEPT; }' } } - diff --git a/modules/role/manifests/mail/mx.pp b/modules/role/manifests/mail/mx.pp index c9457a8..4f9a3d1 100644 --- a/modules/role/manifests/mail/mx.pp +++ b/modules/role/manifests/mail/mx.pp @@ -36,8 +36,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.mx.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.mx.erb'), +filter => template('role/exim/system_filter.conf.erb'), require => Class['spamassassin'], } include exim4::ganglia diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index d7b0951..093329d 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -120,8 +120,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.phab.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.phab.erb'), +filter => template('role/exim/system_filter.conf.erb'), } include exim4::ganglia diff --git a/modules/role/manifests/requesttracker/server.pp b/modules/role/manifests/requesttracker/server.pp index 45fcf8a..a07d05f 100644 --- a/modules/role/manifests/requesttracker/server.pp +++ b/modules/role/manifests/requesttracker/server.pp @@ -15,8 +15,8 @@ class { 'exim4': variant => 'heavy', -config => template('exim/exim4.conf.rt.erb'), -filter => template('exim/system_filter.conf.erb'), +config => template('role/exim/exim4.conf.rt.erb'), +filter => template('role/exim/system_filter.conf.erb'), } include exim4::ganglia @@ -34,4 +34,3 @@ } } - diff --git a/templates/exim/exim4.conf.mailman.erb b/modules/role/templates/exim/exim4.conf.mailman.erb similarity index 100% rename from templates/exim/exim4.conf.mailman.erb rename to modules/role/templates/exim/exim4.conf.mailman.erb diff --git a/templates/exim/exim4.conf.mx.erb b/modules/role/templates/exim/exim4.conf.mx.erb similarity index 100% rename from templates/exim/exim4.conf.mx.erb rename to modules/role/templates/exim/exim4.conf.mx.erb diff --git a/templates/exim/exim4.conf.phab.erb b/modules/role/templates/exim/exim4.conf.phab.erb similarity index 100% rename from templates/exim/exim4.conf.phab.erb rename to modules/role/templates/exim/exim4.conf.phab.erb diff --git a/templates/exim/exim4.conf.rt.erb b/modules/role/templates/exim/exim4.conf.rt.erb similarity index 100% rename from templates/exim/exim4.conf.rt.erb rename to modules/role/templates/exim/exim4.conf.rt.erb diff --git a/templates/exim/system_filter.conf.erb b/modules/role/templates/exim/system_filter.conf.erb similarity index 100% rename from templates/exim/system_filter.conf.erb rename to modules/role/templates/exim/system_filter.conf.erb diff --git a/templates/exim/system_filter.conf.mailman.erb b/modules/role/templates/exim/system_filter.conf.mailman.erb similarity index 100% rename from templates/exim/system_filter.conf.mailman.erb rename to modules/role/templates/exim/system_filter.conf.mailman.erb -- To view, visit https://gerrit.wikimedia.org/r/310838