#4 fix Bug 1906930: the web dir of netdata has wrong group
Merged 3 years ago by tartare. Opened 3 years ago by braindevices.
https://github.com/braindevices/fedora-rpms-netdata.git master  into  master

avoid change all files to 755
Ling Wang@g731gw • 3 years ago  
add changelog
Ling Wang @ VMCentOS01 • 3 years ago  
fix Bug 1906930: the web dir of netdata has wrong group
Ling Wang @ VMCentOS01 • 3 years ago  
netdata.spec
file modified
+5 -1
@@ -33,7 +33,7 @@

  

  Name:           netdata

  Version:        %{upver}%{?rcver:~%{rcver}}

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        Real-time performance monitoring

  # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md

  License:        GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL 
@@ -258,6 +258,7 @@

  %license LICENSE REDISTRIBUTED.md

  %dir %{_datadir}/%{name}

  %{_datadir}/%{name}/web

+ %attr(-, root, netdata) %{_datadir}/%{name}/web

  

  

  %files freeipmi
@@ -266,6 +267,9 @@

  %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin

  

  %changelog

+ * Fri Dec 11 2020  Ling Wang <LingWangNeuralEng@gmail.com> 1.26.0-3

+ - fix Bug 1906930: change /usr/share/netdata/web group to netdata

+ 

  * Mon Nov 02 2020 Didier Fabert <didier.fabert@gmail.com> 1.26.0-2

  - Fix wrong drop for el6 support

  - Fix tmpfiles (from /var/run to /run)

no initial comment

1 new commit added

  • add changelog
3 years ago

It's not so simple
In netdata.conf, group is explicitly set and the page is not rendered if there is a mismatch between values.

[web]
    web files group = root

@tartare this is exactly why I have this pr. At least, it need to match the default setting coming with the rpm. By default the group is set to netdata in netdata.conf

any package with default setting should just work. If people want to change the group to root, they need to change the group of the web dir too. Maybe we should not modify the directory at all if the dir exists. Otherewise, it breaks netdata everytime we installed new update.

Yes I understand why I'm not understand you. The netdata.conf with group fixed to netdata shoud not be present in git, it's a mistake. And for me it fix the group to root.

But now there is, your PR fix the bug but set all files under /usr/share/netdata/web executable.

So please fix your PR like this

%attr(-, root, netdata) %{_datadir}/%{name}/web

In this way, files keep initial permissions and I merge your PR.

1 new commit added

  • avoid change all files to 755
3 years ago

Pull-Request has been merged by tartare

3 years ago