Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402165 )
Change subject: planet: switch from module apache to module httpd
......................................................................
planet: switch from module apache to module httpd
The new module httpd has been added I7d8bc4c6ed8105021
to replace the apache module.
This will be the first service using it and we can fix
style issues due to inclusion of apache classes.
One little change from apache module is that the
priority parameter now must be an integer and it accepted
a string before. So i need to remove those quotes.
Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
---
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
M modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet_server.pp
4 files changed, 8 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/planet/manifests/apachesite.pp
b/modules/planet/manifests/apachesite.pp
index 939017e..9d56219 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -2,12 +2,12 @@
define planet::apachesite {
if $title == 'en' {
- $priority = '10'
+ $priority = 10
} else {
- $priority = '50'
+ $priority = 50
}
- apache::site { "${title}.planet.${planet::planet_domain_name}":
+ httpd::site { "${title}.planet.${planet::planet_domain_name}":
content => template('planet/apache/planet-language.erb'),
priority => $priority,
}
diff --git a/modules/planet/manifests/index_site.pp
b/modules/planet/manifests/index_site.pp
index d0b08cb..5a14980 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,7 @@
# sets up the planet-venus index/portal site
class planet::index_site {
- apache::site { "planet.${planet::planet_domain_name}":
+ httpd::site { "planet.${planet::planet_domain_name}":
content => template('planet/apache/planet.erb'),
}
diff --git a/modules/profile/manifests/planet/venus.pp
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..058b953 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -190,6 +190,10 @@
planet_http_proxy => $planet_http_proxy,
}
+ class {'::httpd':
+ modules => ['rewrite', 'headers'],
+ }
+
ferm::service { 'planet-http':
proto => 'tcp',
port => '80',
diff --git a/modules/role/manifests/planet_server.pp
b/modules/role/manifests/planet_server.pp
index ecee04b..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,12 +3,6 @@
include ::standard
include ::profile::base::firewall
-
- class { '::apache': }
- class { '::apache::mod::rewrite': }
- # so we can vary on X-Forwarded-Proto when behind misc-web
- class { '::apache::mod::headers': }
-
include ::profile::planet::venus
system::role { 'planet_server':
--
To view, visit https://gerrit.wikimedia.org/r/402165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
Gerrit-PatchSet: 2
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
