fix installing netdata-updater svc/timer for native packages (#18032)
Co-authored-by: Austin S. Hemmelgarn <austin@netdata.cloud>
Ilya Mashchenko committed
Jun 29, 2024 at 22:23 UTC
0157e9b600ec141e9caea70fe1732664ef21f7b2
2 files changed
+32
-15
CMakeLists.txt
+23
-15
@@ -2582,21 +2582,6 @@ install(FILES
2582
COMPONENT netdata
2583
DESTINATION usr/lib/netdata/system/systemd)
2584
2585
-if(BUILD_FOR_PACKAGING)
2586
- install(FILES
2587
- ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
2588
- COMPONENT netdata
2589
- DESTINATION lib/systemd/system)
2590
- install(DIRECTORY
2591
- COMPONENT netdata
2592
- DESTINATION usr/lib/systemd/journald@netdata.conf.d)
2593
- install(FILES
2594
- system/systemd/journald@netdata.conf
2595
- COMPONENT netdata
2596
- DESTINATION usr/lib/systemd/journald@netdata.conf.d
2597
- RENAME netdata.conf)
2598
-endif()
2599
-
2585
configure_file(system/systemd/netdata.service.v235.in system/systemd/netdata.service.v235 @ONLY)
2586
install(FILES
2587
${CMAKE_BINARY_DIR}/system/systemd/netdata.service.v235
@@ -2614,6 +2599,29 @@ install(FILES
2599
COMPONENT netdata
2600
DESTINATION usr/lib/netdata/system/systemd)
2601
2602
+if(BUILD_FOR_PACKAGING)
2603
+ install(FILES
2604
+ ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
2605
+ COMPONENT netdata
2606
+ DESTINATION lib/systemd/system)
2607
+ install(FILES
2608
+ ${CMAKE_BINARY_DIR}/system/systemd/netdata-updater.service
2609
+ COMPONENT netdata
2610
+ DESTINATION lib/systemd/system)
2611
+ install(FILES
2612
+ system/systemd/netdata-updater.timer
2613
+ COMPONENT netdata
2614
+ DESTINATION lib/systemd/system)
2615
+ install(DIRECTORY
2616
+ COMPONENT netdata
2617
+ DESTINATION usr/lib/systemd/journald@netdata.conf.d)
2618
+ install(FILES
2619
+ system/systemd/journald@netdata.conf
2620
+ COMPONENT netdata
2621
+ DESTINATION usr/lib/systemd/journald@netdata.conf.d
2622
+ RENAME netdata.conf)
2623
+endif()
2624
+
2625
install(FILES
2626
system/systemd/50-netdata.preset
2627
COMPONENT netdata
netdata.spec.in
+9
@@ -54,6 +54,8 @@ AutoReqProv: yes
54
%define _libexecdir /usr/libexec
55
%define _libdir /usr/lib
56
57
+%{!?_systemd_util_dir:%global _systemd_util_dir /usr/lib/systemd}
58
+
59
# Fedora doesn’t define this, but other distros do
60
%{!?_presetdir:%global _presetdir %{_libdir}/systemd/system-preset}
61
@@ -447,8 +449,12 @@ install -m 644 -p "%{__cmake_builddir}/system/systemd/%{name}.service" "${RPM_BU
449
%else
450
install -m 644 -p "%{__cmake_builddir}/system/systemd/%{name}.service.v235" "${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service"
451
%endif
452
+install -m 644 -p "system/systemd/netdata-updater.timer" "${RPM_BUILD_ROOT}%{_unitdir}/%{name}-updater.timer"
453
+install -m 644 -p "%{__cmake_builddir}/system/systemd/%{name}-updater.service" "${RPM_BUILD_ROOT}%{_unitdir}/%{name}-updater.service"
454
install -m 755 -d "${RPM_BUILD_ROOT}%{_presetdir}"
455
install -m 644 -p "system/systemd/50-%{name}.preset" "${RPM_BUILD_ROOT}%{_presetdir}/50-%{name}.preset"
456
+install -m 755 -d "${RPM_BUILD_ROOT}%{_systemd_util_dir}/journald@%{name}.conf.d"
457
+install -m 644 -p "system/systemd/journald@%{name}.conf" "${RPM_BUILD_ROOT}%{_systemd_util_dir}/journald@%{name}.conf.d/%{name}.conf"
458
459
%pre
460
@@ -510,7 +516,10 @@ rm -rf "${RPM_BUILD_ROOT}"
516
%{_sbindir}/%{name}-claim.sh
517
518
%{_unitdir}/%{name}.service
519
+%{_unitdir}/%{name}-updater.timer
520
+%{_unitdir}/%{name}-updater.service
521
%{_presetdir}/50-%{name}.preset
522
+%{_systemd_util_dir}/journald@%{name}.conf.d/%{name}.conf
523
524
%dir %{_libexecdir}/%{name}
525
%dir %{_libexecdir}/%{name}/plugins.d