From e3f657e4c0ddb3ca5f09bea7cda832f148b9fbef Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 11:38:02 +0200 Subject: cron - rewrite broken package - First of all, this thing should NOT install any cron service! Cron is started by /etc/rc, and reconfiguration is handled by configure_cron() sending a SIGHUP to it. Leave it alone, stop killing and restarting it. If cron is desired as "proper" service, this needs to be done in pfSense core, not via packages creating such service. - Fix copyright header - Fix permissions - Remove broken junk - Remove unused copy-and-paste junk from god knows where --- config/cron/cron.xml | 60 ++++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/config/cron/cron.xml b/config/cron/cron.xml index 5a2b770b..5ec327f9 100644 --- a/config/cron/cron.xml +++ b/config/cron/cron.xml @@ -1,21 +1,24 @@ - - + + - Cron - Describe your package requirements here - Currently there are no FAQ items provided. Cron Settings - 0.2.2 + 0.3.0 Settings /usr/local/pkg/cron.inc Cron - cron settings. + Cron settings.
Services
cron.xml /packages/cron/cron.php - - cron - cron.sh - cron - Scheduled commands daemon - - - - Settings - /packages/cron.php - - - installedpackages->package->$packagename->configuration->cron /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/cron/cron.xml /usr/local/pkg/ - 0755 https://packages.pfsense.org/packages/config/cron/cron.inc /usr/local/www/packages/cron/ - 0755 https://packages.pfsense.org/packages/config/cron/cron.php /usr/local/www/packages/cron/ - 0755 https://packages.pfsense.org/packages/config/cron/cron_edit.php /usr/local/www/packages/cron/ - 0755 https://packages.pfsense.org/packages/config/cron/index.php - - - Variable One - var1 - Enter the variable one here. - input - - - Variable Two - var1 - Enter the variable one here. - input - - - - cron_sync_package(); -- cgit v1.2.3 From bf1a0bfdf47f7b52940d63cebf9d8032a0486703 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 11:56:50 +0200 Subject: Remove no longer used custom_php_deinstall_command as well --- config/cron/cron.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/cron/cron.xml b/config/cron/cron.xml index 5ec327f9..84b7f07e 100644 --- a/config/cron/cron.xml +++ b/config/cron/cron.xml @@ -83,7 +83,4 @@ cron_install_command(); - - cron_deinstall_command(); - -- cgit v1.2.3 From fc15c06f6f8e135ac5ec2819702b9eb03882a747 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 12:02:24 +0200 Subject: cron - rewrite broken package - Remove cron service and other unused junk - Clean up after previous broken versions - Add a check for running cron after configure_cron() call. (TODO: Move this to pfSense core.) --- config/cron/cron.inc | 65 +++++++++------------------------------------------- 1 file changed, 11 insertions(+), 54 deletions(-) diff --git a/config/cron/cron.inc b/config/cron/cron.inc index a457cf58..7a7a8993 100644 --- a/config/cron/cron.inc +++ b/config/cron/cron.inc @@ -1,14 +1,11 @@ /dev/null"); + } } - function cron_install_command() { - - global $config; conf_mount_rw(); - - //write_config(); - - write_rcfile(array( - "file" => "cron.sh", - "start" => "[ `/bin/pgrep -f 'cron -s' | wc -l` -eq 0 ] && /usr/sbin/cron -s &", - "stop" => "[ -f \"/var/run/cron.pid\" ] && kill -9 `cat /var/run/cron.pid`; rm -f /var/run/cron.pid; /bin/pkill -f 'cron -s'" - ) - ); - - cron_sync_package(); - - //if (pkg_is_service_running('cron')) { - //documentation purposes - //} - - conf_mount_ro(); - -} - - -function cron_deinstall_command() { - conf_mount_rw(); - exec("/usr/local/etc/rc.d/cron.sh stop"); + // Clean up possible lingering garbage after previous package versions unlink_if_exists("/usr/local/etc/rc.d/cron.sh"); - conf_mount_ro(); + cron_sync_package(); } ?> -- cgit v1.2.3 From 7d4d7a31d30ca24e54437599e2ac0438af68bc12 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 12:04:25 +0200 Subject: cron - rewrite broken package - Fix copyright header - Code style and indentation --- config/cron/cron.php | 199 ++++++++++++++++++++------------------------------- 1 file changed, 76 insertions(+), 123 deletions(-) diff --git a/config/cron/cron.php b/config/cron/cron.php index d7ed1494..7d55b086 100644 --- a/config/cron/cron.php +++ b/config/cron/cron.php @@ -1,8 +1,9 @@ - - + + + + + + + +
- -
-"; -//print_info_box_np("This is an info box."); -//echo"
"; -//endif; - -?> +
+ + - - - +
-

- Cron controls the scheduling of commands. -

- For more information see: http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html -

-
+
+ Cron controls the scheduling of commands.

+ For more information see: http://www.freebsd.org/doc/en/books/handbook/configtuning-cron.html +
+

- - - - - - - - - - - - - 0) { - foreach ($a_cron as $ent) { + + + + + + + + + + - ?> - - - - - - - - - - - 0) { + foreach ($a_cron as $ent) { + ?> + + + + + + + + + + + - - - - - - - - - - -
minutehourmdaymonthwdaywhocommand - - - - - -
edit
-
minutehourmdaymonthwdaywhocommand + + + + + +
edit
+
-   - -   - -   - -   - -   - -   - -   - - - - - - -
editdelete
-
        + + + + + +
editdelete
+
- - - - - -
add
-
- - - - -
-
-
-
-
-
-
-
- +
+ + + + + +
add
+ + + -- cgit v1.2.3 From 4ac04ccb5a4b73cd51982ff3368ecbf6529fb0a1 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 12:06:01 +0200 Subject: cron - rewrite broken package - Fix copyright header - Code style and indentation --- config/cron/cron_edit.php | 238 ++++++++++++++-------------------------------- 1 file changed, 73 insertions(+), 165 deletions(-) diff --git a/config/cron/cron_edit.php b/config/cron/cron_edit.php index 2b72a04d..b89c28e0 100644 --- a/config/cron/cron_edit.php +++ b/config/cron/cron_edit.php @@ -1,9 +1,9 @@ -
- - - - +
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".htmlspecialchars($pconfig['php'])."\n"; - ?> - - - - - - - - -
minute - -
hour - -
mday - -
month - -
wday - -
who - -
command - - -
  - - - - -
-
- -
-
-
-
-
-
- -
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
minute + +
hour + +
mday + +
month + +
wday + +
who + +
command + +
  + + + + +
+
+
+
-- cgit v1.2.3 From cf661e0c264539463e1c0c3d527798595d14da21 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 12:07:14 +0200 Subject: cron - rewrite broken package EOL at EOF. --- config/cron/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cron/index.php b/config/cron/index.php index 0d4ff4cd..24237ecc 100644 --- a/config/cron/index.php +++ b/config/cron/index.php @@ -3,4 +3,4 @@ Header("Location: /"); exit; -?> \ No newline at end of file +?> -- cgit v1.2.3 From 4470dc5ac6ba10a00802967cc6e1f4dcdd1c2284 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 12 Aug 2015 12:08:27 +0200 Subject: Bump cron package version --- pkg_config.10.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index c66d2b96..16636319 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -360,7 +360,7 @@ The cron utility is used to manage commands on a schedule. Services https://packages.pfsense.org/packages/config/cron/cron.xml - 0.1.10 + 0.3.0 Beta 2.2 markjcrane@gmail.com -- cgit v1.2.3