diff options
author | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-09 20:42:46 +0000 |
---|---|---|
committer | vakwetu <vakwetu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-09-09 20:42:46 +0000 |
commit | 78a301689d984401ad7098049ddb2f6e5504d957 (patch) | |
tree | a5d9b21416785e6558300001a3c8dafece76c8a3 /pki/base/common/src/com/netscape/cms/servlet/csadmin | |
parent | 4ee4f5ae0e627ab89499844f95f0bc4b8cd4cd2e (diff) | |
download | pki-78a301689d984401ad7098049ddb2f6e5504d957.tar.gz pki-78a301689d984401ad7098049ddb2f6e5504d957.tar.xz pki-78a301689d984401ad7098049ddb2f6e5504d957.zip |
Bugzilla BZ# 699809 - Convert certificate system to use systemd
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2196 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java | 11 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index f21a56de9..fa5840dcd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -180,11 +180,13 @@ public class DonePanel extends WizardPanelBase { String type = ""; String instanceId = ""; String instanceRoot = ""; + String systemdService = ""; try { type = cs.getString("cs.type", ""); instanceId = cs.getString("instanceId"); instanceRoot = cs.getString("instanceRoot"); select = cs.getString("preop.subsystem.select", ""); + systemdService = cs.getString("pkicreate.systemd.servicename", ""); } catch (Exception e) {} String initDaemon = ""; @@ -199,8 +201,13 @@ public class DonePanel extends WizardPanelBase { } String os = System.getProperty( "os.name" ); if( os.equalsIgnoreCase( "Linux" ) ) { - context.put( "initCommand", "/sbin/service " + initDaemon ); - context.put( "instanceId", instanceId ); + if (! systemdService.equals("")) { + context.put( "initCommand", "/bin/systemctl"); + context.put( "instanceId", systemdService ); + } else { + context.put( "initCommand", "/sbin/service " + initDaemon ); + context.put( "instanceId", instanceId ); + } } else { /* default case: e. g. - ( os.equalsIgnoreCase( "SunOS" ) */ context.put( "initCommand", "/etc/init.d/" + initDaemon ); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index 6abdd8618..160cc74c3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -99,11 +99,13 @@ public class SecurityDomainPanel extends WizardPanelBase { String default_admin_url = ""; String name = ""; String cstype = ""; + String systemdService = ""; try { default_admin_url = config.getString("preop.securitydomain.admin_url", ""); name = config.getString("preop.securitydomain.name", ""); cstype = config.getString("cs.type", ""); + systemdService = config.getString("pkicreate.systemd.servicename", ""); } catch (Exception e) { CMS.debug(e.toString()); } @@ -214,8 +216,13 @@ public class SecurityDomainPanel extends WizardPanelBase { String instanceId = "<security_domain_instance_name>"; String os = System.getProperty( "os.name" ); if( os.equalsIgnoreCase( "Linux" ) ) { - context.put( "initCommand", "/sbin/service " + initDaemon ); - context.put( "instanceId", instanceId ); + if (! systemdService.equals("")) { + context.put( "initCommand", "/usr/bin/pkicontrol" ); + context.put( "instanceId", "ca " + systemdService ); + } else { + context.put( "initCommand", "/sbin/service " + initDaemon ); + context.put( "instanceId", instanceId ); + } } else { /* default case: e. g. - ( os.equalsIgnoreCase( "SunOS" ) */ context.put( "initCommand", "/etc/init.d/" + initDaemon ); |