From e2d7602c1dd656f874eca822d47f1571076a0ba3 Mon Sep 17 00:00:00 2001 From: Zoran Pericic Date: Wed, 2 Jun 2021 14:02:42 +0200 Subject: [PATCH] ipaserver: Put WSGI config to ipa-wsgi.conf --- install/share/Makefile.am | 1 + install/share/ipa-wsgi.conf.template | 15 +++++++++++++++ install/share/ipa.conf.template | 7 ------- ipaplatform/base/paths.py | 1 + ipaplatform/debian/paths.py | 1 + ipaplatform/suse/paths.py | 1 + ipaserver/install/httpinstance.py | 17 +++++++++++++++-- ipaserver/install/ipa_backup.py | 1 + ipaserver/install/server/upgrade.py | 3 +++ ipatests/test_integration/test_installation.py | 2 +- 10 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 install/share/ipa-wsgi.conf.template diff --git a/install/share/Makefile.am b/install/share/Makefile.am index e0fe4b7d1..796dfbe70 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -98,6 +98,7 @@ dist_app_DATA = \ kdcproxy.wsgi \ ipakrb5.aug \ ipa.conf.template \ + ipa-wsgi.conf.template \ ipa-kdc-proxy.conf.template \ ipa-pki-proxy.conf.template \ ipa-rewrite.conf.template \ diff --git a/install/share/ipa-wsgi.conf.template b/install/share/ipa-wsgi.conf.template new file mode 100644 index 000000000..e51a62a4f --- /dev/null +++ b/install/share/ipa-wsgi.conf.template @@ -0,0 +1,15 @@ +# +# VERSION 32 - DO NOT REMOVE THIS LINE +# +# This file may be overwritten on upgrades. +# + +# FIXME: WSGISocketPrefix is a server-scope directive. The mod_wsgi package +# should really be fixed by adding this its /etc/httpd/conf.d/wsgi.conf: +WSGISocketPrefix $WSGI_PREFIX_DIR + +# Configure mod_wsgi handler for /ipa +WSGIDaemonProcess ipa processes=$WSGI_PROCESSES threads=1 maximum-requests=500 \ + user=ipaapi group=ipaapi display-name=%{GROUP} socket-timeout=2147483647 \ + lang=C.UTF-8 locale=C.UTF-8 + diff --git a/install/share/ipa.conf.template b/install/share/ipa.conf.template index e68ced258..1a2528eeb 100644 --- a/install/share/ipa.conf.template +++ b/install/share/ipa.conf.template @@ -35,14 +35,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml \ application/javascript application/json text/css \ application/x-font-ttf -# FIXME: WSGISocketPrefix is a server-scope directive. The mod_wsgi package -# should really be fixed by adding this its /etc/httpd/conf.d/wsgi.conf: -WSGISocketPrefix $WSGI_PREFIX_DIR - # Configure mod_wsgi handler for /ipa -WSGIDaemonProcess ipa processes=$WSGI_PROCESSES threads=1 maximum-requests=500 \ - user=ipaapi group=ipaapi display-name=%{GROUP} socket-timeout=2147483647 \ - lang=C.UTF-8 locale=C.UTF-8 WSGIScriptAlias /ipa /usr/share/ipa/wsgi.py process-group=ipa \ application-group=%{GLOBAL} WSGIScriptReloading Off diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 729a66a62..947b4df37 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -50,6 +50,7 @@ class BasePathNamespace: HTTPD_IPA_PKI_PROXY_CONF = "/etc/httpd/conf.d/ipa-pki-proxy.conf" HTTPD_IPA_REWRITE_CONF = "/etc/httpd/conf.d/ipa-rewrite.conf" HTTPD_IPA_CONF = "/etc/httpd/conf.d/ipa.conf" + HTTPD_IPA_WSGI_CONF = "/etc/httpd/conf.d/ipa-wsgi.conf" HTTPD_NSS_CONF = "/etc/httpd/conf.d/nss.conf" HTTPD_SSL_CONF = "/etc/httpd/conf.d/ssl.conf" HTTPD_SSL_SITE_CONF = "/etc/httpd/conf.d/ssl.conf" diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index 8ac18d29c..ee44e40e2 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -24,6 +24,7 @@ class DebianPathNamespace(BasePathNamespace): HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf-enabled/ipa-pki-proxy.conf" HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf-available/ipa-rewrite.conf" HTTPD_IPA_CONF = "/etc/apache2/conf-enabled/ipa.conf" + HTTPD_IPA_WSGI_CONF = "/etc/apache2/conf-enabled/ipa-wsgi.conf" HTTPD_NSS_CONF = "/etc/apache2/mods-available/nss.conf" HTTPD_SSL_CONF = "/etc/apache2/mods-available/ssl.conf" HTTPD_SSL_SITE_CONF = "/etc/apache2/sites-available/default-ssl.conf" diff --git a/ipaplatform/suse/paths.py b/ipaplatform/suse/paths.py index cf0fe6a9f..f451280a0 100644 --- a/ipaplatform/suse/paths.py +++ b/ipaplatform/suse/paths.py @@ -21,6 +21,7 @@ class SusePathNamespace(BasePathNamespace): HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf.d/ipa-pki-proxy.conf" HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf.d/ipa-rewrite.conf" HTTPD_IPA_CONF = "/etc/apache2/conf.d/ipa.conf" + HTTPD_IPA_WSGI_CONF = "/etc/apache2/conf.d/ipa-wsgi.conf" HTTPD_NSS_CONF = "/etc/apache2/conf.d/nss.conf" HTTPD_SSL_CONF = "/etc/apache2/conf.d/ssl.conf" HTTPD_SSL_SITE_CONF = "/etc/apache2/conf.d/ssl.conf" diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 50ccf5e50..b41ff9d57 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -209,6 +209,17 @@ class HTTPInstance(service.Service): http_fd.close() os.chmod(target_fname, 0o644) + target_fname = paths.HTTPD_IPA_WSGI_CONF + http_txt = ipautil.template_file( + os.path.join(paths.USR_SHARE_IPA_DIR, + "ipa-wsgi.conf.template"), + self.sub_dict) + self.fstore.backup_file(paths.HTTPD_IPA_CONF) + http_fd = open(target_fname, "w") + http_fd.write(http_txt) + http_fd.close() + os.chmod(target_fname, 0o644) + target_fname = paths.HTTPD_IPA_REWRITE_CONF http_txt = ipautil.template_file( os.path.join(paths.USR_SHARE_IPA_DIR, @@ -539,8 +550,9 @@ class HTTPInstance(service.Service): ca_iface.Set('org.fedorahosted.certmonger.ca', 'external-helper', helper) - for f in [paths.HTTPD_IPA_CONF, paths.HTTPD_SSL_CONF, - paths.HTTPD_SSL_SITE_CONF, paths.HTTPD_NSS_CONF]: + for f in [paths.HTTPD_IPA_CONF, paths.HTTPD_IPA_WSGI_CONF, + paths.HTTPD_SSL_CONF, paths.HTTPD_SSL_SITE_CONF, + paths.HTTPD_NSS_CONF]: try: self.fstore.restore_file(f) except ValueError as error: @@ -554,6 +566,7 @@ class HTTPInstance(service.Service): paths.HTTPD_PASSWD_FILE_FMT.format(host=api.env.host), paths.HTTPD_IPA_REWRITE_CONF, paths.HTTPD_IPA_CONF, + paths.HTTPD_IPA_WSGI_CONF, paths.HTTPD_IPA_PKI_PROXY_CONF, paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK, paths.HTTPD_IPA_KDCPROXY_CONF, diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py index 2904c9e2e..a997e9196 100644 --- a/ipaserver/install/ipa_backup.py +++ b/ipaserver/install/ipa_backup.py @@ -154,6 +154,7 @@ class Backup(admintool.AdminTool): paths.HTTPD_CERT_FILE, paths.HTTPD_KEY_FILE, paths.HTTPD_IPA_CONF, + paths.HTTPD_WSGI_CONF, paths.SSHD_CONFIG, paths.SSHD_IPA_CONFIG, paths.SSH_CONFIG, diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index dd22ac24d..d5c7da70e 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1730,6 +1730,9 @@ def upgrade_configuration(): upgrade_file(sub_dict, paths.HTTPD_IPA_CONF, os.path.join(paths.USR_SHARE_IPA_DIR, "ipa.conf.template")) + upgrade_file(sub_dict, paths.HTTPD_IPA_WSGI_CONF, + os.path.join(paths.USR_SHARE_IPA_DIR, + "ipa-wsgi.conf.template")) upgrade_file(sub_dict, paths.HTTPD_IPA_REWRITE_CONF, os.path.join(paths.USR_SHARE_IPA_DIR, "ipa-rewrite.conf.template")) diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py index 7bf6aee73..ad02274ad 100644 --- a/ipatests/test_integration/test_installation.py +++ b/ipatests/test_integration/test_installation.py @@ -881,7 +881,7 @@ class TestInstallMaster(IntegrationTest): """ # check process count in httpd conf file i.e expected string exp = b'WSGIDaemonProcess ipa processes=%d' % constants.WSGI_PROCESSES - httpd_conf = self.master.get_file_contents(paths.HTTPD_IPA_CONF) + httpd_conf = self.master.get_file_contents(paths.HTTPD_IPA_WSGI_CONF) assert exp in httpd_conf # check the process count