Hello jenkins-bot, Dzahn,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/393064
to review the following change.
Change subject: Revert "planet: Add support for http/2 on stretch"
......................................................................
Revert "planet: Add support for http/2 on stretch"
This reverts commit 008b62f404857248f8b551878521c19c6f36d71a.
Change-Id: Ib02960bfbcc5d770d40efff8f548d37fd7b5fb40
---
M modules/planet/manifests/init.pp
A modules/planet/manifests/webserver.pp
M modules/role/manifests/planet_server.pp
3 files changed, 8 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/393064/1
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 391e543..6ededf5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -28,6 +28,7 @@
include ::locales::extended
# things done once for all planets
+ include ::planet::webserver
include ::planet::packages
include ::planet::dirs
include ::planet::user
diff --git a/modules/planet/manifests/webserver.pp
b/modules/planet/manifests/webserver.pp
new file mode 100644
index 0000000..53b5bfd
--- /dev/null
+++ b/modules/planet/manifests/webserver.pp
@@ -0,0 +1,7 @@
+# sets up Apache for a planet-venus setup
+class planet::webserver {
+ include ::apache
+ include ::apache::mod::rewrite
+ # so we can vary on X-Forwarded-Proto when behind misc-web
+ include ::apache::mod::headers
+}
diff --git a/modules/role/manifests/planet_server.pp
b/modules/role/manifests/planet_server.pp
index 1014917..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,15 +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': }
- if os_version('debian >= stretch') {
- class { '::apache::mod::http2': }
- }
-
include ::profile::planet::venus
system::role { 'planet_server':
--
To view, visit https://gerrit.wikimedia.org/r/393064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib02960bfbcc5d770d40efff8f548d37fd7b5fb40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
