Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61153
Change subject: Ceph: more radosgw changes, drop apache::mod
......................................................................
Ceph: more radosgw changes, drop apache::mod
We don't do pluginsync and it's silly to call out to ruby types for a
simple symlink. It's ugly though, but it will do until we replace the
apache module altogether by something sensible.
Also remove the Apache <IfModule>s. If they're not loaded, something's
wrong and we shouldn't bring up Apache anyway.
Change-Id: Ie0772296e4b8346ab3f6155062168b43210f101c
---
M modules/ceph/manifests/radosgw.pp
M modules/ceph/templates/radosgw/vhost.erb
2 files changed, 22 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/61153/1
diff --git a/modules/ceph/manifests/radosgw.pp
b/modules/ceph/manifests/radosgw.pp
index 67b10b3..b4ffa99 100644
--- a/modules/ceph/manifests/radosgw.pp
+++ b/modules/ceph/manifests/radosgw.pp
@@ -48,15 +48,25 @@
group => 'root',
}
+ # install apache + fastcgi + rewrite. fcgid doesn't stream
+ # the standard apache module is crap really, so this isn't great
class { 'apache':
default_mods => false,
serveradmin => $serveradmin,
}
- apache::mod { 'fastcgi':
- package => 'libapache2-mod-fastcgi',
+ package { 'libapache2-mod-fastcgi':
+ ensure => present,
+ require => Package['apache2'],
+ notify => Service['apache2'],
}
- apache::mod { 'rewrite': }
+ file { '/etc/apache2/mods-enabled/rewrite.load':
+ ensure => link,
+ target => '../mods-available/rewrite.load',
+ require => Package['apache2'],
+ notify => Service['apache2'],
+ }
+ # VirtualHost config
file { '/etc/apache2/sites-available/radosgw':
ensure => present,
owner => 'root',
@@ -77,6 +87,8 @@
notify => Service['apache2'],
}
+ # just a simple file to be able to do health checks on Apache
+ # /monitoring/backend also exists but is routed over to radosgw
file { '/var/www/monitoring':
ensure => directory,
owner => 'root',
diff --git a/modules/ceph/templates/radosgw/vhost.erb
b/modules/ceph/templates/radosgw/vhost.erb
index 4f634c7..8f4b0e5 100644
--- a/modules/ceph/templates/radosgw/vhost.erb
+++ b/modules/ceph/templates/radosgw/vhost.erb
@@ -2,9 +2,7 @@
ServerLimit 50
MaxClients 800
-<IfModule mod_fastcgi.c>
FastCgiExternalServer /var/www/dummyradosgw.fcgi -socket /run/radosgw.sock
-</IfModule>
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\"
\"%{User-Agent}i\"" proxy_combined
LogFormat "%{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %O \"%{Referer}i\"
\"%{User-Agent}i\"" proxy_debug
@@ -15,22 +13,18 @@
ServerSignature Off
DocumentRoot /var/www/
- <IfModule mod_rewrite.c>
RewriteEngine On
RewriteCond %{REQUEST_URI} !^/server-status
RewriteCond %{REQUEST_URI} !^/monitoring/frontend$
RewriteRule ^/(.*) /dummyradosgw.fcgi?params=$1&%{QUERY_STRING}
[E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
- </IfModule>
- <IfModule mod_fastcgi.c>
- <Directory /var/www/>
- Options +ExecCGI
- AllowOverride All
- Order allow,deny
- Allow from all
- AuthBasicAuthoritative Off
- </Directory>
- </IfModule>
+ <Directory /var/www/>
+ Options +ExecCGI
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+ AuthBasicAuthoritative Off
+ </Directory>
<Location /server-status>
SetHandler server-status
--
To view, visit https://gerrit.wikimedia.org/r/61153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0772296e4b8346ab3f6155062168b43210f101c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
