jenkins-bot has submitted this change and it was merged.
Change subject: Rename module mailman-conf to mailmanconf
......................................................................
Rename module mailman-conf to mailmanconf
Satisfies puppet-lint-strict check WARNING class name containing a dash
(names_containing_dash)
Change-Id: I73a01dd1441275618b123fb14106c9f5a6a2c151
---
R puppet/modules/mailmanconf/files/exim4/conf.d/main/04_mailman_options
R puppet/modules/mailmanconf/files/exim4/conf.d/router/450_mailman_aliases
R puppet/modules/mailmanconf/files/exim4/conf.d/transport/40_mailman_pipe
R puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
R puppet/modules/mailmanconf/manifests/init.pp
M puppet/site.pp
6 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
b/puppet/modules/mailmanconf/files/exim4/conf.d/main/04_mailman_options
similarity index 100%
rename from
puppet/modules/mailman-conf/files/exim4/conf.d/main/04_mailman_options
rename to puppet/modules/mailmanconf/files/exim4/conf.d/main/04_mailman_options
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
b/puppet/modules/mailmanconf/files/exim4/conf.d/router/450_mailman_aliases
similarity index 100%
rename from
puppet/modules/mailman-conf/files/exim4/conf.d/router/450_mailman_aliases
rename to
puppet/modules/mailmanconf/files/exim4/conf.d/router/450_mailman_aliases
diff --git
a/puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
b/puppet/modules/mailmanconf/files/exim4/conf.d/transport/40_mailman_pipe
similarity index 100%
rename from
puppet/modules/mailman-conf/files/exim4/conf.d/transport/40_mailman_pipe
rename to
puppet/modules/mailmanconf/files/exim4/conf.d/transport/40_mailman_pipe
diff --git a/puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
b/puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
similarity index 100%
rename from puppet/modules/mailman-conf/files/nginx/lists.translatewiki.net
rename to puppet/modules/mailmanconf/files/nginx/lists.translatewiki.net
diff --git a/puppet/modules/mailman-conf/manifests/init.pp
b/puppet/modules/mailmanconf/manifests/init.pp
similarity index 82%
rename from puppet/modules/mailman-conf/manifests/init.pp
rename to puppet/modules/mailmanconf/manifests/init.pp
index 84953ef..00b8c4a 100644
--- a/puppet/modules/mailman-conf/manifests/init.pp
+++ b/puppet/modules/mailmanconf/manifests/init.pp
@@ -1,4 +1,4 @@
-class mailman-conf {
+class mailmanconf {
# Would prefer to just use "list" but the module does not support this, so
# make an alias
user {
@@ -23,7 +23,7 @@
}
file { '/etc/nginx/sites-available/lists.translatewiki.net':
- source => 'puppet:///modules/mailman-conf/nginx/lists.translatewiki.net',
+ source => 'puppet:///modules/mailmanconf/nginx/lists.translatewiki.net',
}
file { '/etc/nginx/sites-enabled/lists.translatewiki.net':
@@ -33,17 +33,17 @@
}
file { '/etc/exim4/conf.d/main/04_mailman_options':
- source =>
'puppet:///modules/mailman-conf/exim4/conf.d/main/04_mailman_options',
+ source =>
'puppet:///modules/mailmanconf/exim4/conf.d/main/04_mailman_options',
notify => Service['exim4'],
}
file { '/etc/exim4/conf.d/router/450_mailman_aliases':
- source =>
'puppet:///modules/mailman-conf/exim4/conf.d/router/450_mailman_aliases',
+ source =>
'puppet:///modules/mailmanconf/exim4/conf.d/router/450_mailman_aliases',
notify => Service['exim4'],
}
file { '/etc/exim4/conf.d/transport/40_mailman_pipe':
- source =>
'puppet:///modules/mailman-conf/exim4/conf.d/transport/40_mailman_pipe',
+ source =>
'puppet:///modules/mailmanconf/exim4/conf.d/transport/40_mailman_pipe',
notify => Service['exim4'],
}
diff --git a/puppet/site.pp b/puppet/site.pp
index 0928b44..352975b 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -22,7 +22,7 @@
include eximconf
include eximconf::web1
- include mailman-conf
+ include mailmanconf
include kitanonl
--
To view, visit https://gerrit.wikimedia.org/r/246663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73a01dd1441275618b123fb14106c9f5a6a2c151
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
