mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 20:03:16 +00:00
some more zope2 service improvements
This commit is contained in:
parent
4ff36cb137
commit
7b6e26b380
@ -136,21 +136,17 @@ if _interactive:
|
||||
'';
|
||||
env = pkgs.buildEnv {
|
||||
name = "zope2-${name}-env";
|
||||
paths = [ pyenv pkgs.gnumake ];
|
||||
postBuild =
|
||||
''
|
||||
echo "#!$out/bin/python" > $out/bin/interpreter
|
||||
cat ${interpreter} >> $out/bin/interpreter
|
||||
'';
|
||||
};
|
||||
pyenv = pkgs.buildEnv {
|
||||
name = "zope2-${name}-pyenv";
|
||||
paths = [
|
||||
pkgs.python27
|
||||
pkgs.python27Packages.recursivePthLoader
|
||||
pkgs.python27Packages."plone.recipe.zope2instance"
|
||||
] ++ attrValues pkgs.python27.modules
|
||||
++ opts.packages;
|
||||
postBuild =
|
||||
''
|
||||
echo "#!$out/bin/python" > $out/bin/interpreter
|
||||
cat ${interpreter} >> $out/bin/interpreter
|
||||
'';
|
||||
};
|
||||
conf = pkgs.writeText "zope2-${name}-conf"
|
||||
''%define INSTANCEHOME ${env}
|
||||
@ -204,7 +200,7 @@ container-class Products.TemporaryFolder.TemporaryContainer
|
||||
|
||||
${opts.extra}
|
||||
'';
|
||||
ctl = pkgs.writeScript "zope2-${name}-ctl"
|
||||
ctlScript = pkgs.writeScript "zope2-${name}-ctl-script"
|
||||
''#!${env}/bin/python
|
||||
|
||||
import sys
|
||||
@ -213,7 +209,14 @@ import plone.recipe.zope2instance.ctl
|
||||
if __name__ == '__main__':
|
||||
sys.exit(plone.recipe.zope2instance.ctl.main(
|
||||
["-C", "${conf}"]
|
||||
+ sys.argv[1:]))'';
|
||||
+ sys.argv[1:]))
|
||||
'';
|
||||
|
||||
ctl = pkgs.writeScript "zope2-${name}-ctl"
|
||||
''#!${pkgs.bash}/bin/bash -e
|
||||
export PYTHONHOME=${env}
|
||||
exec ${ctlScript} "$@"
|
||||
'';
|
||||
in {
|
||||
description = "zope2 ${name} instance";
|
||||
after = [ "network.target" ]; # with RelStorage also add "postgresql.service"
|
||||
|
Loading…
Reference in New Issue
Block a user