From a7d5cfacf51fcb8131f3dd4ee2f0e06fb055c378 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 27 Sep 2015 00:39:48 +0200
Subject: asterisk - add privileges configuration

---
 config/asterisk/asterisk.priv.inc | 41 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 config/asterisk/asterisk.priv.inc

(limited to 'config/asterisk')

diff --git a/config/asterisk/asterisk.priv.inc b/config/asterisk/asterisk.priv.inc
new file mode 100644
index 00000000..b85452e7
--- /dev/null
+++ b/config/asterisk/asterisk.priv.inc
@@ -0,0 +1,41 @@
+<?php
+/*
+	asterisk.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	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.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   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
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	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.
+*/
+global $priv_list;
+
+$priv_list['page-status-asterisk'] = array();
+$priv_list['page-status-asterisk']['name'] = "WebCfg - Status: asterisk package";
+$priv_list['page-status-asterisk']['descr'] = "Allow access to asterisk package GUI";
+
+$priv_list['page-status-asterisk']['match'] = array();
+$priv_list['page-status-asterisk']['match'][] = "asterisk_calls.php*";
+$priv_list['page-status-asterisk']['match'][] = "asterisk_cmd.php*";
+$priv_list['page-status-asterisk']['match'][] = "asterisk_edit_file.php*";
+$priv_list['page-status-asterisk']['match'][] = "asterisk_log.php*";
+
+?>
-- 
cgit v1.2.3


From dcae0232393a61daef6fe30407d631a2b71f477d Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 27 Sep 2015 00:40:21 +0200
Subject: asterisk - add privileges configuration

---
 config/asterisk/asterisk.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config/asterisk')

diff --git a/config/asterisk/asterisk.xml b/config/asterisk/asterisk.xml
index 97c2e26f..ac3b5456 100644
--- a/config/asterisk/asterisk.xml
+++ b/config/asterisk/asterisk.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>asterisk</name>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<title>asterisk</title>
 	<include_file>/usr/local/pkg/asterisk.inc</include_file>
 	<additional_files_needed>
@@ -69,6 +69,10 @@
 		<prefix>/usr/local/www/shortcuts/</prefix>
 		<item>https://packages.pfsense.org/packages/config/asterisk/pkg_asterisk.inc</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk.priv.inc</item>
+	</additional_files_needed>
 	<menu>
 		<name>Asterisk</name>
 		<tooltiptext>Asterisk</tooltiptext>
-- 
cgit v1.2.3


From 8176d96627b474bea75b07f85a2dc4f9c884962b Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 27 Sep 2015 03:01:03 +0200
Subject: asterisk - revert add privileges configuration

Already being done in individual PHP files
---
 config/asterisk/asterisk.priv.inc | 41 ---------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 config/asterisk/asterisk.priv.inc

(limited to 'config/asterisk')

diff --git a/config/asterisk/asterisk.priv.inc b/config/asterisk/asterisk.priv.inc
deleted file mode 100644
index b85452e7..00000000
--- a/config/asterisk/asterisk.priv.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
-	asterisk.priv.inc
-	part of pfSense (http://www.pfSense.org/)
-	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.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   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
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	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.
-*/
-global $priv_list;
-
-$priv_list['page-status-asterisk'] = array();
-$priv_list['page-status-asterisk']['name'] = "WebCfg - Status: asterisk package";
-$priv_list['page-status-asterisk']['descr'] = "Allow access to asterisk package GUI";
-
-$priv_list['page-status-asterisk']['match'] = array();
-$priv_list['page-status-asterisk']['match'][] = "asterisk_calls.php*";
-$priv_list['page-status-asterisk']['match'][] = "asterisk_cmd.php*";
-$priv_list['page-status-asterisk']['match'][] = "asterisk_edit_file.php*";
-$priv_list['page-status-asterisk']['match'][] = "asterisk_log.php*";
-
-?>
-- 
cgit v1.2.3


From e43620c0553097d3f8da807c13c511be8b329e3e Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Sun, 27 Sep 2015 03:04:02 +0200
Subject: asterisk - revert add privileges configuration

Already being done in individual PHP files
---
 config/asterisk/asterisk.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'config/asterisk')

diff --git a/config/asterisk/asterisk.xml b/config/asterisk/asterisk.xml
index ac3b5456..75ba411d 100644
--- a/config/asterisk/asterisk.xml
+++ b/config/asterisk/asterisk.xml
@@ -69,10 +69,6 @@
 		<prefix>/usr/local/www/shortcuts/</prefix>
 		<item>https://packages.pfsense.org/packages/config/asterisk/pkg_asterisk.inc</item>
 	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/etc/inc/priv/</prefix>
-		<item>https://packages.pfsense.org/packages/config/asterisk/asterisk.priv.inc</item>
-	</additional_files_needed>
 	<menu>
 		<name>Asterisk</name>
 		<tooltiptext>Asterisk</tooltiptext>
-- 
cgit v1.2.3