Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403730 )
Change subject: ci: replace apache with httpd for proxy/website
......................................................................
ci: replace apache with httpd for proxy/website
Change-Id: I0856fa1aa168912f1220695e8d55a45883819810
---
M modules/profile/manifests/ci/proxy_common.pp
M modules/profile/manifests/ci/website.pp
M modules/profile/manifests/ci/worker_localhost.pp
3 files changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/403730/1
diff --git a/modules/profile/manifests/ci/proxy_common.pp
b/modules/profile/manifests/ci/proxy_common.pp
index 15d087d..016cc61 100644
--- a/modules/profile/manifests/ci/proxy_common.pp
+++ b/modules/profile/manifests/ci/proxy_common.pp
@@ -1,9 +1,7 @@
# Basic configuration of Apache as a proxy
class profile::ci::proxy_common {
- class { '::apache': }
- class { '::apache::mod::php5': }
- class { '::apache::mod::proxy': }
- class { '::apache::mod::proxy_http': }
-
+ class { '::httpd':
+ modules => ['php5', 'proxy', 'proxy_http'],
+ }
}
diff --git a/modules/profile/manifests/ci/website.pp
b/modules/profile/manifests/ci/website.pp
index 8c1c307..b8495c4 100644
--- a/modules/profile/manifests/ci/website.pp
+++ b/modules/profile/manifests/ci/website.pp
@@ -7,21 +7,21 @@
class profile::ci::website {
# Need to send Vary: X-Forwarded-Proto since most sites are forced to HTTPS
# and behind a varnish cache. See also T62822
- class { '::apache::mod::headers': }
- class { '::apache::mod::rewrite': }
-
+ class { '::httpd':
+ modules => ['headers', 'rewrite'],
+ }
# Apache configuration for integration.wikimedia.org
- apache::site { 'integration.wikimedia.org':
+ httpd::site { 'integration.wikimedia.org':
content => template('contint/apache/integration.wikimedia.org.erb'),
}
# Apache configuration for integration.mediawiki.org
- apache::site { 'integration.mediawiki.org':
+ httpd::site { 'integration.mediawiki.org':
content => template('contint/apache/integration.mediawiki.org.erb'),
}
# Apache configuration for doc.wikimedia.org
- apache::site { 'doc.wikimedia.org':
+ httpd::site { 'doc.wikimedia.org':
content => template('contint/apache/doc.wikimedia.org.erb'),
}
diff --git a/modules/profile/manifests/ci/worker_localhost.pp
b/modules/profile/manifests/ci/worker_localhost.pp
index 8e3e6fd..7073409 100644
--- a/modules/profile/manifests/ci/worker_localhost.pp
+++ b/modules/profile/manifests/ci/worker_localhost.pp
@@ -17,7 +17,8 @@
group => 'root',
}
- class { '::apache::mod::rewrite':
+ class { '::httpd':
+ modules => ['rewrite'],
}
contint::localvhost { 'worker':
@@ -26,7 +27,7 @@
log_prefix => 'worker',
require => [
File['/srv/localhost-worker'],
- Class['::apache::mod::rewrite'],
+ Class['::httpd'],
],
}
--
To view, visit https://gerrit.wikimedia.org/r/403730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0856fa1aa168912f1220695e8d55a45883819810
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
