Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185148
Change subject: Rename download::wikimedia to just "dumps"
......................................................................
Rename download::wikimedia to just "dumps"
Now that download only contains download::wikimedia, rename it to dumps
and simplify the class structure & role class.
Change-Id: I01cbd2ec435cbe47518a3adc868a0ff0f555fe47
---
D manifests/role/download.pp
A manifests/role/dumps.pp
M manifests/site.pp
D modules/download/files/.pep8
D modules/download/manifests/init.pp
D modules/download/manifests/wikimedia.pp
R modules/dumps/files/lighttpd.conf
A modules/dumps/manifests/init.pp
8 files changed, 35 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/185148/1
diff --git a/manifests/role/download.pp b/manifests/role/download.pp
deleted file mode 100644
index dbc4122..0000000
--- a/manifests/role/download.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-# role classes for download servers
-
-# download.wikimedia.org
-class role::download::wikimedia {
- include ::download::wikimedia
-}
diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
new file mode 100644
index 0000000..db05e00
--- /dev/null
+++ b/manifests/role/dumps.pp
@@ -0,0 +1,12 @@
+# role classes for dumps.wikimedia.org
+
+class role::dumps
+ include ::dumps
+
+ system::role { 'dumps': description => 'dumps.wikimedia.org' }
+
+ monitoring::service { 'http':
+ description => 'HTTP',
+ check_command => 'check_http'
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index b33e7f8..58c46c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -637,8 +637,7 @@
include role::diamond
include role::dataset::systemusers
include role::dataset::primary
-# include role::download::secondary
- include role::download::wikimedia
+ include role::dumps
}
# eqiad dbs
@@ -1845,7 +1844,7 @@
include standard
include role::dataset::systemusers
include role::dataset::secondary
- include role::download::wikimedia
+ include role::dumps
}
node 'ms1002.eqiad.wmnet' {
diff --git a/modules/download/files/.pep8 b/modules/download/files/.pep8
deleted file mode 100644
index ad4323f..0000000
--- a/modules/download/files/.pep8
+++ /dev/null
@@ -1,5 +0,0 @@
-[pep8]
-
-# Suppress warnings:
-# E501: line too long
-ignore = E501
diff --git a/modules/download/manifests/init.pp
b/modules/download/manifests/init.pp
deleted file mode 100644
index c2663d1..0000000
--- a/modules/download/manifests/init.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class download {
- include download::wikimedia
-}
diff --git a/modules/download/manifests/wikimedia.pp
b/modules/download/manifests/wikimedia.pp
deleted file mode 100644
index 5a14150..0000000
--- a/modules/download/manifests/wikimedia.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class download::wikimedia {
- system::role { 'download::wikimedia': description =>
'download.wikimedia.org' }
-
- package { 'lighttpd':
- ensure => latest,
- }
-
- install_certificate{ 'dumps.wikimedia.org': ca => 'RapidSSL_CA.pem' }
-
- file { '/etc/lighttpd/lighttpd.conf':
- mode => '0444',
- owner => 'root',
- group => 'root',
- path => '/etc/lighttpd/lighttpd.conf',
- source => 'puppet:///modules/download/lighttpd.conf',
- }
-
- service { 'lighttpd':
- ensure => running,
- }
-
- include vm::higher_min_free_kbytes
-
- monitoring::service { 'lighttpd http':
- description => 'LighttpdHTTP',
- check_command => 'check_http'
- }
-}
diff --git a/modules/download/files/lighttpd.conf
b/modules/dumps/files/lighttpd.conf
similarity index 100%
rename from modules/download/files/lighttpd.conf
rename to modules/dumps/files/lighttpd.conf
diff --git a/modules/dumps/manifests/init.pp b/modules/dumps/manifests/init.pp
new file mode 100644
index 0000000..bc9dd3d
--- /dev/null
+++ b/modules/dumps/manifests/init.pp
@@ -0,0 +1,21 @@
+class dumps {
+ package { 'lighttpd':
+ ensure => latest,
+ }
+
+ install_certificate{ 'dumps.wikimedia.org': ca => 'RapidSSL_CA.pem' }
+
+ file { '/etc/lighttpd/lighttpd.conf':
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ path => '/etc/lighttpd/lighttpd.conf',
+ source => 'puppet:///modules/dumps/lighttpd.conf',
+ }
+
+ service { 'lighttpd':
+ ensure => running,
+ }
+
+ include vm::higher_min_free_kbytes
+}
--
To view, visit https://gerrit.wikimedia.org/r/185148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01cbd2ec435cbe47518a3adc868a0ff0f555fe47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
