diff options
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-adtrust-install | 7 | ||||
| -rwxr-xr-x | install/tools/ipa-ca-install | 7 | ||||
| -rwxr-xr-x | install/tools/ipa-compat-manage | 3 | ||||
| -rwxr-xr-x | install/tools/ipa-dns-install | 5 | ||||
| -rwxr-xr-x | install/tools/ipa-nis-manage | 3 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 9 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-install | 21 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-manage | 3 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 29 | ||||
| -rw-r--r-- | install/tools/ipa-upgradeconfig | 47 |
10 files changed, 72 insertions, 62 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index 9b54abdaa..7b616c1b6 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -29,10 +29,11 @@ from ipapython import ipautil, sysrestore from ipalib import api, errors, util from ipapython.config import IPAOptionParser import krbV +from ipaplatform.paths import paths from ipapython.ipa_log_manager import * from ipapython.dn import DN -log_file_name = "/var/log/ipaserver-install.log" +log_file_name = paths.IPASERVER_INSTALL_LOG def parse_options(): parser = IPAOptionParser(version=version.VERSION) @@ -222,7 +223,7 @@ def main(): check_server_configuration() global fstore - fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') + fstore = sysrestore.FileStore(paths.SYSRESTORE) print "==============================================================================" print "This program will setup components needed to establish trust to AD domains for" @@ -276,7 +277,7 @@ def main(): allow_empty = False): sys.exit("Aborting installation.") - elif os.path.exists('/etc/samba/smb.conf'): + elif os.path.exists(paths.SMB_CONF): print("WARNING: The smb.conf already exists. Running " "ipa-adtrust-install will break your existing samba " "configuration.\n\n") diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 01f7b790e..3c9307edf 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -40,8 +40,9 @@ from ipapython import sysrestore from ipapython import dogtag from ipapython.ipa_log_manager import * from ipaplatform import services +from ipaplatform.paths import paths -log_file_name = "/var/log/ipareplica-ca-install.log" +log_file_name = paths.IPAREPLICA_CA_INSTALL_LOG REPLICA_INFO_TOP_DIR = None def parse_options(): @@ -105,7 +106,7 @@ def main(): sys.exit("Replica file %s does not exist" % filename) global sstore - sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore') + sstore = sysrestore.StateFile(paths.SYSRESTORE) if not dsinstance.DsInstance().is_configured(): sys.exit("IPA server is not configured on this system.\n") @@ -194,7 +195,7 @@ def main(): #update dogtag version in config file try: - fd = open("/etc/ipa/default.conf", "a") + fd = open(paths.IPA_DEFAULT_CONF, "a") fd.write( "dogtag_version=%s\n" % dogtag.install_constants.DOGTAG_VERSION) fd.close() diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 3cd75e22d..23b528f83 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -20,6 +20,7 @@ # import sys +from ipaplatform.paths import paths try: from optparse import OptionParser from ipapython import ipautil, config @@ -80,7 +81,7 @@ def get_entry(dn, conn): def main(): retval = 0 - files = ['/usr/share/ipa/schema_compat.uldif'] + files = [paths.SCHEMA_COMPAT_ULDIF] options, args = parse_options() diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 78acc2d9b..5e191974b 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -29,10 +29,11 @@ from ipaserver.install import installutils from ipapython import version from ipapython import ipautil, sysrestore from ipalib import api, errors, util +from ipaplatform.paths import paths from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import standard_logging_setup, root_logger -log_file_name = "/var/log/ipaserver-install.log" +log_file_name = paths.IPASERVER_INSTALL_LOG def parse_options(): parser = IPAOptionParser(version=version.VERSION) @@ -85,7 +86,7 @@ def main(): installutils.check_server_configuration() global fstore - fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') + fstore = sysrestore.FileStore(paths.SYSRESTORE) print "==============================================================================" print "This program will setup DNS for the FreeIPA Server." diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index ad2cd6d0d..b412bb0f5 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -21,6 +21,7 @@ import sys import os +from ipaplatform.paths import paths try: from optparse import OptionParser from ipapython import ipautil, config @@ -82,7 +83,7 @@ def get_entry(dn, conn): def main(): retval = 0 - files = ['/usr/share/ipa/nis.uldif'] + files = [paths.NIS_ULDIF] servicemsg = "" if os.getegid() != 0: diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index eafd37256..88e42bafb 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -37,11 +37,12 @@ import threading import errno from socket import SOCK_STREAM, SOCK_DGRAM import distutils.spawn +from ipaplatform.paths import paths CONNECT_TIMEOUT = 5 RESPONDERS = [ ] QUIET = False -CCACHE_FILE = "/etc/ipa/.conncheck_ccache" +CCACHE_FILE = paths.CONNCHECK_CCACHE KRB5_CONFIG = None class SshExec(object): @@ -168,7 +169,7 @@ def logging_setup(options): log_file = None if os.getegid() == 0: - log_file = "/var/log/ipareplica-conncheck.log" + log_file = paths.IPAREPLICA_CONNCHECK_LOG standard_logging_setup(log_file, debug=options.debug) @@ -372,7 +373,7 @@ def main(): stderr='' - (stdout, stderr, returncode) = ipautil.run(['/usr/bin/kinit', principal], + (stdout, stderr, returncode) = ipautil.run([paths.KINIT, principal], env={'KRB5_CONFIG':KRB5_CONFIG, 'KRB5CCNAME':CCACHE_FILE}, stdin=password, raiseonerr=False) if returncode != 0: @@ -380,7 +381,7 @@ def main(): # Verify kinit was actually successful stderr='' - (stdout, stderr, returncode) = ipautil.run(['/usr/bin/kvno', + (stdout, stderr, returncode) = ipautil.run([paths.BIN_KVNO, 'host/%s' % options.master], env={'KRB5_CONFIG':KRB5_CONFIG, 'KRB5CCNAME':CCACHE_FILE}, raiseonerr=False) diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 7658dfa66..5bfd61ee6 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -52,8 +52,9 @@ from ipapython.dn import DN import ipaclient.ntpconf from ipaplatform.tasks import tasks from ipaplatform import services +from ipaplatform.paths import paths -log_file_name = "/var/log/ipareplica-install.log" +log_file_name = paths.IPAREPLICA_INSTALL_LOG REPLICA_INFO_TOP_DIR = None DIRMAN_DN = DN(('cn', 'directory manager')) @@ -236,15 +237,15 @@ def install_http(config, auto_redirect): try: if ipautil.file_exists(config.dir + "/preferences.html"): shutil.copy(config.dir + "/preferences.html", - "/usr/share/ipa/html/preferences.html") + paths.PREFERENCES_HTML) if ipautil.file_exists(config.dir + "/configure.jar"): shutil.copy(config.dir + "/configure.jar", - "/usr/share/ipa/html/configure.jar") + paths.CONFIGURE_JAR) if ipautil.file_exists(config.dir + "/krb.js"): shutil.copy(config.dir + "/krb.js", - "/usr/share/ipa/html/krb.js") + paths.KRB_JS) shutil.copy(config.dir + "/kerberosauth.xpi", - "/usr/share/ipa/html/kerberosauth.xpi") + paths.KERBEROSAUTH_XPI) except Exception, e: print "error copying files: " + str(e) sys.exit(1) @@ -461,17 +462,17 @@ def main(): if not ipautil.file_exists(filename): sys.exit("Replica file %s does not exist" % filename) - client_fstore = sysrestore.FileStore('/var/lib/ipa-client/sysrestore') + client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) if client_fstore.has_files(): sys.exit("IPA client is already configured on this system.\n" + "Please uninstall it first before configuring the replica, " + "using 'ipa-client-install --uninstall'.") global sstore - sstore = sysrestore.StateFile('/var/lib/ipa/sysrestore') + sstore = sysrestore.StateFile(paths.SYSRESTORE) global fstore - fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') + fstore = sysrestore.FileStore(paths.SYSRESTORE) # check the bind is installed if options.setup_dns: @@ -559,7 +560,7 @@ def main(): # Note: We must do this before bootstraping and finalizing ipalib.api old_umask = os.umask(022) # must be readable for httpd try: - fd = open("/etc/ipa/default.conf", "w") + fd = open(paths.IPA_DEFAULT_CONF, "w") fd.write("[global]\n") fd.write("host=%s\n" % config.host_name) fd.write("basedn=%s\n" % str(ipautil.realm_to_suffix(config.realm_name))) @@ -728,7 +729,7 @@ def main(): # Call client install script try: - args = ["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name] + args = [paths.IPA_CLIENT_INSTALL, "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name] if not options.create_sshfp: args.append("--no-dns-sshfp") if options.trust_sshfp: diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index ee7aef881..d468850e5 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -38,6 +38,7 @@ from ipapython.dn import DN from ipapython.config import IPAOptionParser from ipaclient import ipadiscovery from xmlrpclib import MAXINT +from ipaplatform.paths import paths # dict of command name and tuples of min/max num of args needed commands = { @@ -1144,7 +1145,7 @@ def set_DNA_range(hostname, range, realm, dirman_passwd, next_range=False, def main(): if os.getegid() == 0: installutils.check_server_configuration() - elif not os.path.exists('/etc/ipa/default.conf'): + elif not os.path.exists(paths.IPA_DEFAULT_CONF): sys.exit("IPA is not configured on this system.") options, args = parse_options() diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index e3b7d5555..671a226d6 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -79,6 +79,7 @@ from ipapython.dn import DN import ipaclient.ntpconf from ipaplatform.tasks import tasks from ipaplatform import services +from ipaplatform.paths import paths uninstalling = False installation_cleanup = True @@ -91,7 +92,7 @@ VALID_SUBJECT_ATTRS = ['st', 'o', 'ou', 'dnqualifier', 'c', 'incorporationlocality', 'incorporationstate', 'incorporationcountry', 'businesscategory'] -SYSRESTORE_DIR_PATH = '/var/lib/ipa/sysrestore' +SYSRESTORE_DIR_PATH = paths.SYSRESTORE def subject_callback(option, opt_str, value, parser): """ @@ -335,7 +336,7 @@ def signal_handler(signum, frame): dsinstance.erase_ds_instance_data (ds.serverid) sys.exit(1) -ANSWER_CACHE = "/root/.ipa_cache" +ANSWER_CACHE = paths.ROOT_IPA_CACHE def read_cache(dm_password): """ @@ -469,7 +470,7 @@ def uninstall(): print "Shutting down all IPA services" try: - (stdout, stderr, rc) = run(["/usr/sbin/ipactl", "stop"], raiseonerr=False) + (stdout, stderr, rc) = run([paths.IPACTL, "stop"], raiseonerr=False) except Exception, e: pass @@ -478,7 +479,7 @@ def uninstall(): print "Removing IPA client configuration" try: - (stdout, stderr, rc) = run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--uninstall"], raiseonerr=False) + (stdout, stderr, rc) = run([paths.IPA_CLIENT_INSTALL, "--on-master", "--unattended", "--uninstall"], raiseonerr=False) if rc not in [0,2]: root_logger.debug("ipa-client-install returned %d" % rc) raise RuntimeError(stdout) @@ -588,10 +589,10 @@ def main(): if options.uninstall: uninstalling = True - standard_logging_setup("/var/log/ipaserver-uninstall.log", debug=options.debug) + standard_logging_setup(paths.IPASERVER_UNINSTALL_LOG, debug=options.debug) installation_cleanup = False else: - standard_logging_setup("/var/log/ipaserver-install.log", debug=options.debug) + standard_logging_setup(paths.IPASERVER_INSTALL_LOG, debug=options.debug) print "\nThe log file for this installation can be found in /var/log/ipaserver-install.log" if not options.external_ca and not options.external_cert_file and is_ipa_configured(): installation_cleanup = False @@ -599,7 +600,7 @@ def main(): "If you want to reinstall the IPA server, please uninstall " + "it first using 'ipa-server-install --uninstall'.") - client_fstore = sysrestore.FileStore('/var/lib/ipa-client/sysrestore') + client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) if client_fstore.has_files(): installation_cleanup = False sys.exit("IPA client is already configured on this system.\n" + @@ -1001,7 +1002,7 @@ def main(): installation_cleanup = False # Create the management framework config file and finalize api - target_fname = '/etc/ipa/default.conf' + target_fname = paths.IPA_DEFAULT_CONF fd = open(target_fname, "w") fd.write("[global]\n") fd.write("host=%s\n" % host_name) @@ -1093,7 +1094,7 @@ def main(): options.reverse_zone = reverse_zone write_cache(vars(options)) ca.configure_instance(host_name, domain_name, dm_password, - dm_password, csr_file="/root/ipa.csr", + dm_password, csr_file=paths.ROOT_IPA_CSR, subject_base=options.subject) else: # stage 2 of external CA installation @@ -1157,7 +1158,7 @@ def main(): http.create_instance( realm_name, host_name, domain_name, dm_password, subject_base=options.subject, auto_redirect=options.ui_redirect) - tasks.restore_context("/var/cache/ipa/sessions") + tasks.restore_context(paths.CACHE_IPA_SESSIONS) set_subject_in_config(realm_name, dm_password, ipautil.realm_to_suffix(realm_name), options.subject) @@ -1201,7 +1202,7 @@ def main(): # Call client install script try: - args = ["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", domain_name, "--server", host_name, "--realm", realm_name, "--hostname", host_name] + args = [paths.IPA_CLIENT_INSTALL, "--on-master", "--unattended", "--domain", domain_name, "--server", host_name, "--realm", realm_name, "--hostname", host_name] if not options.create_sshfp: args.append("--no-dns-sshfp") if options.trust_sshfp: @@ -1267,9 +1268,9 @@ if __name__ == '__main__': # out from all install scripts safe_options, options = parse_options() if options.uninstall: - log_file_name = "/var/log/ipaserver-uninstall.log" + log_file_name = paths.IPASERVER_UNINSTALL_LOG else: - log_file_name = "/var/log/ipaserver-install.log" + log_file_name = paths.IPASERVER_INSTALL_LOG # Use private ccache with private_ccache(): @@ -1282,6 +1283,6 @@ if __name__ == '__main__': # Do a cautious clean up as we don't know what failed and what is # the state of the environment try: - fstore.restore_file('/etc/hosts') + fstore.restore_file(paths.HOSTS) except: pass diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 688e17872..622c92d75 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -42,6 +42,7 @@ from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import * from ipapython import certmonger from ipapython import dogtag +from ipaplatform.paths import paths from ipaserver.install import installutils from ipaserver.install import dsinstance from ipaserver.install import httpinstance @@ -114,7 +115,7 @@ def update_conf(sub_dict, filename, template_filename): def find_hostname(): """Find the hostname currently configured in ipa-rewrite.conf""" - filename="/etc/httpd/conf.d/ipa-rewrite.conf" + filename=paths.HTTPD_IPA_REWRITE_CONF if not ipautil.file_exists(filename): return None @@ -137,7 +138,7 @@ def find_autoredirect(fqdn): Returns True if autoredirect is enabled, False otherwise """ - filename = '/etc/httpd/conf.d/ipa-rewrite.conf' + filename = paths.HTTPD_IPA_REWRITE_CONF if os.path.exists(filename): pattern = "^RewriteRule \^/\$ https://%s/ipa/ui \[L,NC,R=301\]" % fqdn p = re.compile(pattern) @@ -200,12 +201,12 @@ def upgrade(sub_dict, filename, template, add=False): def check_certs(): """Check ca.crt is in the right place, and try to fix if not""" root_logger.info('[Verifying that root certificate is published]') - if not os.path.exists("/usr/share/ipa/html/ca.crt"): - ca_file = "/etc/httpd/alias/cacert.asc" + if not os.path.exists(paths.CA_CRT): + ca_file = paths.ALIAS_CACERT_ASC if os.path.exists(ca_file): old_umask = os.umask(022) # make sure its readable by httpd try: - shutil.copyfile(ca_file, "/usr/share/ipa/html/ca.crt") + shutil.copyfile(ca_file, paths.CA_CRT) finally: os.umask(old_umask) else: @@ -231,14 +232,14 @@ def upgrade_pki(ca, fstore): http.enable_mod_nss_renegotiate() if not installutils.get_directive(configured_constants.CS_CFG_PATH, 'proxy.securePort', '=') and \ - os.path.exists('/usr/bin/pki-setup-proxy'): - ipautil.run(['/usr/bin/pki-setup-proxy', '-pki_instance_root=/var/lib' + os.path.exists(paths.PKI_SETUP_PROXY): + ipautil.run([paths.PKI_SETUP_PROXY, '-pki_instance_root=/var/lib' ,'-pki_instance_name=pki-ca','-subsystem_type=ca']) root_logger.debug('Proxy configuration updated') else: root_logger.debug('Proxy configuration up-to-date') -def update_dbmodules(realm, filename="/etc/krb5.conf"): +def update_dbmodules(realm, filename=paths.KRB5_CONF): newfile = [] found_dbrealm = False found_realm = False @@ -287,7 +288,7 @@ def cleanup_kdc(fstore): """ root_logger.info('[Checking for deprecated KDC configuration files]') for file in ['kpasswd.keytab', 'ldappwd']: - filename = '/var/kerberos/krb5kdc/%s' % file + filename = os.path.join(paths.VAR_KERBEROS_KRB5KDC_DIR, file) installutils.remove_file(filename) if fstore.has_file(filename): fstore.untrack_file(filename) @@ -301,7 +302,7 @@ def cleanup_adtrust(fstore): root_logger.info('[Checking for deprecated backups of Samba ' 'configuration files]') - for backed_up_file in ['/etc/samba/smb.conf']: + for backed_up_file in [paths.SMB_CONF]: if fstore.has_file(backed_up_file): fstore.untrack_file(backed_up_file) root_logger.debug('Removing %s from backup', backed_up_file) @@ -540,7 +541,7 @@ def named_update_gssapi_configuration(): bindinstance.NAMED_SECTION_OPTIONS) bindinstance.named_conf_set_directive('tkey-domain', None, bindinstance.NAMED_SECTION_OPTIONS) - bindinstance.named_conf_set_directive('tkey-gssapi-keytab', '/etc/named.keytab', + bindinstance.named_conf_set_directive('tkey-gssapi-keytab', paths.NAMED_KEYTAB, bindinstance.NAMED_SECTION_OPTIONS) except IOError, e: root_logger.error('Cannot update GSSAPI configuration in %s: %s', @@ -581,7 +582,7 @@ def named_update_pid_file(): return False try: - bindinstance.named_conf_set_directive('pid-file', '/run/named/named.pid', + bindinstance.named_conf_set_directive('pid-file', paths.NAMED_PID, bindinstance.NAMED_SECTION_OPTIONS) except IOError, e: root_logger.error('Cannot update pid-file configuration in %s: %s', @@ -625,7 +626,7 @@ def certificate_renewal_update(ca): 'renew_ca_cert', ), ( - '/etc/httpd/alias', + paths.HTTPD_ALIAS_DIR, 'ipaCert', 'dogtag-ipa-ca-renew-agent', None, @@ -686,7 +687,7 @@ def certificate_renewal_update(ca): if not sysupgrade.get_upgrade_state('dogtag', 'certificate_renewal_update_1'): - filename = '/var/lib/certmonger/cas/ca_renewal' + filename = paths.CERTMONGER_CAS_CA_RENEWAL if os.path.exists(filename): with installutils.stopped_service('certmonger'): root_logger.info("Removing %s" % filename) @@ -916,10 +917,10 @@ def uninstall_selfsign(ds, http): root_logger.warning( 'Removing self-signed CA. Certificates will need to managed manually.') p = ConfigParser.SafeConfigParser() - p.read('/etc/ipa/default.conf') + p.read(paths.IPA_DEFAULT_CONF) p.set('global', 'enable_ra', 'False') p.set('global', 'ra_plugin', 'none') - with open('/etc/ipa/default.conf', 'w') as f: + with open(paths.IPA_DEFAULT_CONF, 'w') as f: p.write(f) ds.stop_tracking_certificates() @@ -994,7 +995,7 @@ def set_sssd_domain_option(option, value): domain = sssdconfig.get_domain(str(api.env.domain)) domain.set_option(option, value) sssdconfig.save_domain(domain) - sssdconfig.write("/etc/sssd/sssd.conf") + sssdconfig.write(paths.SSSD_CONF) def main(): @@ -1018,12 +1019,12 @@ def main(): else: console_format = '%(message)s' - standard_logging_setup('/var/log/ipaupgrade.log', debug=options.debug, + standard_logging_setup(paths.IPAUPGRADE_LOG, debug=options.debug, verbose=verbose, console_format=console_format, filemode='a') root_logger.debug('%s was invoked with options: %s' % (sys.argv[0], safe_options)) root_logger.debug('IPA version %s' % version.VENDOR_VERSION) - fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') + fstore = sysrestore.FileStore(paths.SYSRESTORE) api.bootstrap(context='restart', in_server=True) api.finalize() @@ -1066,9 +1067,9 @@ def main(): certmap_dir = dsinstance.config_dirname( dsinstance.realm_to_serverid(api.env.realm)) - upgrade(sub_dict, "/etc/httpd/conf.d/ipa.conf", ipautil.SHARE_DIR + "ipa.conf") - upgrade(sub_dict, "/etc/httpd/conf.d/ipa-rewrite.conf", ipautil.SHARE_DIR + "ipa-rewrite.conf") - upgrade(sub_dict, "/etc/httpd/conf.d/ipa-pki-proxy.conf", ipautil.SHARE_DIR + "ipa-pki-proxy.conf", add=True) + upgrade(sub_dict, paths.HTTPD_IPA_CONF, ipautil.SHARE_DIR + "ipa.conf") + upgrade(sub_dict, paths.HTTPD_IPA_REWRITE_CONF, ipautil.SHARE_DIR + "ipa-rewrite.conf") + upgrade(sub_dict, paths.HTTPD_IPA_PKI_PROXY_CONF, ipautil.SHARE_DIR + "ipa-pki-proxy.conf", add=True) if subject_base: upgrade( sub_dict, @@ -1079,7 +1080,7 @@ def main(): update_dbmodules(api.env.realm) uninstall_ipa_kpasswd() - removed_sysconfig_file = '/etc/sysconfig/httpd' + removed_sysconfig_file = paths.SYSCONFIG_HTTPD if fstore.has_file(removed_sysconfig_file): root_logger.info('Restoring %s as it is no longer required', removed_sysconfig_file) |