JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos: zope2 service: adding clientHome option

Browse Source
This commit is contained in:
Rok Garbas 2013-10-29 12:53:08 +01:00
parent 60f1afe199
commit 38df1d24c4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/services/web-servers/zope2.nix
View File

@ -33,6 +33,11 @@ let
description = "The name of the effective user for the Zope process."; description = "The name of the effective user for the Zope process.";
}; };
clientHome = mkOption {
default = "/var/lib/zope2/${name}";
type = types.string;
description = "Home directory of zope2 instance.";
};
extra = mkOption { extra = mkOption {
default = default =
'' ''
@ -152,7 +157,7 @@ in
'' ''
%define INSTANCEHOME ${env} %define INSTANCEHOME ${env}
instancehome $INSTANCEHOME instancehome $INSTANCEHOME
%define CLIENTHOME /var/lib/zope2/${name} %define CLIENTHOME ${opts.clientHome}/${opts.name}
clienthome $CLIENTHOME clienthome $CLIENTHOME
debug-mode off debug-mode off
@ -162,8 +167,8 @@ in
zserver-threads ${toString opts.threads} zserver-threads ${toString opts.threads}
effective-user ${opts.user} effective-user ${opts.user}
pid-filename /var/lib/zope2/${name}/pid pid-filename ${opts.clientHome}/${opts.name}/pid
lock-filename /var/lib/zope2/${name}/lock lock-filename ${opts.clientHome}/${opts.name}/lock
python-check-interval 1000 python-check-interval 1000
enable-product-installation off enable-product-installation off
@ -221,7 +226,7 @@ in
exec ${ctlScript} "$@" exec ${ctlScript} "$@"
''; '';
in { in {
description = "zope2 ${name} instance"; #description = "${name} instance";
after = [ "network.target" ]; # with RelStorage also add "postgresql.service" after = [ "network.target" ]; # with RelStorage also add "postgresql.service"
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = opts.packages; path = opts.packages;
@ -233,8 +238,9 @@ in
chown ${opts.user} /var/log/zope2/${name}.log chown ${opts.user} /var/log/zope2/${name}.log
chown ${opts.user} /var/log/zope2/${name}-Z2.log chown ${opts.user} /var/log/zope2/${name}-Z2.log
mkdir -p /var/lib/zope2/${name}/filestorage /var/lib/zope2/${name}/blobstorage mkdir -p ${opts.clientHome}/filestorage ${opts.clientHome}/blobstorage
chown ${opts.user} /var/lib/zope2/${name} -R mkdir -p ${opts.clientHome}/${opts.name}
chown ${opts.user} ${opts.clientHome} -R
${ctl} adduser admin admin ${ctl} adduser admin admin
''; '';