Hi,
Adds a new simple service called OtpdInstance, that manages
ipa-otpd.socket service. Added to server/replica installer
and ipa-upgradeconfig script.
https://fedorahosted.org/freeipa/ticket/3680
Tomas
From 75f60ae7dcba5af8e0b055c971a970662120cf3c Mon Sep 17 00:00:00 2001
From: Tomas Babej tba...@redhat.com
Date: Wed, 5 Jun 2013 15:48:35 +0200
Subject: [PATCH] Manage ipa-otpd.socket by IPA
Adds a new simple service called OtpdInstance, that manages
ipa-otpd.socket service. Added to server/replica installer
and ipa-upgradeconfig script.
https://fedorahosted.org/freeipa/ticket/3680
---
install/tools/ipa-replica-install | 6 ++
install/tools/ipa-server-install | 12 +---
install/tools/ipa-upgradeconfig| 29 ++---
ipapython/platform/fedora16/service.py | 1 +
ipaserver/install/otpdinstance.py | 25 +
ipaserver/install/service.py | 17 +
6 files changed, 68 insertions(+), 22 deletions(-)
create mode 100644 ipaserver/install/otpdinstance.py
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index 04cad42f6e4c16ee8e4b5076e96dc24bd887828f..209ca850f6c559c28ab8f3f6b4686234a04d0892 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -35,6 +35,7 @@ from ipapython import ipautil
from ipaserver.install import dsinstance, installutils, krbinstance, service
from ipaserver.install import bindinstance, httpinstance, ntpinstance, certs
from ipaserver.install import memcacheinstance
+from ipaserver.install import otpdinstance
from ipaserver.install.replication import replica_conn_check, ReplicationManager
from ipaserver.install.installutils import (HostnameLocalhost, resolve_host,
ReplicaConfig, expand_replica_info, read_replica_info ,get_host_name,
@@ -667,6 +668,11 @@ def main():
krb = install_krb(config, setup_pkinit=options.setup_pkinit)
http = install_http(config, auto_redirect=options.ui_redirect)
+
+otpd = otpdinstance.OtpdInstance()
+otpd.create_instance('OTPD', config.host_name, config.dirman_password,
+ ipautil.realm_to_suffix(config.realm_name))
+
if CA:
CA.configure_certmonger_renewal()
CA.import_ra_cert(dir + /ra.p12)
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 3e18c8e002275d984fbb81a0a46f81b38e49916e..b90613295a2e9744575e9313929816e50e298926 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -49,6 +49,7 @@ from ipaserver.install import ntpinstance
from ipaserver.install import certs
from ipaserver.install import cainstance
from ipaserver.install import memcacheinstance
+from ipaserver.install import otpdinstance
from ipaserver.install import sysupgrade
from ipaserver.install import service, installutils
@@ -513,6 +514,7 @@ def uninstall():
krbinstance.KrbInstance(fstore).uninstall()
dsinstance.DsInstance(fstore=fstore).uninstall()
memcacheinstance.MemcacheInstance().uninstall()
+otpdinstance.OtpdInstance().uninstall()
ipaservices.restore_network_configuration(fstore, sstore)
fstore.restore_all_files()
try:
@@ -1092,11 +1094,15 @@ def main():
# generated
ds.add_cert_to_service()
-# Create a HTTP instance
-
memcache = memcacheinstance.MemcacheInstance()
-memcache.create_instance('MEMCACHE', host_name, dm_password, ipautil.realm_to_suffix(realm_name))
+memcache.create_instance('MEMCACHE', host_name, dm_password,
+ ipautil.realm_to_suffix(realm_name))
+otpd = otpdinstance.OtpdInstance()
+otpd.create_instance('OTPD', host_name, dm_password,
+ ipautil.realm_to_suffix(realm_name))
+
+# Create a HTTP instance
http = httpinstance.HTTPInstance(fstore)
if options.http_pkcs12:
http.create_instance(
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index 8e9357f20fe7c9a88908def6a2e3b2104f07d73a..4e9216964a045b5a87c22f6eb87bb1844f4adce9 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -48,6 +48,7 @@ from ipaserver.install import bindinstance
from ipaserver.install import service
from ipaserver.install import cainstance
from ipaserver.install import certs
+from ipaserver.install import otpdinstance
from ipaserver.install import sysupgrade
@@ -925,17 +926,23 @@ def main():
uninstall_selfsign(ds, http)
-memcache = memcacheinstance.MemcacheInstance()
-memcache.ldapi = True
-memcache.realm = api.env.realm
-try:
-if not memcache.is_configured():
-# 389-ds needs to be running to create the memcache instance
-# because we record the new service in cn=masters.
-ds.start()
-memcache.create_instance('MEMCACHE', fqdn, None, ipautil.realm_to_suffix(api.env.realm))
-except
