summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAndrew Martin <andrew.thaddeus@gmail.com>2017-04-27 11:33:42 -0400
committerFranz Pletz <fpletz@fnordicwalking.de>2017-04-27 17:33:42 +0200
commite289b94fbe771ad9afdd43750087108330745b53 (patch)
tree72322bf1f5d4afb05f6d322786a4437ad309b13d /nixos
parentb9371e83e40ee833b25fc8855f003c2cc3508d86 (diff)
downloadnixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar.gz
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar.bz2
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar.lz
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar.xz
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.tar.zst
nixpkgs-e289b94fbe771ad9afdd43750087108330745b53.zip
graphite service: no recursive chown when starting (#24442)
Fixes #24444
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/monitoring/graphite.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 98931e65bb5..6b24ac2c7c6 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -400,7 +400,8 @@ in {
 
           mkdir -p ${cfg.dataDir}/whisper
           chmod 0700 ${cfg.dataDir}/whisper
-          chown -R graphite:graphite ${cfg.dataDir}
+          chown graphite:graphite ${cfg.dataDir}
+          chown graphite:graphite ${cfg.dataDir}/whisper
         '';
       };
     })
@@ -487,9 +488,11 @@ in {
             # create index
             ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
 
-            touch ${dataDir}/db-created
+            chown graphite:graphite ${cfg.dataDir}
+            chown graphite:graphite ${cfg.dataDir}/whisper
+            chown -R graphite:graphite ${cfg.dataDir}/log
 
-            chown -R graphite:graphite ${cfg.dataDir}
+            touch ${dataDir}/db-created
           fi
         '';
       };
@@ -526,9 +529,10 @@ in {
             mkdir -p ${dataDir}/cache/
             chmod 0700 ${dataDir}/cache/
 
-            touch ${dataDir}/db-created
+            chown graphite:graphite ${cfg.dataDir}
+            chown -R graphite:graphite ${cfg.dataDir}/cache
 
-            chown -R graphite:graphite ${cfg.dataDir}
+            touch ${dataDir}/db-created
           fi
         '';
       };
@@ -549,7 +553,7 @@ in {
         preStart = ''
           if ! test -e ${dataDir}/db-created; then
             mkdir -p ${dataDir}
-            chown -R graphite:graphite ${dataDir}
+            chown graphite:graphite ${dataDir}
           fi
         '';
       };