Browse Source

Fix handling of netdata.conf on install in build system. (#17572)

* Fix handling of netdata.conf on install in build system.

* Fix RPM build handling.

* Update netdata.spec.in

---------

Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Austin S. Hemmelgarn 10 months ago
parent
commit
0f2a261839
2 changed files with 10 additions and 7 deletions
  1. 8 6
      CMakeLists.txt
  2. 2 1
      netdata.spec.in

+ 8 - 6
CMakeLists.txt

@@ -2523,20 +2523,22 @@ install(FILES
         COMPONENT netdata
         DESTINATION etc/netdata)
 
-install(FILES
-        system/netdata-updater.conf
-        COMPONENT netdata
-        DESTINATION etc/netdata)
-
 install(PROGRAMS
         system/edit-config
         COMPONENT netdata
         DESTINATION etc/netdata)
 
+if(BUILD_FOR_PACKAGING)
+        set(NETDATA_CONF_DEST "etc/netdata")
+else()
+        set(NETDATA_CONF_DEST "usr/lib/netdata/conf.d")
+endif()
+
 install(FILES
         system/netdata.conf
+        system/netdata-updater.conf
         COMPONENT netdata
-        DESTINATION etc/netdata)
+        DESTINATION ${NETDATA_CONF_DEST})
 
 #
 # misc files

+ 2 - 1
netdata.spec.in

@@ -396,7 +396,8 @@ happened, on your systems and applications.
 rm -rf "${RPM_BUILD_ROOT}"
 %{cmake_install}
 
-install -m 644 -p "system/%{name}.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
+install -m 644 -p "${RPM_BUILD_ROOT}%{_libdir}/%{name}/conf.d/%{name}.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
+install -m 644 -p "${RPM_BUILD_ROOT}%{_libdir}/%{name}/conf.d/%{name}-updater.conf" "${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}"
 
 # ###########################################################
 # Install updater script