diff options
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/instance_layout.py | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 330aa46f7..a9a2840c7 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -88,46 +88,20 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "localhost", "ROOT.xml")) - if os.path.exists(deployer.mdict['pki_theme_server_dir']): - # Deploy theme web application if available - deployer.deploy_webapp( - "pki", - deployer.mdict['pki_theme_server_dir'], - os.path.join( - deployer.mdict['pki_source_server_path'], - "Catalina", - "localhost", - "pki.xml")) - - # Deploy admin templates - deployer.deploy_webapp( - "pki#admin", - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "pki", - "admin"), - os.path.join( - deployer.mdict['pki_source_server_path'], - "Catalina", - "localhost", - "pki#admin.xml")) - - # Deploy JS library + # Deploy pki web application which includes themes, + # admin templates, and JS libraries deployer.deploy_webapp( - "pki#js", + "pki", os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, "server", "webapps", - "pki", - "js"), + "pki"), os.path.join( deployer.mdict['pki_source_server_path'], "Catalina", "localhost", - "pki#js.xml")) + "pki.xml")) # Create Tomcat instance library deployer.directory.create(deployer.mdict['pki_instance_lib']) |