alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #2301 from bjornfor/graphite-fixes

Browse source 
nixos/graphite-service: fix startup
This commit is contained in:
lethalman 2014-05-14 21:44:43 +02:00
parent 2baeefee27 705dd70b32
commit 8967d2d3b3
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/services/monitoring/graphite.nix
View file

@ -184,6 +184,7 @@ in {
ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
User = "graphite"; User = "graphite";
Group = "graphite"; Group = "graphite";
PermissionsStartOnly = true;
}; };
restartTriggers = [ restartTriggers = [
pkgs.pythonPackages.carbon pkgs.pythonPackages.carbon
@ -193,8 +194,9 @@ in {
cfg.carbon.rewriteRules cfg.carbon.rewriteRules
]; ];
preStart = '' preStart = ''
mkdir -m 0700 -p ${cfg.dataDir}/whisper mkdir -p ${cfg.dataDir}/whisper
if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi chmod 0700 ${cfg.dataDir}/whisper
chown -R graphite:graphite ${cfg.dataDir}
''; '';
}; };
@ -235,6 +237,7 @@ in {
description = "Graphite Web Interface"; description = "Graphite Web Interface";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; after = [ "network-interfaces.target" ];
path = [ pkgs.perl ];
environment = { environment = {
PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages"; PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages";
DJANGO_SETTINGS_MODULE = "graphite.settings"; DJANGO_SETTINGS_MODULE = "graphite.settings";
@ -248,11 +251,12 @@ in {
--call django.core.handlers.wsgi:WSGIHandler''; --call django.core.handlers.wsgi:WSGIHandler'';
User = "graphite"; User = "graphite";
Group = "graphite"; Group = "graphite";
PermissionsStartOnly = true;
}; };
preStart = '' preStart = ''
if ! test -e ${dataDir}/db-created; then if ! test -e ${dataDir}/db-created; then
mkdir -m 0700 -p ${dataDir}/{whisper/,log/webapp/} mkdir -p ${dataDir}/{whisper/,log/webapp/}
if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi chmod 0700 ${dataDir}/{whisper/,log/webapp/}
# populate database # populate database
${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput
@ -261,6 +265,8 @@ in {
${pkgs.python27Packages.graphite_web}/bin/build-index.sh ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
touch ${dataDir}/db-created touch ${dataDir}/db-created
chown -R graphite:graphite ${cfg.dataDir}
fi fi
''; '';
restartTriggers = [ restartTriggers = [