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-03 11:40:53 -0500 |
| commit | a4c95c3d9fd9814eb3b1bbb7d987d906e423a42e (patch) | |
| tree | 72279336c4c62bed682be5aed431a519acce004c /base | |
| parent | 3dfee9129baeac450134813ce9f7c7644efed4dc (diff) | |
| download | pki-a4c95c3d9fd9814eb3b1bbb7d987d906e423a42e.tar.gz pki-a4c95c3d9fd9814eb3b1bbb7d987d906e423a42e.tar.xz pki-a4c95c3d9fd9814eb3b1bbb7d987d906e423a42e.zip | |
Removed RA and TPS theme packages.
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( |