From e3f657e4c0ddb3ca5f09bea7cda832f148b9fbef Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
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(-)

(limited to 'config')

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 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
 	cron.xml
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2008 Mark J Crane
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
-																			  */
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 /*
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
+
 	1. Redistributions of source code must retain the above copyright notice,
 	   this list of conditions and the following disclaimer.
 
@@ -23,6 +26,7 @@
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
 
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -33,79 +37,43 @@
 	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
-																			  */
-/* ========================================================================== */
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>Cron</description>
-	<requirements>Describe your package requirements here</requirements>
-	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Cron Settings</name>
-	<version>0.2.2</version>
+	<version>0.3.0</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/cron.inc</include_file>
 	<menu>
 		<name>Cron</name>
-		<tooltiptext>cron settings.</tooltiptext>
+		<tooltiptext>Cron settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>cron.xml</configfile>
 		<url>/packages/cron/cron.php</url>
 	</menu>
-	<service>
-		<name>cron</name>
-		<rcfile>cron.sh</rcfile>
-		<executable>cron</executable>
-		<description>Scheduled commands daemon</description>
-	</service>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/packages/cron.php</url>
-			<active/>
-		</tab>
-	</tabs>
 	<configpath>installedpackages->package->$packagename->configuration->cron</configpath>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/cron/cron.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/cron/cron.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/packages/cron/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/cron/cron.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/packages/cron/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/cron/cron_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/packages/cron/</prefix>
-		<chmod>0755</chmod>
 		<item>https://packages.pfsense.org/packages/config/cron/index.php</item>
 	</additional_files_needed>
-	<fields>
-		<field>
-			<fielddescr>Variable One</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Variable Two</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_add_php_command>
-	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		cron_sync_package();
 	</custom_php_resync_config_command>
-- 
cgit v1.2.3