jenkins-bot has submitted this change and it was merged.
Change subject: Rename module exim-conf to eximconf
......................................................................
Rename module exim-conf to eximconf
Satisfies puppet-lint-strict check WARNING class name containing a dash
(names_containing_dash)
Change-Id: I4c66f259d858bb2f7f494d55f1a1617128a1ceed
---
D puppet/modules/exim-conf/manifests/es.pp
D puppet/modules/exim-conf/manifests/web1.pp
R puppet/modules/eximconf/files/exim4.conf
R puppet/modules/eximconf/files/exim4.conf-es
R puppet/modules/eximconf/files/exim4.conf-web1
A puppet/modules/eximconf/manifests/es.pp
R puppet/modules/eximconf/manifests/init.pp
A puppet/modules/eximconf/manifests/web1.pp
M puppet/site.pp
9 files changed, 15 insertions(+), 15 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/exim-conf/manifests/es.pp
b/puppet/modules/exim-conf/manifests/es.pp
deleted file mode 100644
index 9646518..0000000
--- a/puppet/modules/exim-conf/manifests/es.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class exim-conf::es {
- class { 'exim':
- source => 'puppet:///modules/exim-conf/exim4.conf-es'
- }
-}
diff --git a/puppet/modules/exim-conf/manifests/web1.pp
b/puppet/modules/exim-conf/manifests/web1.pp
deleted file mode 100644
index 868d2f3..0000000
--- a/puppet/modules/exim-conf/manifests/web1.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class exim-conf::web1 {
- class { 'exim':
- source => 'puppet:///modules/exim-conf/exim4.conf-web1'
- }
-}
diff --git a/puppet/modules/exim-conf/files/exim4.conf
b/puppet/modules/eximconf/files/exim4.conf
similarity index 100%
rename from puppet/modules/exim-conf/files/exim4.conf
rename to puppet/modules/eximconf/files/exim4.conf
diff --git a/puppet/modules/exim-conf/files/exim4.conf-es
b/puppet/modules/eximconf/files/exim4.conf-es
similarity index 100%
rename from puppet/modules/exim-conf/files/exim4.conf-es
rename to puppet/modules/eximconf/files/exim4.conf-es
diff --git a/puppet/modules/exim-conf/files/exim4.conf-web1
b/puppet/modules/eximconf/files/exim4.conf-web1
similarity index 100%
rename from puppet/modules/exim-conf/files/exim4.conf-web1
rename to puppet/modules/eximconf/files/exim4.conf-web1
diff --git a/puppet/modules/eximconf/manifests/es.pp
b/puppet/modules/eximconf/manifests/es.pp
new file mode 100644
index 0000000..26521e3
--- /dev/null
+++ b/puppet/modules/eximconf/manifests/es.pp
@@ -0,0 +1,5 @@
+class eximconf::es {
+ class { 'exim':
+ source => 'puppet:///modules/eximconf/exim4.conf-es'
+ }
+}
diff --git a/puppet/modules/exim-conf/manifests/init.pp
b/puppet/modules/eximconf/manifests/init.pp
similarity index 79%
rename from puppet/modules/exim-conf/manifests/init.pp
rename to puppet/modules/eximconf/manifests/init.pp
index 66f0457..8c3a7fe 100644
--- a/puppet/modules/exim-conf/manifests/init.pp
+++ b/puppet/modules/eximconf/manifests/init.pp
@@ -1,4 +1,4 @@
-class exim-conf {
+class eximconf {
file { '/etc/mailname':
content => 'translatewiki.net'
}
diff --git a/puppet/modules/eximconf/manifests/web1.pp
b/puppet/modules/eximconf/manifests/web1.pp
new file mode 100644
index 0000000..4646438
--- /dev/null
+++ b/puppet/modules/eximconf/manifests/web1.pp
@@ -0,0 +1,5 @@
+class eximconf::web1 {
+ class { 'exim':
+ source => 'puppet:///modules/eximconf/exim4.conf-web1'
+ }
+}
diff --git a/puppet/site.pp b/puppet/site.pp
index 115a544..edbc1ac 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -20,8 +20,8 @@
include memcached
include nginx::sites
- include exim-conf
- include exim-conf::web1
+ include eximconf
+ include eximconf::web1
include mailman-conf
include kitano-nl
@@ -49,7 +49,7 @@
include users
include base::es
- include exim-conf
- include exim-conf::es
+ include eximconf
+ include eximconf::es
include profile::mwelasticsearch
}
--
To view, visit https://gerrit.wikimedia.org/r/246661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c66f259d858bb2f7f494d55f1a1617128a1ceed
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
