From 4380fa4f144313ecca564c831796be9673312116 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 8 Sep 2023 09:40:10 +0900 Subject: [PATCH] rgw: Use native class to enable mod-proxy_fcgi puppetlabs-apache provides the native class since 1.9.0[1]. [1] https://github.com/puppetlabs/puppetlabs-apache/commit/71cb7302f2d83d5a293dc22f22bb0b955b66684c Change-Id: I73474920b854034c2475df3d583f8fb8d8a5d538 --- manifests/rgw/apache_proxy_fcgi.pp | 2 +- spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/rgw/apache_proxy_fcgi.pp b/manifests/rgw/apache_proxy_fcgi.pp index 7a3807df..4c514513 100644 --- a/manifests/rgw/apache_proxy_fcgi.pp +++ b/manifests/rgw/apache_proxy_fcgi.pp @@ -104,7 +104,7 @@ define ceph::rgw::apache_proxy_fcgi ( include apache::mod::mime include apache::mod::rewrite include apache::mod::proxy - apache::mod { 'proxy_fcgi': } + include apache::mod::proxy_fcgi apache::vhost { "${rgw_dns_name}-radosgw": servername => $rgw_dns_name, diff --git a/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb b/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb index c3f3a144..86fcf470 100644 --- a/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb +++ b/spec/defines/ceph_rgw_apache_proxy_fcgi_spec.rb @@ -49,6 +49,7 @@ describe 'ceph::rgw::apache_proxy_fcgi' do it { should contain_class('apache::mod::auth_basic') } it { should contain_class('apache::mod::env') } it { should contain_class('apache::mod::proxy') } + it { should contain_class('apache::mod::proxy_fcgi') } it { should contain_class('apache::mod::mime') } it { should contain_class('apache::mod::rewrite') } end @@ -96,6 +97,7 @@ describe 'ceph::rgw::apache_proxy_fcgi' do it { should contain_class('apache::mod::alias') } it { should contain_class('apache::mod::proxy') } + it { should contain_class('apache::mod::proxy_fcgi') } it { should contain_class('apache::mod::mime') } it { should contain_class('apache::mod::rewrite') } end