From 9bd9a0781057aece7a3025e9b19b8a3b717b5cfa Mon Sep 17 00:00:00 2001 From: Michael Panzlaff Date: Tue, 21 Jul 2026 13:40:42 +0200 Subject: [PATCH] Prepare for FAU --- scripts/cc-metric-collector.config | 4 ++-- scripts/cc-metric-collector.init | 4 ++-- scripts/cc-metric-collector.service | 6 +++--- scripts/cc-metric-collector.spec | 12 ++++++------ scripts/cc-metric-collector.sysusers | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/cc-metric-collector.config b/scripts/cc-metric-collector.config index 0f5e1ba..5be6ba2 100644 --- a/scripts/cc-metric-collector.config +++ b/scripts/cc-metric-collector.config @@ -1,6 +1,6 @@ -CC_USER=clustercockpit +CC_USER=monitoring -CC_GROUP=clustercockpit +CC_GROUP=monitoring CC_HOME=/tmp diff --git a/scripts/cc-metric-collector.init b/scripts/cc-metric-collector.init index e7d87cf..39f1a6a 100755 --- a/scripts/cc-metric-collector.init +++ b/scripts/cc-metric-collector.init @@ -21,8 +21,8 @@ NAME=cc-metric-collector DESC="ClusterCockpit metric collector" DEFAULT=/etc/default/${NAME} -CC_USER=clustercockpit -CC_GROUP=clustercockpit +CC_USER=monitoring +CC_GROUP=monitoring CONF_DIR=/etc/cc-metric-collector PID_FILE=/var/run/$NAME.pid DAEMON=/usr/bin/$NAME diff --git a/scripts/cc-metric-collector.service b/scripts/cc-metric-collector.service index a8400ea..f890732 100644 --- a/scripts/cc-metric-collector.service +++ b/scripts/cc-metric-collector.service @@ -2,12 +2,12 @@ Description=ClusterCockpit metric collector Documentation=https://github.com/ClusterCockpit/cc-metric-collector Wants=network-online.target -After=network-online.target +After=network-online.target remote-fs.target [Service] EnvironmentFile=/etc/default/cc-metric-collector -User=clustercockpit -Group=clustercockpit +User=monitoring +Group=monitoring Type=simple Restart=on-failure WorkingDirectory=/tmp diff --git a/scripts/cc-metric-collector.spec b/scripts/cc-metric-collector.spec index 1798bfc..68009ac 100644 --- a/scripts/cc-metric-collector.spec +++ b/scripts/cc-metric-collector.spec @@ -57,11 +57,11 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c %attr(-,root,root) %{_bindir}/%{name} # Config %dir %{_sysconfdir}/%{name} -%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json -%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json -%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json -%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json -%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/router.json +%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json +%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json +%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json +%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json +%attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/router.json # Systemd %{_unitdir}/%{name}.service %{_sysconfdir}/default/%{name} @@ -69,7 +69,7 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c %changelog * Thu Mar 03 2022 Thomas Gruber - 0.3 -- Add clustercockpit user installation +- Add monitoring user installation * Mon Feb 14 2022 Thomas Gruber - 0.2 - Add component specific configuration files - Add %attr to config files diff --git a/scripts/cc-metric-collector.sysusers b/scripts/cc-metric-collector.sysusers index 6ce3700..46fa03a 100644 --- a/scripts/cc-metric-collector.sysusers +++ b/scripts/cc-metric-collector.sysusers @@ -1,2 +1,2 @@ -#Type Name ID GECOS Home directory Shell -u clustercockpit - "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin +#Type Name ID GECOS Home directory Shell +u monitoring 905 "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin