share folder cleanup

OpenVPN · Mar 14, 2024 · d48fe2d · d48fe2d
1 parent ffb2b2c
commit d48fe2d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 18 deletions.
diff --git a/share/applications/net.openvpn.openvpn3_indicator.desktop b/share/applications/net.openvpn.openvpn3_indicator.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=openvpn3-indicator
-Name=OpenVPN3 GTK indicator GUI
-Comment=Simple GTK indicator GUI for OpenVPN3
+Name=OpenVPN3 Indicator
+Comment=Simple indicator application for OpenVPN3
 Exec=/usr/bin/openvpn3-indicator
 Terminal=false
 Type=Application

diff --git a/...calable/mimetypes/text-openvpn-config.svg → .../mimetypes/text-openvpn-configuration.svg b/...calable/mimetypes/text-openvpn-config.svg → .../mimetypes/text-openvpn-configuration.svg
diff --git a/...calable/mimetypes/text-openvpn-config.svg → .../mimetypes/text-openvpn-configuration.svg b/...calable/mimetypes/text-openvpn-config.svg → .../mimetypes/text-openvpn-configuration.svg
diff --git a/share/man/man1/openvpn3-indicator.1 b/share/man/man1/openvpn3-indicator.1
@@ -1,13 +1,13 @@
 .TH OPENVPN3-INDICATOR "1" "January 2024" "version 0.1"
 .SH NAME
-openvpn3\-indicator \- Simple GTK indicator GUI for OpenVPN3
+openvpn3\-indicator \- Simple indicator application for OpenVPN3
 .SH SYNOPSIS
 .B openvpn3\-indicator
 [\-\^\-help|\-\^\-version|\-\^\-silent|\-\^\-verbose|\-\^\-debug]
 .SH DESCRIPTION
-Some info coming soon.
-.PP
-More info coming soon.
+This is a simple indicator application that controls OpenVPN3 tunnels.
+It is based on D-Bus interface provided by OpenVPN3 Linux client.
+It is a temporary solution until Network Manager supports OpenVPN3.
 .SH OPTIONS
 .TP
 .BR \-h ", " \-\^\-help

diff --git a/share/mime/packages/openvpn-config.xml b/share/mime/packages/openvpn-config.xml
diff --git a/share/mime/packages/openvpn-configuration.xml b/share/mime/packages/openvpn-configuration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="text/openvpn-configuration">
+    <alias type="text/openvpn-config"/>
+    <sub-class-of type="text/plain"/>
+    <generic-icon name="text-x-generic"/>
+    <icon name="text-openvpn-configuration"/>
+    <glob pattern="*.ovpn"/>
+    <comment>OpenVPN configuration file</comment>
+    <comment xml:lang="pl">Plik konfiguracji OpenVPN</comment>
+    <comment xml:lang="uk">файл конфігурації OpenVPN</comment>
+    <comment xml:lang="de">OpenVPN-Konfigurationsdatei</comment>
+    <comment xml:lang="fr">fichier de configuration OpenVPN</comment>
+  </mime-type>
+</mime-info>
diff --git a/src/openvpn3_indicator/application.py b/src/openvpn3_indicator/application.py
@@ -379,9 +379,9 @@ def session_icon(self, session_id):
         major = status['major']
         minor = status['minor']
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CFG_OK == minor:
-            return f'{APPLICATION_NAME}-configuring'
+            return f'{APPLICATION_NAME}-loading'
         if openvpn3.StatusMajor.SESSION == major and openvpn3.StatusMinor.SESS_AUTH_URL == minor:
-            return f'{APPLICATION_NAME}-configuring'
+            return f'{APPLICATION_NAME}-loading'
         if openvpn3.StatusMajor.SESSION == major and openvpn3.StatusMinor.PROC_STOPPED == minor:
             return f'{APPLICATION_NAME}-active-error'
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CONN_AUTH_FAILED == minor:
@@ -393,7 +393,7 @@ def session_icon(self, session_id):
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CONN_DONE == minor:
             return f'{APPLICATION_NAME}-idle'
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CFG_REQUIRE_USER == minor:
-            return f'{APPLICATION_NAME}-configuring'
+            return f'{APPLICATION_NAME}-loading'
         return f'{APPLICATION_NAME}-active'
 
     def session_description(self, session_id):
@@ -413,7 +413,7 @@ def session_description(self, session_id):
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CONN_DISCONNECTED == minor:
             return f'Disconnected'
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CONN_DONE == minor:
-            return f'Done'
+            return f'Disconnected'
         if openvpn3.StatusMajor.CONNECTION == major and openvpn3.StatusMinor.CFG_REQUIRE_USER == minor:
             return f'Authentication required'
         return f'Connected'

diff --git a/tests/configurations/server_auth_pass_fail.ovpn b/tests/configurations/server_auth_pass_fail.ovpn
@@ -11,6 +11,7 @@ persist-tun
 allow-compression no
 client-to-client
 duplicate-cn
+script-security 2
 auth-user-pass-verify /usr/bin/false via-env
 verb 3
 mute 20

diff --git a/tests/configurations/server_auth_pass_ok.ovpn b/tests/configurations/server_auth_pass_ok.ovpn
@@ -11,6 +11,7 @@ persist-tun
 allow-compression no
 client-to-client
 duplicate-cn
+script-security 2
 auth-user-pass-verify /usr/bin/true via-env
 verb 3
 mute 20