fix setups and 'nicos create' with linse_nicos repo
This commit is contained in:
@@ -54,7 +54,7 @@ def run(group, arglist):
|
||||
|
||||
arg_is = {
|
||||
'action': lambda arg: hasattr(serv, 'do_' + arg),
|
||||
'ins': lambda arg: arg in serv.info or arg == 'all' or serv.wildcard(arg),
|
||||
'ins': lambda arg: arg in serv.info or arg in ('all', 'check') or serv.wildcard(arg),
|
||||
'service': lambda arg: arg in serv.services,
|
||||
}
|
||||
|
||||
|
||||
@@ -96,13 +96,13 @@ class NicosManager(ServiceManager):
|
||||
self.get_info()
|
||||
for ins_i in ins_list:
|
||||
env = self.env[ins_i]
|
||||
base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins)
|
||||
base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins_i)
|
||||
nicos_conf = join(base, 'nicos.conf')
|
||||
content = {
|
||||
'nicos': {
|
||||
'setup_subdirs': '["%s", "common", "frappy_sinq"]' % ins,
|
||||
'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins),
|
||||
'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins),
|
||||
'setup_subdirs': '["%s", "linse_nicos", "frappy_sinq"]' % ins_i,
|
||||
'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
|
||||
'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
|
||||
},
|
||||
# 'environment': {
|
||||
# key: f'"{env[key]}"' for key in env if key in ENV_KEYS
|
||||
|
||||
Reference in New Issue
Block a user