graphite service: no recursive chown when starting (#24442)

Fixes #24444
This commit is contained in:
Andrew Martin
2017-04-27 17:33:42 +02:00
committed by Franz Pletz
parent b9371e83e4
commit e289b94fbe
+10 -6
View File
@@ -400,7 +400,8 @@ in {
mkdir -p ${cfg.dataDir}/whisper mkdir -p ${cfg.dataDir}/whisper
chmod 0700 ${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 # create index
${pkgs.python27Packages.graphite_web}/bin/build-index.sh ${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 fi
''; '';
}; };
@@ -526,9 +529,10 @@ in {
mkdir -p ${dataDir}/cache/ mkdir -p ${dataDir}/cache/
chmod 0700 ${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 fi
''; '';
}; };
@@ -549,7 +553,7 @@ in {
preStart = '' preStart = ''
if ! test -e ${dataDir}/db-created; then if ! test -e ${dataDir}/db-created; then
mkdir -p ${dataDir} mkdir -p ${dataDir}
chown -R graphite:graphite ${dataDir} chown graphite:graphite ${dataDir}
fi fi
''; '';
}; };