diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-02-15 16:55:59 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-02-16 14:44:27 +0100 |
commit | 7cb549edefa717324d75577f122aa3545dfb9cb5 (patch) | |
tree | 4a96ffe9e9b98b03b0b97580fb35561431b6c1e5 /install | |
parent | c8cdb75e9bf72f9ef48eab2544c27d4303ef56c2 (diff) | |
download | freeipa.git-7cb549edefa717324d75577f122aa3545dfb9cb5.tar.gz freeipa.git-7cb549edefa717324d75577f122aa3545dfb9cb5.tar.xz freeipa.git-7cb549edefa717324d75577f122aa3545dfb9cb5.zip |
Enable ipa_memcached when upgrading
Add support for autobind to services. This is a bit of a special case
so I currently require the caller to specify ldapi separately. It only
makes sense to do this only in upgrade cases.
Also uninstall ipa_memcached when uninstalling the server.
https://fedorahosted.org/freeipa/ticket/2399
Diffstat (limited to 'install')
-rwxr-xr-x | install/tools/ipa-server-install | 1 | ||||
-rw-r--r-- | install/tools/ipa-upgradeconfig | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index f7de5440..28436220 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -464,6 +464,7 @@ def uninstall(): httpinstance.HTTPInstance(fstore).uninstall() krbinstance.KrbInstance(fstore).uninstall() dsinstance.DsInstance(fstore=fstore).uninstall() + memcacheinstance.MemcacheInstance().uninstall() fstore.restore_all_files() try: os.remove(ANSWER_CACHE) diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 764b17c4..725a9d10 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -29,12 +29,15 @@ try: from ipaserver.install import installutils from ipaserver.install import dsinstance from ipaserver.install import httpinstance + from ipaserver.install import memcacheinstance from ipaserver.install import service + import ldap import krbV import re import os import shutil import fileinput + import ipalib.errors except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -254,6 +257,15 @@ def main(): http = httpinstance.HTTPInstance() http.remove_httpd_ccache() + memcache = memcacheinstance.MemcacheInstance() + memcache.ldapi = True + memcache.realm = krbctx.default_realm + try: + if not memcache.is_configured(): + memcache.create_instance('MEMCACHE', fqdn, None, ipautil.realm_to_suffix(krbctx.default_realm)) + except (ldap.ALREADY_EXISTS, ipalib.errors.DuplicateEntry): + pass + try: if __name__ == "__main__": sys.exit(main()) |