|
From: Will P. <pa...@us...> - 2003-03-21 18:40:02
|
Update of /cvsroot/ark/sidai/sys-cron-config
In directory sc8-pr-cvs1:/tmp/cvs-serv15167/sys-cron-config
Modified Files:
at.allow.tmpl cron.allow.tmpl sys-user-crontab.tmpl
Log Message:
updates
Index: at.allow.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/sys-cron-config/at.allow.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** at.allow.tmpl 20 Jul 2002 10:44:22 -0000 1.5
--- at.allow.tmpl 21 Mar 2003 18:23:06 -0000 1.6
***************
*** 51,58 ****
if can_do:
! all_users = ark.user.ArkUsersMgr().unpackSpecs(['ALL'])
#ToDo: later: all_users.sort()
for user in all_users:
- if user.status() not in ['pending', 'active']: continue
try:
frag = user.at_allow_fragment(ARK_HOST_CTXT=thishost)
--- 51,58 ----
if can_do:
! user_chooser = lambda u:u.isRelevant(pending_too=1)
! all_users = ark.user.ArkUsersMgr().unpackSpecs(['ALL'],chooser=user_chooser)
#ToDo: later: all_users.sort()
for user in all_users:
try:
frag = user.at_allow_fragment(ARK_HOST_CTXT=thishost)
Index: cron.allow.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/sys-cron-config/cron.allow.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** cron.allow.tmpl 20 Jul 2002 10:44:22 -0000 1.5
--- cron.allow.tmpl 21 Mar 2003 18:23:06 -0000 1.6
***************
*** 52,57 ****
if can_do:
! for user in ark.user.ArkUsersMgr().unpackSpecs(['ALL']):
! if user.status() not in ['pending', 'active']: continue
try:
frag = user.cron_allow_fragment(ARK_HOST_CTXT=thishost)
--- 52,57 ----
if can_do:
! user_chooser = lambda u:u.isRelevant(pending_too=1)
! for user in ark.user.ArkUsersMgr().unpackSpecs(['ALL'],chooser=user_chooser):
try:
frag = user.cron_allow_fragment(ARK_HOST_CTXT=thishost)
Index: sys-user-crontab.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/sys-cron-config/sys-user-crontab.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sys-user-crontab.tmpl 7 Oct 2002 13:38:16 -0000 1.3
--- sys-user-crontab.tmpl 21 Mar 2003 18:23:06 -0000 1.4
***************
*** 112,116 ****
for pkg in ark.package.ArkPkgsMgr().unpackSpecs(['ALL']):
- if pkg.status() in ['pending', 'deprecated']: continue # ToDo: tighter?
if not pkg.appliesToHost(thishost): continue
try:
--- 112,115 ----
***************
*** 143,147 ****
for client in ark.client.ArkClientsMgr().unpackSpecs(['ALL']):
- if client.status() not in ['pending', 'active']: continue
if not client.appliesToHost(thishost): continue
try:
--- 142,145 ----
***************
*** 160,164 ****
for contact in ark.contact.ArkContactsMgr().unpackSpecs(['ALL']):
- if contact.status() not in ['pending', 'active']: continue
if not contact.appliesToHost(thishost): continue
try:
--- 158,161 ----
***************
*** 182,186 ****
for dchunk in ark.dchunk.ArkDChunksMgr().unpackSpecs(['ALL']):
- if dchunk.status() not in ['pending', 'active']: continue
if not dchunk.appliesToHost(thishost): continue
try:
--- 179,182 ----
***************
*** 210,213 ****
--- 206,225 ----
# ..................................................................
+ # Optional ARK thing: device
+ try:
+ import ark.device
+
+ for device in ark.device.ArkDevicesMgr().unpackSpecs(['ALL']):
+ if not device.appliesToHost(thishost): continue
+ try:
+ frags = device.sys_crontab_fragments(ARK_HOST_CTXT=thishost)
+ except ark.error.ArkUnknown,msg:
+ ark.error.unknownWas('sys-crontab-fragments',msg)
+ continue # that's cool
+ if frags: processFrags(frags,'device',device.idString)
+
+ except ImportError: pass
+
+ # ..................................................................
# Optional ARK thing: license
try:
***************
*** 215,219 ****
for license in ark.license.ArkLicensesMgr().unpackSpecs(['ALL']):
- if license.status() not in ['pending', 'active']: continue
if not license.appliesToHost(thishost): continue
try:
--- 227,230 ----
***************
*** 232,236 ****
for maillist in ark.maillist.ArkMailListsMgr().unpackSpecs(['ALL']):
- if maillist.status() not in ['pending', 'active']: continue
if not maillist.appliesToHost(thishost): continue
try:
--- 243,246 ----
***************
*** 249,253 ****
for purchaseorder in ark.purchaseorder.ArkPurchaseOrdersMgr().unpackSpecs(['ALL']):
- if purchaseorder.status() not in ['pending', 'active']: continue
if not purchaseorder.appliesToHost(thishost): continue
try:
--- 259,262 ----
***************
*** 266,270 ****
for supportCall in ark.supportCall.ArkSupportCallsMgr().unpackSpecs(['ALL']):
- if supportCall.status() not in ['pending', 'active']: continue
if not supportCall.appliesToHost(thishost): continue
try:
--- 275,278 ----
***************
*** 283,287 ****
for supportContract in ark.supportContract.ArkSupportContractsMgr().unpackSpecs(['ALL']):
- if supportContract.status() not in ['pending', 'active']: continue
if not supportContract.appliesToHost(thishost): continue
try:
--- 291,294 ----
***************
*** 300,304 ****
for toolset in ark.toolset.ArkToolsetsMgr().unpackSpecs(['ALL']):
- if toolset.status() not in ['pending', 'active']: continue
if not toolset.appliesToHost(thishost): continue
try:
--- 307,310 ----
***************
*** 317,321 ****
for user in ark.user.ArkUsersMgr().unpackSpecs(['ALL']):
- if user.status() not in ['pending', 'active']: continue
if not user.appliesToHost(thishost): continue
try:
--- 323,326 ----
***************
*** 334,338 ****
for vendor in ark.vendor.ArkVendorsMgr().unpackSpecs(['ALL']):
- if vendor.status() not in ['pending', 'active']: continue
if not vendor.appliesToHost(thishost): continue
try:
--- 339,342 ----
|