Faidon Liambotis has submitted this change and it was merged.
Change subject: releases: fold ::backup into role class
......................................................................
releases: fold ::backup into role class
Fold releases::backup into role::releases as including a role class from
a module is not very pretty. Also, since releases' job was only to
include releases::webserver and releases::backup, this means that we can
ditch the separate releases::webserver class and simplify things
overall. Win!
Change-Id: Ib65aa2c37e050bd4bb5959b6ee7eb07b2d06eac4
---
M manifests/role/releases.pp
D modules/releases/manifests/backups.pp
M modules/releases/manifests/init.pp
D modules/releases/manifests/webserver.pp
4 files changed, 30 insertions(+), 45 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index e8ebf30..ce4e9ff 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -29,6 +29,9 @@
proto => 'tcp',
port => '443',
}
+
+ include role::backup::host
+ backup::set { 'srv-org-wikimedia': }
}
class role::releases::upload {
diff --git a/modules/releases/manifests/backups.pp
b/modules/releases/manifests/backups.pp
deleted file mode 100644
index ef55a4c..0000000
--- a/modules/releases/manifests/backups.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class releases::backups {
- include role::backup::host
- backup::set { 'srv-org-wikimedia': }
-}
diff --git a/modules/releases/manifests/init.pp
b/modules/releases/manifests/init.pp
index 240f9ba..5c83c81 100644
--- a/modules/releases/manifests/init.pp
+++ b/modules/releases/manifests/init.pp
@@ -26,12 +26,33 @@
$docroot = undef,
$server_admin = '[email protected]',
) {
-
- class { 'releases::webserver':
- sitename => $sitename,
- docroot => $docroot,
- server_admin => $server_admin,
+ file { '/srv/org':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+ file { '/srv/org/wikimedia':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ }
+ file { "/srv/org/wikimedia/${docroot}":
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
- include 'releases::backups'
+ include 'webserver::apache'
+ include ::apache::mod::rewrite
+ @webserver::apache::site { $sitename:
+ docroot => "/srv/org/wikimedia/$docroot/",
+ server_admin => $server_admin,
+ require => [
+ Class['::apache::mod::rewrite'],
+ File['/srv/org/wikimedia/releases']
+ ],
+ }
}
diff --git a/modules/releases/manifests/webserver.pp
b/modules/releases/manifests/webserver.pp
deleted file mode 100644
index 77c4006..0000000
--- a/modules/releases/manifests/webserver.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class releases::webserver (
- $sitename = undef,
- $docroot = undef,
- $server_admin = undef,
-) {
- file { '/srv/org':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
- file { '/srv/org/wikimedia':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
- file { "/srv/org/wikimedia/${docroot}":
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
-
- include 'webserver::apache'
- include ::apache::mod::rewrite
- @webserver::apache::site { $sitename:
- docroot => "/srv/org/wikimedia/$docroot/",
- server_admin => $server_admin,
- require => [
- Class['::apache::mod::rewrite'],
- File['/srv/org/wikimedia/releases']
- ],
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/185145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib65aa2c37e050bd4bb5959b6ee7eb07b2d06eac4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
