From 8ad1daf24f603f025bbf124480abaf9433a8eeef Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 16 Feb 2022 01:39:50 +0900 Subject: [PATCH] CentOS 9: Fix unit tests for zaqar::wsgi::apache Change-Id: I12e82c520450584fc78e830a32551d6553c5030f --- spec/classes/zaqar_wsgi_apache_spec.rb | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/spec/classes/zaqar_wsgi_apache_spec.rb b/spec/classes/zaqar_wsgi_apache_spec.rb index b6f9bba..dcc8abf 100644 --- a/spec/classes/zaqar_wsgi_apache_spec.rb +++ b/spec/classes/zaqar_wsgi_apache_spec.rb @@ -91,12 +91,21 @@ describe 'zaqar::wsgi::apache' do :wsgi_script_source => '/usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py' } when 'RedHat' - { - :httpd_service_name => 'httpd', - :httpd_ports_file => '/etc/httpd/conf/ports.conf', - :wsgi_script_path => '/var/www/cgi-bin/zaqar', - :wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py' - } + if facts[:operatingsystemmajrelease].to_i > 8 + { + :httpd_service_name => 'httpd', + :httpd_ports_file => '/etc/httpd/conf/ports.conf', + :wsgi_script_path => '/var/www/cgi-bin/zaqar', + :wsgi_script_source => '/usr/lib/python3.9/site-packages/zaqar/transport/wsgi/app.py' + } + else + { + :httpd_service_name => 'httpd', + :httpd_ports_file => '/etc/httpd/conf/ports.conf', + :wsgi_script_path => '/var/www/cgi-bin/zaqar', + :wsgi_script_source => '/usr/lib/python3.6/site-packages/zaqar/transport/wsgi/app.py' + } + end end end