fix-ipa-conf.diff: Dropped, upstream.

debian/changelog

@@ -1,6 +1,7 @@
 freeipa (4.7.0~pre1+git20180404-1) UNRELEASED; urgency=medium
 
   * New upstream prerelease.
+  * fix-ipa-conf.diff: Dropped, upstream.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 06 Apr 2018 16:18:42 +0300
 

debian/patches/fix-ipa-conf.diff

@@ -1,41 +0,0 @@
-Description: Fix paths
---- a/install/conf/ipa.conf
-+++ b/install/conf/ipa.conf
-@@ -47,7 +47,7 @@ FileETag None
- 
- # 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 /run/httpd/wsgi
-+WSGISocketPrefix /run/apache2/wsgi
- 
- 
- # Configure mod_wsgi handler for /ipa
-@@ -129,7 +129,7 @@ Alias /ipa/session/cookie "/usr/share/ip
-   SessionCookieName ipa_session path=/ipa;httponly;secure;
-   SessionHeader IPASESSION
-   SessionMaxAge 1800
--  GssapiSessionKey file:/etc/httpd/alias/ipasession.key
-+  GssapiSessionKey file:/etc/apache2/ipasession.key
- 
-   Header unset Set-Cookie
- </Location>
-@@ -149,7 +149,7 @@ Alias /ipa/session/cookie "/usr/share/ip
- # Custodia stuff is redirected to the custodia daemon
- # after authentication
- <Location "/ipa/keys/">
--    ProxyPass "unix:/run/httpd/ipa-custodia.sock|http://localhost/keys/"
-+    ProxyPass "unix:/run/apache2/ipa-custodia.sock|http://localhost/keys/"
-     RequestHeader set GSS_NAME %{GSS_NAME}s
-     RequestHeader set REMOTE_USER %{REMOTE_USER}s
- </Location>
-@@ -183,8 +183,8 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
- 
- 
- #  List explicitly only the fonts we want to serve
--Alias /ipa/ui/fonts/open-sans "/usr/share/fonts/open-sans"
--Alias /ipa/ui/fonts/fontawesome "/usr/share/fonts/fontawesome"
-+Alias /ipa/ui/fonts/open-sans "/usr/share/fonts/truetype/open-sans"
-+Alias /ipa/ui/fonts/fontawesome "/usr/share/fonts/truetype/font-awesome"
- <Directory "/usr/share/fonts">
-   SetHandler None
-   AllowOverride None

debian/patches/series

@@ -5,7 +5,6 @@ hack-libarch.diff
 enable-mod-nss-during-setup.diff
 
 # send upstream
-fix-ipa-conf.diff
 fix-replicainstall.diff
 create-sysconfig-ods.diff
 fix-named-conf-template.diff