rpms/ipa
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix upgrades harder (extension of -3 patch) (#1558354)

Browse Source
This commit is contained in:
Adam Williamson 2018-03-20 16:00:40 -07:00
parent bc96e5049b
commit 8bb66c5db7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0002-Make-sure-template-dictionary-has-WSGI_PREFIX_DIR-wh.patch
View File

@ -14,11 +14,15 @@ diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgr
index a38f4115c..807d674d7 100644 index a38f4115c..807d674d7 100644
--- a/ipaserver/install/server/upgrade.py --- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py
@@ -1651,6 +1651,7 @@ def upgrade_configuration(): @@ -1651,6 +1651,11 @@ def upgrade_configuration():
ds_dirname = dsinstance.config_dirname(ds_serverid) ds_dirname = dsinstance.config_dirname(ds_serverid)
+ sub_dict['WSGI_PREFIX_DIR'] = paths.WSGI_PREFIX_DIR + sub_dict['WSGI_PREFIX_DIR'] = paths.WSGI_PREFIX_DIR
+ sub_dict['GSSAPI_SESSION_KEY'] = paths.GSSAPI_SESSION_KEY
+ sub_dict['FONTS_DIR'] = paths.FONTS_DIR
+ sub_dict['IPA_CCACHES'] = paths.IPA_CCACHES
+ sub_dict['IPA_CUSTODIA_SOCKET'] = paths.IPA_CUSTODIA_SOCKET
upgrade_file(sub_dict, paths.HTTPD_IPA_CONF, upgrade_file(sub_dict, paths.HTTPD_IPA_CONF,
os.path.join(paths.USR_SHARE_IPA_DIR, os.path.join(paths.USR_SHARE_IPA_DIR,
"ipa.conf.template")) "ipa.conf.template"))

5
freeipa.spec
View File

@ -100,7 +100,7 @@
Name: freeipa Name: freeipa
Version: %{VERSION} Version: %{VERSION}
Release: 3%{?dist} Release: 4%{?dist}
Summary: The Identity, Policy and Audit system Summary: The Identity, Policy and Audit system
Group: System Environment/Base Group: System Environment/Base
@ -1718,6 +1718,9 @@ fi
%endif # with_ipatests %endif # with_ipatests
%changelog %changelog
* Tue Mar 20 2018 Adam Williamson <awilliam@redhat.com> - 4.6.90.pre1-4
- Fix upgrades harder (extension of -3 patch) (#1558354)
* Tue Mar 20 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-3 * Tue Mar 20 2018 Alexander Bokovoy <abokovoy@redhat.com> - 4.6.90.pre1-3
- Fix upgrade from F27 to F28 (#1558354) - Fix upgrade from F27 to F28 (#1558354)