suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

kippo: fix check for pidPath

Browse Source
This commit is contained in:
Thomas Bereknyei 2015-08-07 01:01:22 -04:00
parent bbe4307715
commit 6b280b648f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/networking/kippo.nix
View File

@ -87,7 +87,6 @@ rec {
environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:."; environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:.";
preStart = '' preStart = ''
if [ ! -d ${cfg.varPath}/ ] ; then if [ ! -d ${cfg.varPath}/ ] ; then
mkdir -p ${cfg.pidPath}
mkdir -p ${cfg.logPath}/tty mkdir -p ${cfg.logPath}/tty
mkdir -p ${cfg.logPath}/dl mkdir -p ${cfg.logPath}/dl
mkdir -p ${cfg.varPath}/keys mkdir -p ${cfg.varPath}/keys
@ -97,12 +96,15 @@ rec {
cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r cp ${pkgs.kippo}/src/txtcmds ${cfg.varPath} -r
chmod u+rw ${cfg.varPath} -R chmod u+rw ${cfg.varPath} -R
chmod u+rw ${cfg.pidPath}
chown kippo.kippo ${cfg.varPath} -R chown kippo.kippo ${cfg.varPath} -R
chown kippo.kippo ${cfg.pidPath}
chown kippo.kippo ${cfg.logPath} -R chown kippo.kippo ${cfg.logPath} -R
chmod u+rw ${cfg.logPath} -R chmod u+rw ${cfg.logPath} -R
fi fi
if [ ! -d ${cfg.pidPath}/ ] ; then
mkdir -p ${cfg.pidPath}
chmod u+rw ${cfg.pidPath}
chown kippo.kippo ${cfg.pidPath}
fi
''; '';
serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";