diff options
Diffstat (limited to 'base/deploy/src/scriptlets/webapp_deployment.py')
| -rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 64 |
1 files changed, 14 insertions, 50 deletions
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 28aa31dc5..68fff20bd 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -48,36 +48,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # deploy webapp util.directory.create(master['pki_tomcat_webapps_subsystem_path']) - # Copy /usr/share/pki/common-ui/admin/console/config - # to <instance>/webapp/<subsystem>/admin/console/config + # Copy /usr/share/pki/server/webapps/pki/admin + # to <instance>/webapp/<subsystem>/admin util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "config"), - os.path.join( - master['pki_tomcat_webapps_subsystem_path'], - "admin", - "console", - "config"), - overwrite_flag=True) - - # Copy /usr/share/pki/common-ui/admin/console/js - # to <instance>/webapp/<subsystem>/admin/console/js - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "js"), + "server", + "webapps", + "pki", + "admin"), os.path.join( master['pki_tomcat_webapps_subsystem_path'], - "admin", - "console", - "js"), + "admin"), overwrite_flag=True) util.directory.copy( @@ -137,36 +119,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): # redeploy webapp util.directory.modify(master['pki_tomcat_webapps_subsystem_path']) - # Copy /usr/share/pki/common-ui/admin/console/config - # to <instance>/webapp/<subsystem>/admin/console/config + # Copy /usr/share/pki/server/webapps/pki/admin + # to <instance>/webapp/<subsystem>/admin util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "config"), - os.path.join( - master['pki_tomcat_webapps_subsystem_path'], - "admin", - "console", - "config"), - overwrite_flag=True) - - # Copy /usr/share/pki/common-ui/admin/console/js - # to <instance>/webapp/<subsystem>/admin/console/js - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "admin", - "console", - "js"), + "server", + "webapps", + "pki", + "admin"), os.path.join( master['pki_tomcat_webapps_subsystem_path'], - "admin", - "console", - "js"), + "admin"), overwrite_flag=True) util.directory.copy( |