From 62720dec13da27d6185efc5bd9971c1ea7fe9a6f Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Thu, 31 Aug 2023 15:12:43 +0200 Subject: [PATCH] Fix path after installation to /usr/bin after installation --- scripts/cc-metric-collector.service | 2 +- scripts/cc-metric-collector.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cc-metric-collector.service b/scripts/cc-metric-collector.service index 9c2fd1e..a8400ea 100644 --- a/scripts/cc-metric-collector.service +++ b/scripts/cc-metric-collector.service @@ -13,7 +13,7 @@ Restart=on-failure WorkingDirectory=/tmp RuntimeDirectory=cc-metric-collector RuntimeDirectoryMode=0750 -ExecStart=/usr/sbin/cc-metric-collector --config=${CONF_FILE} +ExecStart=/usr/bin/cc-metric-collector --config=${CONF_FILE} LimitNOFILE=10000 TimeoutStopSec=20 UMask=0027 diff --git a/scripts/cc-metric-collector.spec b/scripts/cc-metric-collector.spec index b1b405e..ff667f9 100644 --- a/scripts/cc-metric-collector.spec +++ b/scripts/cc-metric-collector.spec @@ -29,7 +29,7 @@ make %install -install -Dpm 0750 %{name} %{buildroot}%{_sbindir}/%{name} +install -Dpm 0750 %{name} %{buildroot}%{_bindir}/%{name} install -Dpm 0600 config.json %{buildroot}%{_sysconfdir}/%{name}/%{name}.json install -Dpm 0600 collectors.json %{buildroot}%{_sysconfdir}/%{name}/collectors.json install -Dpm 0600 sinks.json %{buildroot}%{_sysconfdir}/%{name}/sinks.json @@ -54,7 +54,7 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c %files # Binary -%attr(-,clustercockpit,clustercockpit) %{_sbindir}/%{name} +%attr(-,clustercockpit,clustercockpit) %{_bindir}/%{name} # Config %dir %{_sysconfdir}/%{name} %attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json