diff options
author | Tomas Babej <tbabej@redhat.com> | 2013-06-05 15:48:35 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-06-06 18:16:59 +0200 |
commit | b2c378dcc8221dbf254b0cd0b204e84f0d0eeebf (patch) | |
tree | b3a6a6c831f50b8aac50599bfcdc6ad2620e396d /install/tools/ipa-server-install | |
parent | bcf8ab24d5c8fefdaaf49a50ddce6f8fc8702be1 (diff) | |
download | freeipa-b2c378dcc8221dbf254b0cd0b204e84f0d0eeebf.tar.gz freeipa-b2c378dcc8221dbf254b0cd0b204e84f0d0eeebf.tar.xz freeipa-b2c378dcc8221dbf254b0cd0b204e84f0d0eeebf.zip |
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
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-x | install/tools/ipa-server-install | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 3e18c8e00..b90613295 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( |