zope2 service... indentation fix
This commit is contained in:
parent
1fc7d6ddb2
commit
af0e2ccf45
|
@ -107,10 +107,10 @@ in
|
|||
let
|
||||
interpreter = pkgs.writeScript "interpreter"
|
||||
''
|
||||
import sys
|
||||
import sys
|
||||
|
||||
_interactive = True
|
||||
if len(sys.argv) > 1:
|
||||
_interactive = True
|
||||
if len(sys.argv) > 1:
|
||||
_options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
|
||||
_interactive = False
|
||||
for (_opt, _val) in _options:
|
||||
|
@ -130,7 +130,7 @@ if len(sys.argv) > 1:
|
|||
del _options, _args
|
||||
execfile(__file__)
|
||||
|
||||
if _interactive:
|
||||
if _interactive:
|
||||
del _interactive
|
||||
__import__("code").interact(banner="", local=globals())
|
||||
'';
|
||||
|
@ -149,73 +149,76 @@ if _interactive:
|
|||
'';
|
||||
};
|
||||
conf = pkgs.writeText "zope2-${name}-conf"
|
||||
''%define INSTANCEHOME ${env}
|
||||
instancehome $INSTANCEHOME
|
||||
%define CLIENTHOME /var/lib/zope2/${name}
|
||||
clienthome $CLIENTHOME
|
||||
''
|
||||
%define INSTANCEHOME ${env}
|
||||
instancehome $INSTANCEHOME
|
||||
%define CLIENTHOME /var/lib/zope2/${name}
|
||||
clienthome $CLIENTHOME
|
||||
|
||||
debug-mode off
|
||||
security-policy-implementation C
|
||||
verbose-security off
|
||||
default-zpublisher-encoding utf-8
|
||||
zserver-threads ${toString opts.threads}
|
||||
effective-user ${opts.user}
|
||||
debug-mode off
|
||||
security-policy-implementation C
|
||||
verbose-security off
|
||||
default-zpublisher-encoding utf-8
|
||||
zserver-threads ${toString opts.threads}
|
||||
effective-user ${opts.user}
|
||||
|
||||
pid-filename /var/lib/zope2/${name}/pid
|
||||
lock-filename /var/lib/zope2/${name}/lock
|
||||
python-check-interval 1000
|
||||
enable-product-installation off
|
||||
pid-filename /var/lib/zope2/${name}/pid
|
||||
lock-filename /var/lib/zope2/${name}/lock
|
||||
python-check-interval 1000
|
||||
enable-product-installation off
|
||||
|
||||
<environment>
|
||||
<environment>
|
||||
zope_i18n_compile_mo_files false
|
||||
</environment>
|
||||
</environment>
|
||||
|
||||
<eventlog>
|
||||
level INFO
|
||||
<logfile>
|
||||
<eventlog>
|
||||
level INFO
|
||||
<logfile>
|
||||
path /var/log/zope2/${name}.log
|
||||
level INFO
|
||||
</logfile>
|
||||
</eventlog>
|
||||
</logfile>
|
||||
</eventlog>
|
||||
|
||||
<logger access>
|
||||
level WARN
|
||||
<logfile>
|
||||
<logger access>
|
||||
level WARN
|
||||
<logfile>
|
||||
path /var/log/zope2/${name}-Z2.log
|
||||
format %(message)s
|
||||
</logfile>
|
||||
</logger>
|
||||
</logfile>
|
||||
</logger>
|
||||
|
||||
<http-server>
|
||||
address ${opts.http_address}
|
||||
</http-server>
|
||||
<http-server>
|
||||
address ${opts.http_address}
|
||||
</http-server>
|
||||
|
||||
<zodb_db temporary>
|
||||
<temporarystorage>
|
||||
<zodb_db temporary>
|
||||
<temporarystorage>
|
||||
name temporary storage for sessioning
|
||||
</temporarystorage>
|
||||
mount-point /temp_folder
|
||||
container-class Products.TemporaryFolder.TemporaryContainer
|
||||
</zodb_db>
|
||||
</temporarystorage>
|
||||
mount-point /temp_folder
|
||||
container-class Products.TemporaryFolder.TemporaryContainer
|
||||
</zodb_db>
|
||||
|
||||
${opts.extra}
|
||||
${opts.extra}
|
||||
'';
|
||||
ctlScript = pkgs.writeScript "zope2-${name}-ctl-script"
|
||||
''#!${env}/bin/python
|
||||
''
|
||||
#!${env}/bin/python
|
||||
|
||||
import sys
|
||||
import plone.recipe.zope2instance.ctl
|
||||
import sys
|
||||
import plone.recipe.zope2instance.ctl
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == '__main__':
|
||||
sys.exit(plone.recipe.zope2instance.ctl.main(
|
||||
["-C", "${conf}"]
|
||||
+ sys.argv[1:]))
|
||||
'';
|
||||
|
||||
ctl = pkgs.writeScript "zope2-${name}-ctl"
|
||||
''#!${pkgs.bash}/bin/bash -e
|
||||
export PYTHONHOME=${env}
|
||||
exec ${ctlScript} "$@"
|
||||
''
|
||||
#!${pkgs.bash}/bin/bash -e
|
||||
export PYTHONHOME=${env}
|
||||
exec ${ctlScript} "$@"
|
||||
'';
|
||||
in {
|
||||
description = "zope2 ${name} instance";
|
||||
|
|
Loading…
Reference in a new issue