summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-06 08:31:50 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-12-06 08:31:50 -0500
commit79ff01ef76f2a4ca44d02bceb7173541328bef3b (patch)
tree93be50f45dc2922cac5bd39d657ac4e40e80cc20
parent952300522ab5aaa9343c96dde7d785727cadfd95 (diff)
downloadpki-79ff01ef76f2a4ca44d02bceb7173541328bef3b.zip
pki-79ff01ef76f2a4ca44d02bceb7173541328bef3b.tar.gz
pki-79ff01ef76f2a4ca44d02bceb7173541328bef3b.tar.xz
Renamed initscript link.
Previously the link to the initscript was named the same name as the instance name: /var/lib/pki/<instance>/<instance>. It has now been renamed to /var/lib/pki/<instance>/initscript to make it more consistent. Ticket #422
-rw-r--r--base/deploy/scripts/operations2
-rw-r--r--base/deploy/src/scriptlets/instance_layout.py2
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py7
3 files changed, 5 insertions, 6 deletions
diff --git a/base/deploy/scripts/operations b/base/deploy/scripts/operations
index 0a768fb..020efbc 100644
--- a/base/deploy/scripts/operations
+++ b/base/deploy/scripts/operations
@@ -970,7 +970,7 @@ verify_symlinks()
[logs]=/var/log/pki/${PKI_INSTANCE_ID})
# '${PKI_INSTANCE_PATH}' symlinks (root:root ownership)
- root_symlinks[${PKI_INSTANCE_ID}]=/usr/sbin/tomcat-sysd
+ root_symlinks[initscript]=/usr/sbin/tomcat-sysd
# '${PKI_INSTANCE_PATH}/ca' symlinks
ca_symlinks=(
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index 773305c..02c549e 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -83,7 +83,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
util.symlink.create(master['pki_tomcat_bin_path'],
master['pki_tomcat_bin_link'])
util.symlink.create(master['pki_tomcat_systemd'],
- master['pki_instance_systemd_link'],
+ master['pki_instance_initscript'],
uid=0, gid=0)
# establish Tomcat instance common lib jar symbolic links
util.symlink.create(master['pki_apache_commons_collections_jar'],
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 80bdcb2..1d6bed5 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -582,9 +582,9 @@ class PKIConfigParser:
config.pki_master_dict['pki_instance_lib_log4j_properties'] =\
os.path.join(config.pki_master_dict['pki_instance_lib'],
"log4j.properties")
- config.pki_master_dict['pki_instance_systemd_link'] =\
+ config.pki_master_dict['pki_instance_initscript'] =\
os.path.join(config.pki_master_dict['pki_instance_path'],
- config.pki_master_dict['pki_instance_id'])
+ 'initscript')
# Tomcat instance common lib jars
if config.pki_master_dict['pki_architecture'] == 64:
config.pki_master_dict['pki_jss_jar'] =\
@@ -1061,8 +1061,7 @@ class PKIConfigParser:
config.pki_master_dict['PKI_INSTANCE_ID_SLOT'] =\
config.pki_master_dict['pki_instance_id']
config.pki_master_dict['PKI_INSTANCE_INITSCRIPT_SLOT'] =\
- os.path.join(config.pki_master_dict['pki_instance_path'],
- config.pki_master_dict['pki_instance_id'])
+ config.pki_master_dict['pki_instance_initscript']
config.pki_master_dict['PKI_REGISTRY_FILE_SLOT'] =\
os.path.join(config.pki_master_dict['pki_subsystem_registry_path'],
config.pki_master_dict['pki_instance_id'])