From 2a036abe7a601bbc8e65bbe4ab7c489b81db0eb5 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 13 Dec 2007 09:31:28 +0000 Subject: More ipautil fixing Recently, dsinstance and krbinstance was fixed to not import * from ipautil; do the same for the rest of ipaserver. Signed-off-by: Mark McLoughlin --- ipa-server/ipaserver/webguiinstance.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'ipa-server/ipaserver/webguiinstance.py') diff --git a/ipa-server/ipaserver/webguiinstance.py b/ipa-server/ipaserver/webguiinstance.py index 757b50c5..2d41f30f 100644 --- a/ipa-server/ipaserver/webguiinstance.py +++ b/ipa-server/ipaserver/webguiinstance.py @@ -17,9 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import logging - -from ipa.ipautil import * import service class WebGuiInstance(service.Service): -- cgit From 6976f92862c1dba3f7a25baa1893c41a67590b23 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 13 Dec 2007 09:31:28 +0000 Subject: Refactor krbinstance and dsinstance creation steps Creation steps are currently done with: self.start_creation(2, "Create foo") self.step("do foo") self.foo() self.step("do bar") self.bar() self.done_creation() This patch refactors that into the much more straightforward: self.step("do foo", self.foo) self.step("do bar", self.bar) self.start_creation("Create foo") Signed-off-by: Mark McLoughlin --- ipa-server/ipaserver/webguiinstance.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'ipa-server/ipaserver/webguiinstance.py') diff --git a/ipa-server/ipaserver/webguiinstance.py b/ipa-server/ipaserver/webguiinstance.py index 2d41f30f..11727e11 100644 --- a/ipa-server/ipaserver/webguiinstance.py +++ b/ipa-server/ipaserver/webguiinstance.py @@ -24,14 +24,6 @@ class WebGuiInstance(service.Service): service.Service.__init__(self, "ipa-webgui") def create_instance(self): - self.start_creation(2, "Configuring ipa-webgui") - - self.step("starting ipa-webgui") - service.start("ipa-webgui") - - self.step("configuring ipa-webgui to start on boot") - service.chkconfig_on("ipa-webgui") - - self.done_creation() - - + self.step("starting ipa-webgui", self.start) + self.step("configuring ipa-webgui to start on boot", self.chkconfig_on) + self.start_creation("Configuring ipa-webgui") -- cgit From 4814c0d3f6c11971b841eb6eedcd7925d8840f26 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 17 Dec 2007 12:00:33 +0000 Subject: Restart ipa-webgui in create_instance() Just in case there is an existing ipa-webgui running before ipa-server-install, restart the instance rather than just starting it. Signed-off-by: Mark McLoughlin --- ipa-server/ipaserver/webguiinstance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ipa-server/ipaserver/webguiinstance.py') diff --git a/ipa-server/ipaserver/webguiinstance.py b/ipa-server/ipaserver/webguiinstance.py index 11727e11..28543558 100644 --- a/ipa-server/ipaserver/webguiinstance.py +++ b/ipa-server/ipaserver/webguiinstance.py @@ -24,6 +24,6 @@ class WebGuiInstance(service.Service): service.Service.__init__(self, "ipa-webgui") def create_instance(self): - self.step("starting ipa-webgui", self.start) + self.step("starting ipa-webgui", self.restart) self.step("configuring ipa-webgui to start on boot", self.chkconfig_on) self.start_creation("Configuring ipa-webgui") -- cgit