← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freeipa/trusty-proposed

« back to all changes in this revision

Viewing changes to ipa-client/ipa-install/ipa-client-install

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-09-03 17:13:27 UTC
  • Revision ID: package-import@ubuntu.com-20130903171327-a47t1segjij5yjez
Tags: 3.3.4-0ubuntu1
Merge from unreleased debian git.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ipa-client/ipa-install/ipa-client-install
373
373
    # Always start certmonger. We can't untrack something if it isn't
374
374
    # running
375
375
    messagebus = ipaservices.knownservices.messagebus
376
 
    try:
377
 
        messagebus.start()
378
 
    except Exception, e:
379
 
        log_service_error(messagebus.service_name, 'start', e)
 
376
    if not messagebus.is_running():
 
377
        try:
 
378
            messagebus.start()
 
379
        except Exception, e:
 
380
            log_service_error(messagebus.service_name, 'start', e)
380
381
 
381
382
    cmonger = ipaservices.knownservices.certmonger
382
383
    try:
855
856
            {'action':'addifnotset', 'name':'TLS_CACERT', 'type':'option',
856
857
                'value':CACERT},]
857
858
 
858
 
    target_fname = '/etc/openldap/ldap.conf'
 
859
    target_fname = '/etc/ldap/ldap.conf'
859
860
    fstore.backup_file(target_fname)
860
861
 
861
862
    error_msg = "Configuring {path} failed with: {err}"
977
978
    principal = 'host/%s@%s' % (hostname, cli_realm)
978
979
 
979
980
    messagebus = ipaservices.knownservices.messagebus
980
 
    try:
981
 
        messagebus.start()
982
 
    except Exception, e:
983
 
        log_service_error(messagebus.service_name, 'start', e)
 
981
    if not messagebus.is_running():
 
982
        try:
 
983
            messagebus.start()
 
984
        except Exception, e:
 
985
            log_service_error(messagebus.service_name, 'start', e)
984
986
 
985
987
    # Ensure that certmonger has been started at least once to generate the
986
988
    # cas files in /var/lib/certmonger/cas.