From a36a0528390df2584f150c76c6870c09c8433095 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Mon, 16 Nov 2015 01:29:59 +0100
Subject: Add privileges configuration, (de)install and service handling fixes

---
 config/phpservice/phpservice.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'config/phpservice')

diff --git a/config/phpservice/phpservice.xml b/config/phpservice/phpservice.xml
index 6bada596..f55dfe23 100644
--- a/config/phpservice/phpservice.xml
+++ b/config/phpservice/phpservice.xml
@@ -41,14 +41,12 @@
 /* ====================================================================================== */
 	]]>
 	</copyright>
-	<description>PHP Service</description>
-	<name>PHP Service Settings</name>
-	<version>0.5.0</version>
-	<title>Settings</title>
+	<name>phpservice</name>
+	<version>0.5.2</version>
+	<title>PHPService</title>
 	<include_file>/usr/local/pkg/phpservice.inc</include_file>
 	<menu>
 		<name>PHPService</name>
-		<tooltiptext>PHP Service settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>phpservice.xml</configfile>
 		<url>/packages/phpservice/phpservice_php.php</url>
@@ -59,7 +57,7 @@
 		<executable>phpservice</executable>
 		<description>PHP script as a service</description>
 		<custom_php_service_status_command>
-			exec("/bin/pgrep -fq phpservice");
+			phpservice_custom_php_service_status_command();
 		</custom_php_service_status_command>
 	</service>
 	<configpath>installedpackages->package->$packagename->configuration->phpservice</configpath>
@@ -67,6 +65,10 @@
 		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice.inc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice.priv.inc</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/packages/phpservice/</prefix>
 		<item>https://packages.pfsense.org/packages/config/phpservice/phpservice_php.php</item>
@@ -78,7 +80,7 @@
 	<custom_php_resync_config_command>
 		phpservice_sync_package();
 	</custom_php_resync_config_command>
-	<custom_php_install_command>
-		phpservice_install_command();
-	</custom_php_install_command>
+	<custom_php_deinstall_command>
+		phpservice_deinstall_command();
+	</custom_php_deinstall_command>
 </packagegui>
-- 
cgit v1.2.3