diff options
Diffstat (limited to 'ipa-server/ipaserver')
| -rw-r--r-- | ipa-server/ipaserver/Makefile.am | 2 | ||||
| -rw-r--r-- | ipa-server/ipaserver/__init__.py | 1 | ||||
| -rw-r--r-- | ipa-server/ipaserver/bindinstance.py | 1 | ||||
| -rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 1 | ||||
| -rw-r--r-- | ipa-server/ipaserver/ipaldap.py | 1 | ||||
| -rw-r--r-- | ipa-server/ipaserver/krbinstance.py | 27 | ||||
| -rw-r--r-- | ipa-server/ipaserver/webguiinstance.py | 8 |
7 files changed, 18 insertions, 23 deletions
diff --git a/ipa-server/ipaserver/Makefile.am b/ipa-server/ipaserver/Makefile.am index 99b74b504..ac8b9818f 100644 --- a/ipa-server/ipaserver/Makefile.am +++ b/ipa-server/ipaserver/Makefile.am @@ -1,6 +1,6 @@ NULL = -appdir = $(IPA_DATA_DIR)/ipaserver +appdir = $(pythondir)/ipaserver app_PYTHON = \ __init__.py \ bindinstance.py \ diff --git a/ipa-server/ipaserver/__init__.py b/ipa-server/ipaserver/__init__.py index 6aced0db7..ef86f9ec5 100644 --- a/ipa-server/ipaserver/__init__.py +++ b/ipa-server/ipaserver/__init__.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com> # see inline # diff --git a/ipa-server/ipaserver/bindinstance.py b/ipa-server/ipaserver/bindinstance.py index 9e26925ad..e15d93351 100644 --- a/ipa-server/ipaserver/bindinstance.py +++ b/ipa-server/ipaserver/bindinstance.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: Simo Sorce <ssorce@redhat.com> # # Copyright (C) 2007 Red Hat diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 3a71634a4..b3a445d88 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: Karl MacMillan <kmacmillan@mentalrootkit.com> # # Copyright (C) 2007 Red Hat diff --git a/ipa-server/ipaserver/ipaldap.py b/ipa-server/ipaserver/ipaldap.py index 7bb9719ea..49a60bf02 100644 --- a/ipa-server/ipaserver/ipaldap.py +++ b/ipa-server/ipaserver/ipaldap.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: Rich Megginson <richm@redhat.com> # Rob Crittenden <rcritten@redhat.com # diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py index 28233f24b..17bb4f6ff 100644 --- a/ipa-server/ipaserver/krbinstance.py +++ b/ipa-server/ipaserver/krbinstance.py @@ -1,4 +1,3 @@ -#! /usr/bin/python -E # Authors: Simo Sorce <ssorce@redhat.com> # # Copyright (C) 2007 Red Hat @@ -118,7 +117,7 @@ class KrbInstance(service.Service): def __common_post_setup(self): self.step("starting the KDC", self.__start_instance) self.step("configuring KDC to start on boot", self.__enable) - self.step("enabling and starting ipa-kpasswd", self.__enable_kpasswd) + self.step("enabling and starting ipa_kpasswd", self.__enable_kpasswd) def create_instance(self, ds_user, realm_name, host_name, admin_password, master_password): self.master_password = master_password @@ -183,10 +182,10 @@ class KrbInstance(service.Service): logging.critical("krb5kdc service failed to start") def __enable_kpasswd(self): - sysrestore.backup_state("ipa-kpasswd", "enabled", service.is_enabled("ipa-kpasswd")) - sysrestore.backup_state("ipa-kpasswd", "running", service.is_running("ipa-kpasswd")) - service.chkconfig_on("ipa-kpasswd") - service.start("ipa-kpasswd") + sysrestore.backup_state("ipa_kpasswd", "enabled", service.is_enabled("ipa_kpasswd")) + sysrestore.backup_state("ipa_kpasswd", "running", service.is_running("ipa_kpasswd")) + service.chkconfig_on("ipa_kpasswd") + service.start("ipa_kpasswd") def __setup_sub_dict(self): self.sub_dict = dict(FQDN=self.fqdn, @@ -374,8 +373,8 @@ class KrbInstance(service.Service): sysrestore.backup_file("/var/kerberos/krb5kdc/kpasswd.keytab") installutils.create_keytab("/var/kerberos/krb5kdc/kpasswd.keytab", "kadmin/changepw") - sysrestore.backup_file("/etc/sysconfig/ipa-kpasswd") - update_key_val_in_file("/etc/sysconfig/ipa-kpasswd", "export KRB5_KTNAME", "/var/kerberos/krb5kdc/kpasswd.keytab") + sysrestore.backup_file("/etc/sysconfig/ipa_kpasswd") + update_key_val_in_file("/etc/sysconfig/ipa_kpasswd", "export KRB5_KTNAME", "/var/kerberos/krb5kdc/kpasswd.keytab") pent = pwd.getpwnam(self.ds_user) os.chown("/var/kerberos/krb5kdc/kpasswd.keytab", pent.pw_uid, pent.pw_gid) @@ -383,18 +382,18 @@ class KrbInstance(service.Service): running = self.restore_state("running") enabled = self.restore_state("enabled") - kpasswd_running = sysrestore.restore_state("ipa-kpasswd", "running") - kpasswd_enabled = sysrestore.restore_state("ipa-kpasswd", "enabled") + kpasswd_running = sysrestore.restore_state("ipa_kpasswd", "running") + kpasswd_enabled = sysrestore.restore_state("ipa_kpasswd", "enabled") if not running is None: self.stop() if not kpasswd_running is None: - service.stop("ipa-kpasswd") + service.stop("ipa_kpasswd") if not enabled is None and not enabled: self.chkconfig_off() if not kpasswd_enabled is None and not kpasswd_enabled: - service.chkconfig_off("ipa-kpasswd") + service.chkconfig_off("ipa_kpasswd") for f in ["/var/kerberos/krb5kdc/ldappwd", "/var/kerberos/krb5kdc/kdc.conf", @@ -406,10 +405,10 @@ class KrbInstance(service.Service): "/etc/sysconfig/dirsrv", "/etc/krb5.keytab", "/var/kerberos/krb5kdc/kpasswd.keytab", - "/etc/sysconfig/ipa-kpasswd"]: + "/etc/sysconfig/ipa_kpasswd"]: sysrestore.restore_file(f) if not running is None and running: self.start() if not kpasswd_running is None and kpasswd_running: - service.start("ipa-kpasswd") + service.start("ipa_kpasswd") diff --git a/ipa-server/ipaserver/webguiinstance.py b/ipa-server/ipaserver/webguiinstance.py index 10b80ec37..58969cb74 100644 --- a/ipa-server/ipaserver/webguiinstance.py +++ b/ipa-server/ipaserver/webguiinstance.py @@ -21,12 +21,12 @@ import service class WebGuiInstance(service.Service): def __init__(self): - service.Service.__init__(self, "ipa-webgui") + service.Service.__init__(self, "ipa_webgui") def create_instance(self): - self.step("starting ipa-webgui", self.__start) - self.step("configuring ipa-webgui to start on boot", self.__enable) - self.start_creation("Configuring ipa-webgui") + self.step("starting ipa_webgui", self.__start) + self.step("configuring ipa_webgui to start on boot", self.__enable) + self.start_creation("Configuring ipa_webgui") def __start(self): self.backup_state("running", self.is_running()) |