From 0c0a392dd0c8a7d77a1e9f571cf44c6af446c07f Mon Sep 17 00:00:00 2001
From: sudharsanomprakash <sudharsan.omprakash@yahoo.com>
Date: Thu, 15 Nov 2018 15:03:11 -0500
Subject: [PATCH] Don't use deprecated Apache Access options.

httpd-2.4+ has deprecated the Order, Allow and Deny directives. Use the Require directive instead.

Signed-off-by: Sudharsan Omprakash <sudharsan.omprakash@yahoo.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
---
 install/share/ipa-kdc-proxy.conf.template |  6 ++++--
 install/share/ipa.conf.template           | 11 ++++-------
 ipaserver/install/server/upgrade.py       |  6 +++++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/install/share/ipa-kdc-proxy.conf.template b/install/share/ipa-kdc-proxy.conf.template
index 672121922..143f40fa4 100644
--- a/install/share/ipa-kdc-proxy.conf.template
+++ b/install/share/ipa-kdc-proxy.conf.template
@@ -1,3 +1,6 @@
+#
+# VERSION 2 - DO NOT REMOVE THIS LINE
+#
 # Kerberos over HTTP / MS-KKDCP support (Kerberos KDC Proxy)
 #
 # The symlink from /etc/ipa/kdcproxy/ to /etc/httpd/conf.d/ is maintained
@@ -23,8 +26,7 @@ WSGIScriptReloading Off
 
 <Location "/KdcProxy">
   Satisfy Any
-  Order Deny,Allow
-  Allow from all
+  Require all granted
   WSGIProcessGroup kdcproxy
   WSGIApplicationGroup kdcproxy
 </Location>
diff --git a/install/share/ipa.conf.template b/install/share/ipa.conf.template
index 33ee0d4e2..806616682 100644
--- a/install/share/ipa.conf.template
+++ b/install/share/ipa.conf.template
@@ -1,5 +1,5 @@
 #
-# VERSION 29 - DO NOT REMOVE THIS LINE
+# VERSION 30 - DO NOT REMOVE THIS LINE
 #
 # This file may be overwritten on upgrades.
 #
@@ -108,8 +108,7 @@ Alias /ipa/session/cookie "/usr/share/ipa/gssapi.login"
 # Turn off Apache authentication for password/token based login pages
 <Location "/ipa/session/login_password">
   Satisfy Any
-  Order Deny,Allow
-  Allow from all
+  Require all granted
 </Location>
 
 # Login with user certificate/smartcard configuration
@@ -138,14 +137,12 @@ Alias /ipa/session/cookie "/usr/share/ipa/gssapi.login"
 
 <Location "/ipa/session/change_password">
   Satisfy Any
-  Order Deny,Allow
-  Allow from all
+  Require all granted
 </Location>
 
 <Location "/ipa/session/sync_token">
   Satisfy Any
-  Order Deny,Allow
-  Allow from all
+  Require all granted
 </Location>
 
 # Custodia stuff is redirected to the custodia daemon
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 698afd347..f1e78beb2 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -1790,7 +1790,8 @@ def upgrade_configuration():
         GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY,
         FONTS_DIR=paths.FONTS_DIR,
         IPA_CCACHES=paths.IPA_CCACHES,
-        IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET
+        IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET,
+        KDCPROXY_CONFIG=paths.KDCPROXY_CONFIG,
     )
 
     subject_base = find_subject_base()
@@ -1830,6 +1831,9 @@ def upgrade_configuration():
         upgrade_file(sub_dict, paths.HTTPD_IPA_REWRITE_CONF,
                      os.path.join(paths.USR_SHARE_IPA_DIR,
                                   "ipa-rewrite.conf.template"))
+        upgrade_file(sub_dict, paths.HTTPD_IPA_KDCPROXY_CONF,
+                     os.path.join(paths.USR_SHARE_IPA_DIR,
+                                  "ipa-kdc-proxy.conf.template"))
         if ca.is_configured():
             upgrade_file(
                 sub_dict,