summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-05-05 09:56:48 -0500
committerKali Kaneko <kali@leap.se>2014-05-12 10:47:24 -0500
commitdd8b845614cb95c698734081f5ed5f482d3ea6df (patch)
treea795f9f91ad4e81c2414465ff0e760257429babe
parenta733e83ae0bcbcc9daa0cba0aa4704f499406394 (diff)
add polkit file for bitmask-root,
and remove openvpn polkit file.
-rw-r--r--pkg/linux/README.rst5
-rw-r--r--pkg/linux/polkit/se.leap.bitmask.policy (renamed from pkg/linux/polkit/net.openvpn.gui.leap.policy)12
2 files changed, 9 insertions, 8 deletions
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/se.leap.bitmask.policy
index 50f991a3..c66f4701 100644
--- a/pkg/linux/polkit/net.openvpn.gui.leap.policy
+++ b/pkg/linux/polkit/se.leap.bitmask.policy
@@ -7,17 +7,17 @@
<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>
+ <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/openvpn</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/bitmask-root</annotate>
</action>
</policyconfig>