Prepare for FAU

This commit is contained in:
Michael Panzlaff
2026-07-21 13:40:42 +02:00
parent a0aedff202
commit 9bd9a07810
5 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
CC_USER=clustercockpit CC_USER=monitoring
CC_GROUP=clustercockpit CC_GROUP=monitoring
CC_HOME=/tmp CC_HOME=/tmp
+2 -2
View File
@@ -21,8 +21,8 @@ NAME=cc-metric-collector
DESC="ClusterCockpit metric collector" DESC="ClusterCockpit metric collector"
DEFAULT=/etc/default/${NAME} DEFAULT=/etc/default/${NAME}
CC_USER=clustercockpit CC_USER=monitoring
CC_GROUP=clustercockpit CC_GROUP=monitoring
CONF_DIR=/etc/cc-metric-collector CONF_DIR=/etc/cc-metric-collector
PID_FILE=/var/run/$NAME.pid PID_FILE=/var/run/$NAME.pid
DAEMON=/usr/bin/$NAME DAEMON=/usr/bin/$NAME
+3 -3
View File
@@ -2,12 +2,12 @@
Description=ClusterCockpit metric collector Description=ClusterCockpit metric collector
Documentation=https://github.com/ClusterCockpit/cc-metric-collector Documentation=https://github.com/ClusterCockpit/cc-metric-collector
Wants=network-online.target Wants=network-online.target
After=network-online.target After=network-online.target remote-fs.target
[Service] [Service]
EnvironmentFile=/etc/default/cc-metric-collector EnvironmentFile=/etc/default/cc-metric-collector
User=clustercockpit User=monitoring
Group=clustercockpit Group=monitoring
Type=simple Type=simple
Restart=on-failure Restart=on-failure
WorkingDirectory=/tmp WorkingDirectory=/tmp
+6 -6
View File
@@ -57,11 +57,11 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c
%attr(-,root,root) %{_bindir}/%{name} %attr(-,root,root) %{_bindir}/%{name}
# Config # Config
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json %attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json
%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json %attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/collectors.json
%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json %attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/sinks.json
%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json %attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/receivers.json
%attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/router.json %attr(0600,monitoring,monitoring) %config(noreplace) %{_sysconfdir}/%{name}/router.json
# Systemd # Systemd
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sysconfdir}/default/%{name} %{_sysconfdir}/default/%{name}
@@ -69,7 +69,7 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c
%changelog %changelog
* Thu Mar 03 2022 Thomas Gruber - 0.3 * Thu Mar 03 2022 Thomas Gruber - 0.3
- Add clustercockpit user installation - Add monitoring user installation
* Mon Feb 14 2022 Thomas Gruber - 0.2 * Mon Feb 14 2022 Thomas Gruber - 0.2
- Add component specific configuration files - Add component specific configuration files
- Add %attr to config files - Add %attr to config files
+2 -2
View File
@@ -1,2 +1,2 @@
#Type Name ID GECOS Home directory Shell #Type Name ID GECOS Home directory Shell
u clustercockpit - "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin u monitoring 905 "User for ClusterCockpit" /run/cc-metric-collector /sbin/nologin