diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-22 02:23:24 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-02 19:07:31 -0500 |
| commit | bb08d0e676f557f42b4af5be159f93b476afce8a (patch) | |
| tree | b920dad38703e69d8624f7c5a99c58b32bb4f28f /base | |
| parent | e74838f385509484b45d53a8a2ff6b13db3db454 (diff) | |
| download | pki-bb08d0e676f557f42b4af5be159f93b476afce8a.tar.gz pki-bb08d0e676f557f42b4af5be159f93b476afce8a.tar.xz pki-bb08d0e676f557f42b4af5be159f93b476afce8a.zip | |
Removed RA and TPS theme packages.ticket-407-9
The RA and TPS theme packages are no longer necessary due to the
reorganization of the theme files. The build and deployment
scripts have been updated accordingly.
Ticket #407
Diffstat (limited to 'base')
| -rw-r--r-- | base/ra/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | base/setup/pkicreate | 7 | ||||
| -rw-r--r-- | base/tps/CMakeLists.txt | 19 |
3 files changed, 9 insertions, 25 deletions
diff --git a/base/ra/CMakeLists.txt b/base/ra/CMakeLists.txt index 79152e291..ece6713c6 100644 --- a/base/ra/CMakeLists.txt +++ b/base/ra/CMakeLists.txt @@ -37,16 +37,16 @@ install( install( DIRECTORY - emails/ + apache/docroot DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} ) install( DIRECTORY - forms/ + emails/ DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/docroot + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf ) install( diff --git a/base/setup/pkicreate b/base/setup/pkicreate index 6f63e96e8..a9ac1890e 100755 --- a/base/setup/pkicreate +++ b/base/setup/pkicreate @@ -2061,12 +2061,7 @@ sub process_pki_directories $default_dir_permissions, $default_file_permissions, $pki_user, $pki_group); - return 0 if !copy_directory($ui_subsystem_path, $pki_instance_path, - $default_dir_permissions, $default_file_permissions, - $pki_user, $pki_group); - - # Copy /usr/share/pki/common-ui - # to <instance>/docroot/pki + # Copy /usr/share/pki/common-ui to <instance>/docroot/pki return 0 if !copy_directory( $common_ui_subsystem_path, "$docroot_instance_path/pki", diff --git a/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt index 10c4d8efd..954146cb4 100644 --- a/base/tps/CMakeLists.txt +++ b/base/tps/CMakeLists.txt @@ -79,7 +79,7 @@ install( install( DIRECTORY - forms/esc/cgi-bin + apache/cgi-bin DESTINATION ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} ) @@ -92,21 +92,10 @@ install( ) install( - FILES - forms/index.html - DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/docroot -) - -install( - FILES - forms/index.cgi + DIRECTORY + apache/docroot DESTINATION - ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/docroot - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ + ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME} ) install( |