diff --git a/jc/parsers/crontab_u.py b/jc/parsers/crontab_u.py index b7ee1d17..98e3e99b 100644 --- a/jc/parsers/crontab_u.py +++ b/jc/parsers/crontab_u.py @@ -13,27 +13,22 @@ Examples: $ cat /etc/crontab | jc --crontab -p { "variables": [ - { - "name": "MAILTO", - "value": "root" - }, { "name": "PATH", - "value": "/sbin:/bin:/usr/sbin:/usr/bin" + "value": "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" }, { "name": "SHELL", - "value": "/bin/bash" + "value": "/bin/sh" } ], "schedule": [ { "minute": [ - "5" + "25" ], "hour": [ - "10-11", - "22" + "6" ], "day_of_month": [ "*" @@ -44,14 +39,15 @@ Examples: "day_of_week": [ "*" ], - "command": "/var/www/devdaily.com/bin/mk-new-links.php" + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.daily )" }, { "minute": [ - "30" + "47" ], "hour": [ - "4/2" + "6" ], "day_of_month": [ "*" @@ -60,72 +56,77 @@ Examples: "*" ], "day_of_week": [ + "7" + ], + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.weekly )" + }, + { + "minute": [ + "52" + ], + "hour": [ + "6" + ], + "day_of_month": [ + "1" + ], + "month": [ "*" ], - "command": "/var/www/devdaily.com/bin/create-all-backups.sh" - }, - { - "occurrence": "yearly", - "command": "/home/maverick/bin/annual-maintenance" - }, - { - "occurrence": "reboot", - "command": "/home/cleanup" - }, - { - "occurrence": "monthly", - "command": "/home/maverick/bin/tape-backup" + "day_of_week": [ + "*" + ], + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.monthly )" } ] } - $ cat /etc/crontab | jc --crontab -p -r + $ cat /etc/crontab | jc --crontab-u -p -r { "variables": [ - { - "name": "MAILTO", - "value": "root" - }, { "name": "PATH", - "value": "/sbin:/bin:/usr/sbin:/usr/bin" + "value": "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" }, { "name": "SHELL", - "value": "/bin/bash" + "value": "/bin/sh" } ], "schedule": [ { - "minute": "5", - "hour": "10-11,22", + "minute": "25", + "hour": "6", "day_of_month": "*", "month": "*", "day_of_week": "*", - "command": "/var/www/devdaily.com/bin/mk-new-links.php" + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.daily )" }, { - "minute": "30", - "hour": "4/2", + "minute": "47", + "hour": "6", "day_of_month": "*", "month": "*", + "day_of_week": "7", + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.weekly )" + }, + { + "minute": "52", + "hour": "6", + "day_of_month": "1", + "month": "*", "day_of_week": "*", - "command": "/var/www/devdaily.com/bin/create-all-backups.sh" - }, - { - "occurrence": "yearly", - "command": "/home/maverick/bin/annual-maintenance" - }, - { - "occurrence": "reboot", - "command": "/home/cleanup" - }, - { - "occurrence": "monthly", - "command": "/home/maverick/bin/tape-backup" + "user": "root", + "command": "test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.monthly )" } ] } + + """ import jc.utils import jc.parsers.universal @@ -159,8 +160,8 @@ def process(proc_data): { "variables": [ - "name": string, - "value": string + "name": string, + "value": string ], "schedule": [ { @@ -181,6 +182,7 @@ def process(proc_data): string ], "occurrence": string, + "user": string, "command": string } ]