[Pkg-freeipa-devel] [Git][freeipa-team/freeipa][master] 2 commits: pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch: Fix httpd_proxy install.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at FreeIPA packaging / freeipa


Commits:
7ac53c35 by Timo Aaltonen at 2020-03-19T06:08:52+02:00
pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch: Fix httpd_proxy install.

- - - - -
4aeccc3d by Timo Aaltonen at 2020-03-19T06:11:17+02:00
control: Bump dependency on apache2 to where mod_proxy_ajp got fixed.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/control.server
- + debian/patches/pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -13,6 +13,9 @@ freeipa (4.8.5-1) UNRELEASED; urgency=medium
   * rules: Import architecture.mk.
   * source: Update extend-diff-ignore.
   * server.install: Updated.
+  * pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch: Fix
+    httpd_proxy install.
+  * control: Bump dependency on apache2 to where mod_proxy_ajp got fixed.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 Nov 2019 15:07:31 +0200
 


=====================================
debian/control
=====================================
@@ -213,7 +213,7 @@ Depends:
  389-ds-base (>= 1.3.7.9),
  acl,
  adduser,
- apache2,
+ apache2 (>= 2.4.41-5),
  certmonger (>= 0.79.5-2),
  chrony,
  custodia (>= 0.5.0),


=====================================
debian/control.server
=====================================
@@ -7,7 +7,7 @@ Depends:
  389-ds-base (>= 1.3.7.9),
  acl,
  adduser,
- apache2,
+ apache2 (>= 2.4.41-5),
  certmonger (>= 0.79.5-2),
  chrony,
  custodia (>= 0.5.0),


=====================================
debian/patches/pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch
=====================================
@@ -0,0 +1,39 @@
+From 14c9cf99889fec73c46b33f94b0dc483c4542044 Mon Sep 17 00:00:00 2001
+From: Stanislav Levin <slev at altlinux.org>
+Date: Wed, 18 Mar 2020 11:09:01 +0300
+Subject: [PATCH] pki-proxy: Don't rely on running apache until it's configured
+
+This partially restores the pre-ec73de969f state of `http_proxy`,
+which fails to restart the apache service during master
+installation. The failure happens because of apache is not
+configured yet on 'pki-tomcatd' installation phase. The mentioned
+code and proposed one relies on the installer which bootstraps the
+master.
+
+Fixes: https://pagure.io/freeipa/issue/8233
+Signed-off-by: Stanislav Levin <slev at altlinux.org>
+Reviewed-By: Alexander Bokovoy <abokovoy at redhat.com>
+---
+ ipaserver/install/dogtaginstance.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
+index efcf81509..650ccfff9 100644
+--- a/ipaserver/install/dogtaginstance.py
++++ b/ipaserver/install/dogtaginstance.py
+@@ -363,12 +363,6 @@ class DogtagInstance(service.Service):
+         with open(paths.HTTPD_IPA_PKI_PROXY_CONF, "w") as fd:
+             fd.write(template)
+             os.fchmod(fd.fileno(), 0o640)
+-        # Restart httpd
+-        http_service = services.knownservices.httpd
+-        logger.debug("Restarting %s to apply AJP changes",
+-                     http_service.service_name)
+-        http_service.restart()
+-        logger.debug("%s successfully restarted", http_service.service_name)
+ 
+     def configure_certmonger_renewal_helpers(self):
+         """
+-- 
+2.25.1
+


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
 # upstreamed
+pki-proxy-Don-t-rely-on-running-apache-until-it-s-co.patch
 
 # not upstreamable
 



View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/96e92863d61a7e575c259025aafd4c52464d5f9a...4aeccc3dc9c8bb3ecb3e0f4c3f3c3cdd13297fab

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/freeipa/-/compare/96e92863d61a7e575c259025aafd4c52464d5f9a...4aeccc3dc9c8bb3ecb3e0f4c3f3c3cdd13297fab
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20200319/7412438c/attachment-0001.html>