summary refs log tree commit diff
path: root/nixos/modules/services/monitoring/graphite.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-04-17 15:49:46 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-04-17 15:51:28 +0200
commit705dd70b32e2764ae8489a286afce896d48ebe93 (patch)
tree1f22efd9a777556a0338a89a9261465db57ec73e /nixos/modules/services/monitoring/graphite.nix
parentffb593f88093760bc0a1d7c925661aad1a5955bc (diff)
downloadnixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar.gz
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar.bz2
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar.lz
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar.xz
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.tar.zst
nixpkgs-705dd70b32e2764ae8489a286afce896d48ebe93.zip
nixos/grahite-service: mkdir -m => mkdir && chmod
mkdir -m will only set the permissions if it *creates* the directory.
Existing directories, with possibly wrong permissions, will not be
updated.

Use explicit chmod so permissions will always be correct.
Diffstat (limited to 'nixos/modules/services/monitoring/graphite.nix')
-rw-r--r--nixos/modules/services/monitoring/graphite.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index abdaf6ec296..d543d15b34e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -194,7 +194,8 @@ in {
         cfg.carbon.rewriteRules
       ];
       preStart = ''
-        mkdir -m 0700 -p ${cfg.dataDir}/whisper
+        mkdir -p ${cfg.dataDir}/whisper
+        chmod 0700 ${cfg.dataDir}/whisper
         chown -R graphite:graphite ${cfg.dataDir}
       '';
     };
@@ -254,7 +255,8 @@ in {
       };
       preStart = ''
         if ! test -e ${dataDir}/db-created; then
-          mkdir -m 0700 -p ${dataDir}/{whisper/,log/webapp/}
+          mkdir -p ${dataDir}/{whisper/,log/webapp/}
+          chmod 0700 ${dataDir}/{whisper/,log/webapp/}
 
           # populate database
           ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput