diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-23 16:18:10 -0400 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-04-24 16:00:19 -0400 |
| commit | 058e93de372e5825b748bbd54ef0ea091d0b86cc (patch) | |
| tree | 9db6468722efec4ffd3e8969f07a19456c601234 | |
| parent | f6deaf5f189eb6f940af80d621a5ba59fde56de0 (diff) | |
| download | pki-058e93de372e5825b748bbd54ef0ea091d0b86cc.tar.gz pki-058e93de372e5825b748bbd54ef0ea091d0b86cc.tar.xz pki-058e93de372e5825b748bbd54ef0ea091d0b86cc.zip | |
Moved pki.conf into base/common.
The pki.conf has been moved into the base/common folder to match
the RPM package.
Ticket #553
| -rw-r--r-- | base/common/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | base/common/etc/pki.conf (renamed from base/server/etc/pki.conf) | 0 | ||||
| -rw-r--r-- | base/server/CMakeLists.txt | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt index e48133986..727307986 100644 --- a/base/common/CMakeLists.txt +++ b/base/common/CMakeLists.txt @@ -1,5 +1,18 @@ project(common NONE) +# install common configuration files +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/etc/pki.conf + ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf +) + +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf + DESTINATION + ${SYSCONF_INSTALL_DIR}/pki/ +) + # install Python libraries install( DIRECTORY diff --git a/base/server/etc/pki.conf b/base/common/etc/pki.conf index c7f4f8470..c7f4f8470 100644 --- a/base/server/etc/pki.conf +++ b/base/common/etc/pki.conf diff --git a/base/server/CMakeLists.txt b/base/server/CMakeLists.txt index dfbcad372..a2ba5183e 100644 --- a/base/server/CMakeLists.txt +++ b/base/server/CMakeLists.txt @@ -98,24 +98,12 @@ install( ${DATA_INSTALL_DIR}/deployment ) +# install server configuration files install( DIRECTORY etc/ DESTINATION ${SYSCONF_INSTALL_DIR}/pki - PATTERN "pki.conf" EXCLUDE -) - -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/etc/pki.conf - ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf -) - -install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf - DESTINATION - ${SYSCONF_INSTALL_DIR}/pki/ ) install( |