YDA-5992: clean up scheduled admin jobs

iiFolderStatusTransitions.r

@@ -18,21 +18,14 @@ iiFolderStatus(*folder, *folderStatus) {
 	}
 }
 
-# \brief Schedule copy-to-vault (asynchronously).
-#
-iiScheduleCopyToVault() {
-	delay ("<INST_NAME>irods_rule_engine_plugin-irods_rule_language-instance</INST_NAME><PLUSET>1s</PLUSET>") {
-		msiExecCmd("scheduled-copytovault.sh", "", "", "", 0, *out);
-	}
-}
 
 # \brief Schedule copy-to-vault for just one coll (asynchronously).
 #
 # \param[in]  folder	    Path of folder
 #
 iiScheduleCollCopyToVault(*coll) {
 	delay ("<INST_NAME>irods_rule_engine_plugin-irods_rule_language-instance</INST_NAME><PLUSET>1s</PLUSET>") {
-		msiExecCmd("scheduled-copytovault.sh", "'*coll'", "", "", 0, *out);
+		msiExecCmd("admin-scheduled-copytovault.sh", "'*coll'", "", "", 0, *out);
 	}
 }
 
@@ -332,7 +325,7 @@ iiCanTransitionFolderStatus(*folder, *transitionFrom, *transitionTo, *actor, *al
 	}
 
 	# Note: The folders will not transition to SECURED status.
-	if (*transitionFrom == ACCEPTED && *transitionTo == FOLDER) { 
+	if (*transitionFrom == ACCEPTED && *transitionTo == FOLDER) {
 		*allowed = false;
 		*reason = "Only a rodsadmin is allowed to secure a folder to the vault";
 		succeed;

policies.py

@@ -503,17 +503,17 @@ def py_acPreProcForExecCmd(ctx, cmd, args, addr, hint):
     if not (hint == addr == ''):
         return policy.fail('Disallowed hint/addr in execcmd')
 
-    # allow 'admin-*' scripts, if first arg is the actor username&zone.
+    # Allow scheduled admin scripts.
+    if cmd.startswith('admin-scheduled-'):
+        return policy.succeed()
+
+    # Allow 'admin-*' scripts, if first arg is the actor username&zone.
     if cmd.startswith('admin-'):
         if args == str(actor) or args.startswith(str(actor) + ' '):
             return policy.succeed()
         else:
             return policy.fail('Actor not given as first arg to admin- execcmd')
 
-    # Allow scheduled scripts.
-    if cmd.startswith('scheduled-'):
-        return policy.succeed()
-
     return policy.fail('No execcmd privileges for this command')