diff options
| author | Simo Sorce <ssorce@redhat.com> | 2012-10-22 20:48:24 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-11-01 10:58:19 -0400 |
| commit | 09dbc1f36bbc14c1224e45778cbc59586dfeea75 (patch) | |
| tree | 492bae279e81d5214832bd8c1f1d2c3af7dc3617 /ipapython/platform/fedora16.py | |
| parent | 3d7ff982ec281935ca3c2b55eea03a08723fe1e2 (diff) | |
| download | freeipa.git-09dbc1f36bbc14c1224e45778cbc59586dfeea75.tar.gz freeipa.git-09dbc1f36bbc14c1224e45778cbc59586dfeea75.tar.xz freeipa.git-09dbc1f36bbc14c1224e45778cbc59586dfeea75.zip | |
Preserve original service_name in services
This is needed to be able to reference stuff always wth the same name.
The platform specific private name must be kept in a platform specific
variable.
In the case of systemd we store it in systemd_name
For the redhat platform wellknown names and service name are the same so
currently no special name is needed.
Diffstat (limited to 'ipapython/platform/fedora16.py')
| -rw-r--r-- | ipapython/platform/fedora16.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ipapython/platform/fedora16.py b/ipapython/platform/fedora16.py index 005d44d0..83bb1157 100644 --- a/ipapython/platform/fedora16.py +++ b/ipapython/platform/fedora16.py @@ -71,16 +71,16 @@ system_units['pki_tomcatd'] = system_units['pki-tomcatd'] class Fedora16Service(systemd.SystemdService): def __init__(self, service_name): + systemd_name = service_name if service_name in system_units: - service_name = system_units[service_name] + systemd_name = system_units[service_name] else: if len(service_name.split('.')) == 1: # if service_name does not have a dot, it is not foo.service # and not a foo.target. Thus, not correct service name for # systemd, default to foo.service style then - service_name = "%s.service" % (service_name) - super(Fedora16Service, self).__init__(service_name) - + systemd_name = "%s.service" % (service_name) + super(Fedora16Service, self).__init__(service_name, systemd_name) # Special handling of directory server service # # We need to explicitly enable instances to install proper symlinks as @@ -108,8 +108,8 @@ class Fedora16DirectoryService(Fedora16Service): def restart(self, instance_name="", capture_output=True, wait=True): if len(instance_name) > 0: - elements = self.service_name.split("@") - srv_etc = os.path.join(self.SYSTEMD_ETC_PATH, self.service_name) + elements = self.systemd_name.split("@") + srv_etc = os.path.join(self.SYSTEMD_ETC_PATH, self.systemd_name) srv_tgt = os.path.join(self.SYSTEMD_ETC_PATH, self.SYSTEMD_SRV_TARGET % (elements[0])) srv_lnk = os.path.join(srv_tgt, self.service_instance(instance_name)) if not os.path.exists(srv_etc): |