summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install/conf/ipa.conf3
-rw-r--r--install/tools/ipa-upgradeconfig2
2 files changed, 2 insertions, 3 deletions
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf
index 2339387a7..72e3e4c01 100644
--- a/install/conf/ipa.conf
+++ b/install/conf/ipa.conf
@@ -1,5 +1,5 @@
#
-# VERSION 3 - DO NOT REMOVE THIS LINE
+# VERSION 2 - DO NOT REMOVE THIS LINE
#
# LoadModule auth_kerb_module modules/mod_auth_kerb.so
@@ -45,7 +45,6 @@ WSGIScriptReloading Off
# Protect /ipa with Kerberos
<Location "/ipa">
- NSSRequireSSL
AuthType Kerberos
AuthName "Kerberos Login"
KrbMethodNegotiate on
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index cae0964d5..1b08382e4 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -116,7 +116,7 @@ def upgrade(sub_dict, filename, template, add=False):
if new < 0:
print "%s not found." % template
- if old < new:
+ if old < new or add:
backup_file(filename, new)
update_conf(sub_dict, filename, template)
print "Upgraded %s to version %d" % (filename, new)