From 34c9ee3d41db29340fb78df9509cbafe3c8c0be6 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Tue, 26 Feb 2013 12:42:00 +0100 Subject: [PATCH] manage rgw_port on radosgw recipe --- attributes/radosgw.rb | 2 +- templates/default/rgw.conf.erb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/attributes/radosgw.rb b/attributes/radosgw.rb index 0abf179..36aea39 100644 --- a/attributes/radosgw.rb +++ b/attributes/radosgw.rb @@ -19,4 +19,4 @@ default["ceph"]["radosgw"]["api_fqdn"] = "localhost" default["ceph"]["radosgw"]["admin_email"] = "admin@example.com" default["ceph"]["radosgw"]["rgw_addr"] = "*:80" - +default["ceph"]["radosgw"]["rgw_port"] = false diff --git a/templates/default/rgw.conf.erb b/templates/default/rgw.conf.erb index 11fb8f2..9a22c7a 100644 --- a/templates/default/rgw.conf.erb +++ b/templates/default/rgw.conf.erb @@ -1,4 +1,8 @@ +<% if node['ceph']['radosgw']['rgw_port'] -%> +FastCgiExternalServer /var/www/dummyradosgw.fcgi -host 127.0.0.1:<%= node['ceph']['radosgw']['rgw_port'] %> +<% else -%> FastCgiExternalServer /var/www/dummyradosgw.fcgi -socket /var/run/ceph/radosgw.client.radosgw.<%= node[:hostname] %> +<% end -%> 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