diff options
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/adminpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/adminpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/certchainpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm (renamed from dogtag/common-ui/shared/admin/console/config/config_addhsm.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/databasepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/databasepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/donepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/donepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/footer.vm (renamed from dogtag/common-ui/shared/admin/console/config/footer.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/header.vm (renamed from dogtag/common-ui/shared/admin/console/config/header.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm) | 0 | ||||
-rwxr-xr-x | base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/login.vm (renamed from dogtag/common-ui/shared/admin/console/config/login.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/modulepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/modulepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/namepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/namepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm (renamed from dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/sidemenu.vm (renamed from dogtag/common-ui/shared/admin/console/config/sidemenu.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/sizepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/sizepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/topmenu.vm (renamed from dogtag/common-ui/shared/admin/console/config/topmenu.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm (renamed from dogtag/common-ui/shared/admin/console/config/welcomepanel.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/wizard.vm (renamed from dogtag/common-ui/shared/admin/console/config/wizard.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/config/xml.vm (renamed from dogtag/common-ui/shared/admin/console/config/xml.vm) | 0 | ||||
-rw-r--r-- | base/common/shared/webapps/pki/admin/console/js/misc.js (renamed from dogtag/common-ui/shared/admin/console/js/misc.js) | 0 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 23 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 32 | ||||
-rwxr-xr-x | base/setup/pkicreate | 40 |
35 files changed, 19 insertions, 76 deletions
diff --git a/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm index b27042cfb..b27042cfb 100644 --- a/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/adminpanel.vm b/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm index 37d922764..37d922764 100644 --- a/dogtag/common-ui/shared/admin/console/config/adminpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm index abb7678ae..abb7678ae 100644 --- a/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm index 3ec3526d1..3ec3526d1 100644 --- a/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm index 08bcc1331..08bcc1331 100644 --- a/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm index ac8da10ee..ac8da10ee 100644 --- a/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm index 0502834e4..0502834e4 100644 --- a/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm index 839cff56a..839cff56a 100644 --- a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm +++ b/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm diff --git a/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm b/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm index 147425bae..147425bae 100644 --- a/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm b/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm index 8ae6f3f7b..8ae6f3f7b 100644 --- a/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/databasepanel.vm b/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm index 174710110..174710110 100644 --- a/dogtag/common-ui/shared/admin/console/config/databasepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm index 26506c12f..26506c12f 100644 --- a/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/donepanel.vm b/base/common/shared/webapps/pki/admin/console/config/donepanel.vm index 136760171..136760171 100644 --- a/dogtag/common-ui/shared/admin/console/config/donepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/donepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/footer.vm b/base/common/shared/webapps/pki/admin/console/config/footer.vm index a596e45b1..a596e45b1 100644 --- a/dogtag/common-ui/shared/admin/console/config/footer.vm +++ b/base/common/shared/webapps/pki/admin/console/config/footer.vm diff --git a/dogtag/common-ui/shared/admin/console/config/header.vm b/base/common/shared/webapps/pki/admin/console/config/header.vm index e0fe6a962..e0fe6a962 100644 --- a/dogtag/common-ui/shared/admin/console/config/header.vm +++ b/base/common/shared/webapps/pki/admin/console/config/header.vm diff --git a/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm b/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm index e6c03a6b1..e6c03a6b1 100644 --- a/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm index 53d445946..53d445946 100644 --- a/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm index c53c3af2a..c53c3af2a 100755 --- a/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/login.vm b/base/common/shared/webapps/pki/admin/console/config/login.vm index 2400bd2d3..2400bd2d3 100644 --- a/dogtag/common-ui/shared/admin/console/config/login.vm +++ b/base/common/shared/webapps/pki/admin/console/config/login.vm diff --git a/dogtag/common-ui/shared/admin/console/config/modulepanel.vm b/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm index f0952ecbe..f0952ecbe 100644 --- a/dogtag/common-ui/shared/admin/console/config/modulepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/namepanel.vm b/base/common/shared/webapps/pki/admin/console/config/namepanel.vm index a1fff3807..a1fff3807 100644 --- a/dogtag/common-ui/shared/admin/console/config/namepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/namepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm index ab9b06f4c..ab9b06f4c 100644 --- a/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm b/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm index ce74ecae8..ce74ecae8 100644 --- a/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm index e9e0763ab..e9e0763ab 100644 --- a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm index a8ac15bf5..a8ac15bf5 100644 --- a/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/sidemenu.vm b/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm index 09fe16870..09fe16870 100644 --- a/dogtag/common-ui/shared/admin/console/config/sidemenu.vm +++ b/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm diff --git a/dogtag/common-ui/shared/admin/console/config/sizepanel.vm b/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm index 1dee1ce6b..1dee1ce6b 100644 --- a/dogtag/common-ui/shared/admin/console/config/sizepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/topmenu.vm b/base/common/shared/webapps/pki/admin/console/config/topmenu.vm index 64881066f..64881066f 100644 --- a/dogtag/common-ui/shared/admin/console/config/topmenu.vm +++ b/base/common/shared/webapps/pki/admin/console/config/topmenu.vm diff --git a/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm b/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm index 07b0d641f..07b0d641f 100644 --- a/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm +++ b/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm diff --git a/dogtag/common-ui/shared/admin/console/config/wizard.vm b/base/common/shared/webapps/pki/admin/console/config/wizard.vm index cc868e572..cc868e572 100644 --- a/dogtag/common-ui/shared/admin/console/config/wizard.vm +++ b/base/common/shared/webapps/pki/admin/console/config/wizard.vm diff --git a/dogtag/common-ui/shared/admin/console/config/xml.vm b/base/common/shared/webapps/pki/admin/console/config/xml.vm index ee4bc2c97..ee4bc2c97 100644 --- a/dogtag/common-ui/shared/admin/console/config/xml.vm +++ b/base/common/shared/webapps/pki/admin/console/config/xml.vm diff --git a/dogtag/common-ui/shared/admin/console/js/misc.js b/base/common/shared/webapps/pki/admin/console/js/misc.js index d4dc336ab..d4dc336ab 100644 --- a/dogtag/common-ui/shared/admin/console/js/misc.js +++ b/base/common/shared/webapps/pki/admin/console/js/misc.js diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index cf8e42d4f..995f4aacc 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -72,28 +72,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_webapps_path']) util.directory.create(master['pki_tomcat_webapps_common_path']) - # Copy /usr/share/pki/common-ui/css - # to <instance>/webapp/pki/css + # Copy /usr/share/pki/common-ui + # to <instance>/webapp/pki util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "css"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "css"), - overwrite_flag=True) - - # Copy /usr/share/pki/common-ui/images - # to <instance>/webapp/pki/images - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "common-ui", - "images"), - os.path.join( - master['pki_tomcat_webapps_common_path'], - "images"), + "common-ui"), + master['pki_tomcat_webapps_common_path'], overwrite_flag=True) util.directory.create(master['pki_tomcat_webapps_root_path']) diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index 4c15256bd..9fca206e9 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( diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 6b503fe7e..6f63e96e8 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2065,27 +2065,11 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/css - # to <instance>/docroot/pki/css + # Copy /usr/share/pki/common-ui + # to <instance>/docroot/pki return 0 if !copy_directory( - "$common_ui_subsystem_path/css", - "$docroot_instance_path/pki/css", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui/esc - # to <instance>/docroot/pki/esc - return 0 if !copy_directory( - "$common_ui_subsystem_path/esc", - "$docroot_instance_path/pki/esc", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui/images - # to <instance>/docroot/pki/images - return 0 if !copy_directory( - "$common_ui_subsystem_path/images", - "$docroot_instance_path/pki/images", + $common_ui_subsystem_path, + "$docroot_instance_path/pki", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); @@ -2116,19 +2100,11 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - # Copy /usr/share/pki/common-ui/admin/console/config - # to <instance>/webapp/<subsystem>/admin/console/config - return 0 if !copy_directory( - "$common_ui_subsystem_path/admin/console/config", - "$webapps_subsystem_instance_path/admin/console/config", - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui/admin/console/js - # to <instance>/webapp/<subsystem>/admin/console/js + # Copy /usr/share/pki/server/webapps/pki/admin + # to <instance>/webapp/<subsystem>/admin return 0 if !copy_directory( - "$common_ui_subsystem_path/admin/console/js", - "$webapps_subsystem_instance_path/admin/console/js", + "$pki_subsystem_common_area/server/webapps/pki/admin", + "$webapps_subsystem_instance_path/admin", $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); |