This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch MINIFICPP-2584-apache
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/MINIFICPP-2584-apache by this
push:
new bcd8f7549 Use nickname 2
bcd8f7549 is described below
commit bcd8f7549fde8c2a90e5c2bb42a7562ca9abfce5
Author: Martin Zink <[email protected]>
AuthorDate: Tue Jul 15 13:28:00 2025 +0200
Use nickname 2
---
cmake/Extensions.cmake | 2 +-
.../integration/cluster/containers/MinifiContainer.py | 18 +++++++++---------
libminifi/CMakeLists.txt | 2 +-
libminifi/include/properties/LocationsImpl.h | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake
index ecf3bc6aa..fb3980952 100644
--- a/cmake/Extensions.cmake
+++ b/cmake/Extensions.cmake
@@ -80,7 +80,7 @@ macro(register_extension extension-name
extension-display-name extension-guard d
endif()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
install(TARGETS ${extension-name}
- LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extensions/
+ LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}/extensions/
COMPONENT ${component-name})
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
install(TARGETS ${extension-name} LIBRARY DESTINATION
extensions COMPONENT ${component-name})
diff --git a/docker/test/integration/cluster/containers/MinifiContainer.py
b/docker/test/integration/cluster/containers/MinifiContainer.py
index dbbdc2143..5341f9430 100644
--- a/docker/test/integration/cluster/containers/MinifiContainer.py
+++ b/docker/test/integration/cluster/containers/MinifiContainer.py
@@ -58,16 +58,16 @@ class MinifiLocations:
def __init__(self):
if "rpm" in MinifiLocations.MINIFI_TAG_PREFIX:
self.run_minifi_cmd = '/usr/bin/minifi'
- self.config_path = '/etc/nifi-minifi-cpp/config.yml'
- self.properties_path = '/etc/nifi-minifi-cpp/minifi.properties'
- self.log_properties_path =
'/etc/nifi-minifi-cpp/minifi-log.properties'
- self.uid_properties_path =
'/etc/nifi-minifi-cpp/minifi-uid.properties'
- self.minifi_python_dir_path =
'/var/lib/nifi-minifi-cpp/minifi-python'
- self.minifi_python_venv_parent = '/var/lib/nifi-minifi-cpp'
- self.minifi_python_examples =
'/usr/share/doc/nifi-minifi-cpp/pythonprocessor-examples'
- self.models_path = '/var/lib/nifi-minifi-cpp/models'
+ self.config_path = '/etc/minifi-cpp/config.yml'
+ self.properties_path = '/etc/minifi-cpp/minifi.properties'
+ self.log_properties_path = '/etc/minifi-cpp/minifi-log.properties'
+ self.uid_properties_path = '/etc/minifi-cpp/minifi-uid.properties'
+ self.minifi_python_dir_path = '/var/lib/minifi-cpp/minifi-python'
+ self.minifi_python_venv_parent = '/var/lib/minifi-cpp'
+ self.minifi_python_examples =
'/usr/share/doc/minifi-cpp/pythonprocessor-examples'
+ self.models_path = '/var/lib/minifi-cpp/models'
self.minifi_controller_path = '/usr/bin/minifi-controller'
- self.minifi_home = '/var/lib/nifi-minifi-cpp'
+ self.minifi_home = '/var/lib/minifi-cpp'
else:
self.run_minifi_cmd = '/opt/minifi/minifi-current/bin/minifi.sh
run'
self.config_path = '/opt/minifi/minifi-current/conf/config.yml'
diff --git a/libminifi/CMakeLists.txt b/libminifi/CMakeLists.txt
index 9408b421f..441f46325 100644
--- a/libminifi/CMakeLists.txt
+++ b/libminifi/CMakeLists.txt
@@ -107,7 +107,7 @@ if (WIN32)
else()
if (MINIFI_PACKAGING_TYPE STREQUAL "RPM")
install(TARGETS core-minifi
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nifi-minifi-cpp
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NICKNAME}
COMPONENT bin)
elseif (MINIFI_PACKAGING_TYPE STREQUAL "TGZ")
install(TARGETS core-minifi LIBRARY DESTINATION bin COMPONENT bin)
diff --git a/libminifi/include/properties/LocationsImpl.h
b/libminifi/include/properties/LocationsImpl.h
index 5f602e11f..0b5e7dfb8 100644
--- a/libminifi/include/properties/LocationsImpl.h
+++ b/libminifi/include/properties/LocationsImpl.h
@@ -53,15 +53,15 @@ class LocationsImpl final : public Locations {
static std::shared_ptr<LocationsImpl> createForFHS() {
return std::shared_ptr<LocationsImpl>(new LocationsImpl(M{
- .working_dir_ = "/var/lib/nifi-minifi-cpp",
- .lock_path_ = "/var/lib/nifi-minifi-cpp/LOCK",
- .log_properties_path_ = "/etc/nifi-minifi-cpp/minifi-log.properties",
- .uid_properties_path_ = "/etc/nifi-minifi-cpp/minifi-uid.properties",
- .properties_path_ = "/etc/nifi-minifi-cpp/minifi.properties",
- .logs_dir_ = "/var/log/nifi-minifi-cpp",
- .fips_bin_path_ = "/usr/lib64/nifi-minifi-cpp/fips",
- .fips_conf_path_ = "/etc/nifi-minifi-cpp/fips",
- .extensions_pattern_ = "/usr/lib64/nifi-minifi-cpp/extensions/*"
+ .working_dir_ = "/var/lib/minifi-cpp",
+ .lock_path_ = "/var/lib/minifi-cpp/LOCK",
+ .log_properties_path_ = "/etc/minifi-cpp/minifi-log.properties",
+ .uid_properties_path_ = "/etc/minifi-cpp/minifi-uid.properties",
+ .properties_path_ = "/etc/minifi-cpp/minifi.properties",
+ .logs_dir_ = "/var/log/minifi-cpp",
+ .fips_bin_path_ = "/usr/lib64/minifi-cpp/fips",
+ .fips_conf_path_ = "/etc/minifi-cpp/fips",
+ .extensions_pattern_ = "/usr/lib64/minifi-cpp/extensions/*"
}));
}
