From dd8b845614cb95c698734081f5ed5f482d3ea6df Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 5 May 2014 09:56:48 -0500
Subject: add polkit file for bitmask-root, and remove openvpn polkit file.

---
 pkg/linux/README.rst                         |  5 +++--
 pkg/linux/polkit/net.openvpn.gui.leap.policy | 23 -----------------------
 pkg/linux/polkit/se.leap.bitmask.policy      | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 pkg/linux/polkit/net.openvpn.gui.leap.policy
 create mode 100644 pkg/linux/polkit/se.leap.bitmask.policy

(limited to 'pkg/linux')

diff --git a/pkg/linux/README.rst b/pkg/linux/README.rst
index ecc99f30..220565ff 100644
--- a/pkg/linux/README.rst
+++ b/pkg/linux/README.rst
@@ -3,7 +3,8 @@ Files
 
 In GNU/Linux, we expect these files to be in place::
 
- leap-fw -> /etc/leap/leap-fw
- vpn-updown -> /etc/leap/vpn-up /etc/leap/vpn-down (hard links)
  update-resolv-conf -> /etc/leap/update-resolv-conf
  resolv-update -> /etc/leap/resolv-update
+
+ bitmask-root -> /usr/sbin/bitmask-root
+ polkit/se.leap.bitmask.policy -> /usr/share/polkit-1/actions/se.leap.bitmask.policy
diff --git a/pkg/linux/polkit/net.openvpn.gui.leap.policy b/pkg/linux/polkit/net.openvpn.gui.leap.policy
deleted file mode 100644
index 50f991a3..00000000
--- a/pkg/linux/polkit/net.openvpn.gui.leap.policy
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
-<policyconfig>
-
-  <vendor>LEAP Project</vendor>
-  <vendor_url>http://leap.se/</vendor_url>
-
-  <action id="net.openvpn,gui.leap.run-openvpn">
-    <description>Runs the openvpn binary</description>
-    <description xml:lang="es">Ejecuta el binario openvpn</description>
-    <message>OpenVPN needs that you authenticate to start</message>
-    <message xml:lang="es">OpenVPN necesita autorizacion para comenzar</message>
-    <icon_name>package-x-generic</icon_name> 
-    <defaults>
-      <allow_any>yes</allow_any>
-      <allow_inactive>yes</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/openvpn</annotate>
-  </action>
-</policyconfig>
diff --git a/pkg/linux/polkit/se.leap.bitmask.policy b/pkg/linux/polkit/se.leap.bitmask.policy
new file mode 100644
index 00000000..c66f4701
--- /dev/null
+++ b/pkg/linux/polkit/se.leap.bitmask.policy
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <vendor>LEAP Project</vendor>
+  <vendor_url>http://leap.se/</vendor_url>
+
+  <action id="se.leap.bitmask.policy">
+    <description>Runs bitmask helper to launch firewall and openvpn</description>
+    <description xml:lang="es">Ejecuta el asistente de bitmask para lanzar el firewall y openvpn</description>
+    <message>Bitmask needs that you authenticate to start</message>
+    <message xml:lang="es">Bitmask necesita autorizacion para comenzar</message>
+    <icon_name>package-x-generic</icon_name> 
+    <defaults>
+      <allow_any>yes</allow_any>
+      <allow_inactive>yes</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/bitmask-root</annotate>
+  </action>
+</policyconfig>
-- 
cgit v1.2.3