summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipa-install/ipa-server-install
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2008-01-22 11:58:06 +0000
committerMark McLoughlin <markmc@redhat.com>2008-01-22 11:58:06 +0000
commit11266d039f6c59be1bf8ce888972d012ce49ddf6 (patch)
tree4b251571c8ef18ec1484808d0bf5c34c5b471098 /ipa-server/ipa-install/ipa-server-install
parent5fd10b5f98588892cdd832c0c71dc4a98cc135ee (diff)
downloadfreeipa-11266d039f6c59be1bf8ce888972d012ce49ddf6.tar.gz
freeipa-11266d039f6c59be1bf8ce888972d012ce49ddf6.tar.xz
freeipa-11266d039f6c59be1bf8ce888972d012ce49ddf6.zip
Re-factor the ipa_webgui and ipa_kpasswd instance code
The ipa_webgui and ipa_kpasswd instance code is identical and I want to add another similar instance down the line, so re-factor the code into a service.SimpleServiceInstance class. Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'ipa-server/ipa-install/ipa-server-install')
-rw-r--r--ipa-server/ipa-install/ipa-server-install5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 95b7790e7..dcfa20111 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -44,7 +44,6 @@ import ipaserver.krbinstance
import ipaserver.bindinstance
import ipaserver.httpinstance
import ipaserver.ntpinstance
-import ipaserver.webguiinstance
from ipaserver import service
from ipaserver import sysrestore
@@ -275,7 +274,7 @@ def check_dirsrv():
def uninstall():
ipaserver.ntpinstance.NTPInstance().uninstall()
ipaserver.bindinstance.BindInstance().uninstall()
- ipaserver.webguiinstance.WebGuiInstance().uninstall()
+ ipaserver.httpinstance.WebGuiInstance().uninstall()
ipaserver.httpinstance.HTTPInstance().uninstall()
ipaserver.krbinstance.KrbInstance().uninstall()
ipaserver.dsinstance.DsInstance().uninstall()
@@ -432,7 +431,7 @@ def main():
http.create_instance(realm_name, host_name)
# Create a Web Gui instance
- webgui = ipaserver.webguiinstance.WebGuiInstance()
+ webgui = ipaserver.httpinstance.WebGuiInstance()
webgui.create_instance()
bind.setup(host_name, ip_address, realm_name)