On Wed, Apr 22, 2020 at 01:34:21PM +0200, Martin Reindl wrote: > On Wed, Apr 15, 2020 at 05:44:24PM +0200, Rafael Sadowski wrote: > > On Wed Apr 15, 2020 at 04:18:56PM +0200, Eric Elena wrote: > > > On Wed, 15 Apr 2020 08:51:35 +0200 Landry Breuil wrote: > > > > This version works for me. OK rsadowski@ > > Apologies for the delayed followup. Per Stuart's recommendation the update to > 6.7.2 was commited independently without any changes to permissions. > > Attached diff is the essence of Eric's diff with regard to file permissions. > Rafael, is your OK still valid?
im not sure the @owner root dance is necessary (and it doesnt feel consistent in the diff ?), but for completeness it might be good. Reads good to me. for completeness, before: 631 4 drwxr-xr-x 3 root wheel 512 Apr 20 09:16 /etc/grafana/ 489 8 -rw-r--r-- 1 root wheel 2289 Apr 20 09:16 /etc/grafana/ldap.toml 724 28 -rw-r--r-- 1 root wheel 13088 Jan 4 2018 /etc/grafana/config.ini 26022 4 drwxr-xr-x 5 root wheel 512 Mar 16 14:32 /etc/grafana/provisioning 26023 4 drwxr-xr-x 2 root wheel 512 Apr 20 09:16 /etc/grafana/provisioning/dashboards 26024 4 -rw-r--r-- 1 root wheel 185 Apr 20 09:16 /etc/grafana/provisioning/dashboards/sample.yaml 26025 4 drwxr-xr-x 2 root wheel 512 Apr 20 09:16 /etc/grafana/provisioning/datasources 26026 4 -rw-r--r-- 1 root wheel 1638 Apr 20 09:16 /etc/grafana/provisioning/datasources/sample.yaml 26262 4 drwxr-xr-x 2 root wheel 512 Apr 20 09:16 /etc/grafana/provisioning/notifiers 26252 4 -rw-r--r-- 1 root wheel 555 Apr 20 09:16 /etc/grafana/provisioning/notifiers/sample.yaml after: [14:22] c64:/usr/ports/sysutils/grafana/ $make update --- -grafana-6.7.2 ------------------- You should also run rm -rf /var/log/grafana/ You should also run rm -rf /var/grafana/ You should also check /etc/grafana/config.ini (which was modified) [14:32] c64:/usr/ports/sysutils/grafana/ $find /etc/grafana/ -ls 631 4 drwxr-xr-x 3 root _grafana 512 Apr 22 14:27 /etc/grafana/ 489 8 -rw-r----- 1 root _grafana 2289 Apr 22 14:27 /etc/grafana/ldap.toml 724 28 -rw-r--r-- 1 root wheel 13088 Jan 4 2018 /etc/grafana/config.ini 26022 4 drwxr-xr-x 5 root _grafana 512 Mar 16 14:32 /etc/grafana/provisioning 26023 4 drwxr-xr-x 2 root _grafana 512 Apr 22 14:27 /etc/grafana/provisioning/dashboards 26024 4 -rw-r----- 1 root _grafana 185 Apr 22 14:27 /etc/grafana/provisioning/dashboards/sample.yaml 26025 4 drwxr-xr-x 2 root _grafana 512 Apr 22 14:27 /etc/grafana/provisioning/datasources 26026 4 -rw-r----- 1 root _grafana 1638 Apr 22 14:27 /etc/grafana/provisioning/datasources/sample.yaml 26262 4 drwxr-xr-x 2 root _grafana 512 Apr 22 14:27 /etc/grafana/provisioning/notifiers 26252 4 -rw-r----- 1 root _grafana 555 Apr 22 14:27 /etc/grafana/provisioning/notifiers/sample.yaml so besides config.ini perms which werent fixed because i had a custom config (and you cant do much about it i think? have a special quick to update perms for @sample files without overwriting their content), the others look fine. anyway, ok for me. Landry