Dzahn has submitted this change and it was merged.
Change subject: move microsite roles into a common place
......................................................................
move microsite roles into a common place
Move roles that setup microsites into one a common place.
This makes it easier to find similar roles in one place,
and it also moves more roles into proper autoloader layout.
Also move the peopleweb::migration class into a separate file.
Change-Id: I74c16340c44318876db701ff37f84f780a40c5d3
---
R hieradata/role/common/microsites/peopleweb.yaml
R hieradata/role/common/microsites/releases.yaml
D manifests/role/peopleweb.pp
M manifests/site.pp
R modules/role/manifests/microsites/annualreport.pp
A modules/role/manifests/microsites/peopleweb.pp
A modules/role/manifests/microsites/peopleweb/migration.pp
R modules/role/manifests/microsites/releases.pp
R modules/role/manifests/microsites/transparency.pp
9 files changed, 51 insertions(+), 48 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/peopleweb.yaml
b/hieradata/role/common/microsites/peopleweb.yaml
similarity index 100%
rename from hieradata/role/common/peopleweb.yaml
rename to hieradata/role/common/microsites/peopleweb.yaml
diff --git a/hieradata/role/common/releases.yaml
b/hieradata/role/common/microsites/releases.yaml
similarity index 100%
rename from hieradata/role/common/releases.yaml
rename to hieradata/role/common/microsites/releases.yaml
diff --git a/manifests/role/peopleweb.pp b/manifests/role/peopleweb.pp
deleted file mode 100644
index 5236388..0000000
--- a/manifests/role/peopleweb.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class role::peopleweb {
-
- include standard
-
- class { '::publichtml':
- sitename => 'people.wikimedia.org',
- server_admin => '[email protected]',
- }
-
- ferm::service { 'people-http':
- proto => 'tcp',
- port => '80',
- }
-
- motd::script { 'people-motd':
- ensure => present,
- content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles
you put in 'public_html' in your home dir will be accessible on the web.\nMore
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
- }
-
- backup::set {'home': }
-}
-
-class role::peopleweb::migration {
-
- $sourceip='10.64.32.13'
-
- ferm::service { 'peopleweb-migration-rysnc':
- proto => 'tcp',
- port => '873',
- srange => "${sourceip}/32",
- }
-
- include rsync::server
-
- rsync::server::module { 'people-homes':
- path => '/home',
- read_only => 'no',
- hosts_allow => $sourceip,
- }
-
-}
-
diff --git a/manifests/site.pp b/manifests/site.pp
index 54df25e..50a0eea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -217,7 +217,7 @@
# virtual machine for static misc. services
node 'bromine.eqiad.wmnet' {
- role bugzilla::static, annualreport, transparency, releases
+ role bugzilla::static, microsites::annualreport, microsites::transparency,
microsites::releases
include standard
}
@@ -2345,7 +2345,7 @@
}
node 'rutherfordium.eqiad.wmnet' {
- role peopleweb, backup::host
+ role microsites::peopleweb, backup::host
include base::firewall
}
diff --git a/manifests/role/annualreport.pp
b/modules/role/manifests/microsites/annualreport.pp
similarity index 63%
rename from manifests/role/annualreport.pp
rename to modules/role/manifests/microsites/annualreport.pp
index 3b1bd4b..6a2bde9 100644
--- a/manifests/role/annualreport.pp
+++ b/modules/role/manifests/microsites/annualreport.pp
@@ -1,9 +1,9 @@
# https://annual.wikimedia.org/
# microsite for the WMF annual report
# http://wikimediafoundation.org/wiki/Annual_Report
-class role::annualreport {
+class role::microsites::annualreport {
- system::role { 'role::annualreport': description => 'WMF Annual report
server - annual.wikimedia.org' }
+ system::role { 'role::microsites::annualreport': description => 'WMF
Annual report server - annual.wikimedia.org' }
include ::annualreport
include base::firewall
diff --git a/modules/role/manifests/microsites/peopleweb.pp
b/modules/role/manifests/microsites/peopleweb.pp
new file mode 100644
index 0000000..a576db7
--- /dev/null
+++ b/modules/role/manifests/microsites/peopleweb.pp
@@ -0,0 +1,23 @@
+# let users publish their own HTML in their home dirs
+class role::microsites::peopleweb {
+
+ include standard
+
+ class { '::publichtml':
+ sitename => 'people.wikimedia.org',
+ server_admin => '[email protected]',
+ }
+
+ ferm::service { 'people-http':
+ proto => 'tcp',
+ port => '80',
+ }
+
+ motd::script { 'people-motd':
+ ensure => present,
+ content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles
you put in 'public_html' in your home dir will be accessible on the web.\nMore
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
+ }
+
+ backup::set {'home': }
+}
+
diff --git a/modules/role/manifests/microsites/peopleweb/migration.pp
b/modules/role/manifests/microsites/peopleweb/migration.pp
new file mode 100644
index 0000000..e1c980f
--- /dev/null
+++ b/modules/role/manifests/microsites/peopleweb/migration.pp
@@ -0,0 +1,22 @@
+# sets up an rsyncd to copy people's home dirs
+# during a server upgrade/migration
+class role::microsites::peopleweb::migration {
+
+ $sourceip='10.64.32.13'
+
+ ferm::service { 'peopleweb-migration-rysnc':
+ proto => 'tcp',
+ port => '873',
+ srange => "${sourceip}/32",
+ }
+
+ include rsync::server
+
+ rsync::server::module { 'people-homes':
+ path => '/home',
+ read_only => 'no',
+ hosts_allow => $sourceip,
+ }
+
+}
+
diff --git a/manifests/role/releases.pp
b/modules/role/manifests/microsites/releases.pp
similarity index 95%
rename from manifests/role/releases.pp
rename to modules/role/manifests/microsites/releases.pp
index 464f5c3..26f78f6 100644
--- a/manifests/role/releases.pp
+++ b/modules/role/manifests/microsites/releases.pp
@@ -1,4 +1,4 @@
-class role::releases {
+class role::microsites::releases {
system::role { 'releases': description => 'Releases webserver' }
include base::firewall
diff --git a/manifests/role/transparency.pp
b/modules/role/manifests/microsites/transparency.pp
similarity index 94%
rename from manifests/role/transparency.pp
rename to modules/role/manifests/microsites/transparency.pp
index bb761ad..e031b8a 100644
--- a/manifests/role/transparency.pp
+++ b/modules/role/manifests/microsites/transparency.pp
@@ -3,7 +3,7 @@
# This role provisions the Wikimedia Transparency Report static site,
# hosted at <http://transparency.wikimedia.org>.
#
-class role::transparency {
+class role::microsites::transparency {
include ::apache
include ::apache::mod::rewrite
include ::apache::mod::headers
--
To view, visit https://gerrit.wikimedia.org/r/275034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74c16340c44318876db701ff37f84f780a40c5d3
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
