Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400245 )
Change subject: microsites::peopleweb: convert role to profile
......................................................................
microsites::peopleweb: convert role to profile
Change-Id: Id4f0641bd382682ff3c5ae8d9a22efbfed0834a4
---
A modules/profile/manifests/microsites/peopleweb.pp
M modules/role/manifests/microsites/peopleweb.pp
2 files changed, 25 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/microsites/peopleweb.pp
b/modules/profile/manifests/microsites/peopleweb.pp
new file mode 100644
index 0000000..0514bb9
--- /dev/null
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -0,0 +1,22 @@
+# let users publish their own HTML in their home dirs
+class profile::microsites::peopleweb {
+
+ class { '::publichtml':
+ sitename => 'people.wikimedia.org',
+ server_admin => 'n...@wikimedia.org',
+ }
+
+ ferm::service { 'people-http':
+ proto => 'tcp',
+ port => '80',
+ srange => '$CACHE_MISC',
+ }
+
+ 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.pp
b/modules/role/manifests/microsites/peopleweb.pp
index 26c0cb8..f9a85e9 100644
--- a/modules/role/manifests/microsites/peopleweb.pp
+++ b/modules/role/manifests/microsites/peopleweb.pp
@@ -1,26 +1,11 @@
# let users publish their own HTML in their home dirs
class role::microsites::peopleweb {
+ system::role { $name: }
+
include ::standard
include ::profile::base::firewall
include ::profile::backup::host
-
- class { '::publichtml':
- sitename => 'people.wikimedia.org',
- server_admin => 'n...@wikimedia.org',
- }
-
- ferm::service { 'people-http':
- proto => 'tcp',
- port => '80',
- srange => '$CACHE_MISC',
- }
-
- 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': }
+ include ::profile::microsites::peopleweb
}
--
To view, visit https://gerrit.wikimedia.org/r/400245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f0641bd382682ff3c5ae8d9a22efbfed0834a4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
