diff options
| -rw-r--r-- | MANIFEST | 3 | ||||
| -rw-r--r-- | extras/desktop/manawall.desktop | 8 | ||||
| -rw-r--r-- | extras/polkit/org.mageia.manawall.policy | 50 | ||||
| -rw-r--r-- | lib/AdminPanel/Module/Firewall.pm | 6 | ||||
| -rw-r--r-- | lib/AdminPanel/Shared/GUI.pm | 1 | ||||
| -rw-r--r-- | lib/AdminPanel/Shared/Shorewall.pm | 1 | ||||
| -rw-r--r-- | share/images/manawall.png | bin | 0 -> 2976 bytes |
7 files changed, 65 insertions, 4 deletions
@@ -14,6 +14,7 @@ extras/desktop/manaproxy.desktop extras/desktop/manaservice.desktop extras/desktop/manauser.desktop extras/desktop/manauserlog.desktop +extras/desktop/manawall.desktop extras/desktop/mpan.desktop extras/desktop/rpmdragora.desktop extras/polkit/org.mageia.dragoraupdate.policy @@ -26,6 +27,7 @@ extras/polkit/org.mageia.manaservice.policy extras/polkit/org.mageia.manauser.policy extras/polkit/org.mageia.mpan.policy extras/polkit/org.mageia.rpmdragora.policy +extras/polkit/org.mageia.manawall.policy extras/README extras/setup.sh ignore.txt @@ -108,6 +110,7 @@ share/images/manalog.png share/images/manaproxy.png share/images/manaservice.png share/images/manauser.png +share/images/manawall.png share/images/mpan.png share/images/quit.png share/images/rpmdragora/bugfix-update.png diff --git a/extras/desktop/manawall.desktop b/extras/desktop/manawall.desktop new file mode 100644 index 00000000..8a2d93dd --- /dev/null +++ b/extras/desktop/manawall.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=manawall +Comment=AdminPanel firewall configurator +Exec=mana wall +Icon=/usr/share/icons/manawall.png +Type=Application +StartupNotify=true +Categories=System;X-MandrivaLinux-CrossDesktop; diff --git a/extras/polkit/org.mageia.manawall.policy b/extras/polkit/org.mageia.manawall.policy new file mode 100644 index 00000000..286d0043 --- /dev/null +++ b/extras/polkit/org.mageia.manawall.policy @@ -0,0 +1,50 @@ +<?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>Mageia</vendor> + <vendor_url>http://www.mageia.org/</vendor_url> + + <action id="org.mageia.manawall.pkexec.run"> + <description>Run Mageia Firewall Configuration</description> + <description xml:lang="ca">Executa la configuració de tallafoc de Mageia</description> + <description xml:lang="el">Εκτέλεση της Διαμόρφωσης του Τείχους Προστασίας</description> + <description xml:lang="et">Mageia tulemüüri seadistamise käivitamine</description> + <description xml:lang="fr">Lancer l'outil de configuration du Pare-feu de Mageia</description> + <description xml:lang="id">Jalankan Konfigurasi Firewall Mageia</description> + <description xml:lang="it">Esegui la configurazione Mageia del Firewall</description> + <description xml:lang="nl">Start Mageia's Firewallconfiguratie</description> + <description xml:lang="pt_BR">Executar Configuração Firewall Mageia</description> + <description xml:lang="ro">Lansează configurarea parafocului pentru Mageia</description> + <description xml:lang="ru">Запуск настройки файервола</description> + <description xml:lang="sl">Zagon nastavitev požarnega zidu Mageje</description> + <description xml:lang="tr">Mageia Güvenlik Duvarı Yapılandırması Çalıştır</description> + <description xml:lang="uk">Запуск засобу налаштовування захисного шлюзу Mageia</description> + <description xml:lang="zh_TW">執行 Mageia 防火牆組態設定</description> + <message>Authentication is required to run Mageia Firewall Configuration</message> + <message xml:lang="ca">Cal autenticar-se per a executar la configuració de tallafoc de Mageia</message> + <message xml:lang="el">Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης του Τείχους Προστασίας Mageia</message> + <message xml:lang="et">Mageia tulemüüri seadistamine nõuab autentimist</message> + <message xml:lang="fr">Une authentification est nécessaire pour lancer l'outil de configuration du Pare-feu de Mageia</message> + <message xml:lang="id">Otentikasi diperlukan untuk menjalankan Konfigurasi Firewall Mageia</message> + <message xml:lang="it">È necessaria l'autenticazione per eseguire la configurazione Mageia del Firewall</message> + <message xml:lang="nl">Authenticatie is nodig om Mageia's Firewallconfiguratie te starten</message> + <message xml:lang="pt_BR">A autenticação é necessária para executar a configuração do Firewall Mageia</message> + <message xml:lang="ro">Autentificare necesară pentru lansarea aplicației Mageia de configurat parafocul</message> + <message xml:lang="ru">Требуется аутентификация для запуска настройки файервола</message> + <message xml:lang="sl">Za zagon nastavitev požarnega zidu Mageje je potrebno overjanje</message> + <message xml:lang="tr">Mageia Güvenlik Duvarı Yapılandırması için kimlik doğrulama gerekli</message> + <message xml:lang="uk">Щоб запустити засіб налаштовування захисного шлюзу Mageia, слід пройти розпізнавання</message> + <message xml:lang="zh_TW">執行 Mageia 防火牆組態設定需要認證</message> + <icon_name>drakconf</icon_name> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/manawall</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/lib/AdminPanel/Module/Firewall.pm b/lib/AdminPanel/Module/Firewall.pm index fcd4b28c..26eb9e83 100644 --- a/lib/AdminPanel/Module/Firewall.pm +++ b/lib/AdminPanel/Module/Firewall.pm @@ -44,7 +44,7 @@ use List::MoreUtils qw(uniq); extends qw( AdminPanel::Module ); has '+icon' => ( - default => "/usr/share/mcc/themes/default/firewall-mdk.png", + default => "/usr/share/icons/manawall.png", ); has '+name' => ( @@ -498,7 +498,7 @@ sub choose_watched_services { my $retval = $self->ask_WatchedServices({ title => $self->loc->N("Interactive Firewall"), - icon => $AdminPanel::Shared::Shorewall::firewall_icon, + icon => $self->icon(), # if_(!$::isEmbedded, banner_title => N("Interactive Firewall")), messages => $self->loc->N("You can be warned when someone accesses to a service or tries to intrude into your computer. @@ -716,7 +716,7 @@ sub choose_allowed_services { my $dialog_data = { title => $self->loc->N("Firewall"), - icon => $AdminPanel::Shared::Shorewall::firewall_icon, + icon => $self->icon(), # if_(!$::isEmbedded, banner_title => $self->loc->N("Firewall")), banner_title => $self->loc->N("Firewall"), advanced_messages => $self->loc->N("You can enter miscellaneous ports. diff --git a/lib/AdminPanel/Shared/GUI.pm b/lib/AdminPanel/Shared/GUI.pm index d918e2ff..9a67231b 100644 --- a/lib/AdminPanel/Shared/GUI.pm +++ b/lib/AdminPanel/Shared/GUI.pm @@ -34,6 +34,7 @@ Angelo Naselli <anaselli@linux.it> =head1 COPYRIGHT and LICENSE Copyright (C) 2014-2015, Angelo Naselli. +Copyright (C) 2015, Matteo Pasotti <matteo.pasotti@gmail.com>. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as diff --git a/lib/AdminPanel/Shared/Shorewall.pm b/lib/AdminPanel/Shared/Shorewall.pm index 03b29aaf..77c6776f 100644 --- a/lib/AdminPanel/Shared/Shorewall.pm +++ b/lib/AdminPanel/Shared/Shorewall.pm @@ -13,7 +13,6 @@ use List::MoreUtils qw(uniq); use log; my $shorewall_root = "/etc/shorewall"; -our $firewall_icon = $::isInstall ? 'banner-security' : '/usr/share/mcc/themes/default/firewall-mdk.png'; sub check_iptables() { -f "$::prefix/etc/sysconfig/iptables" || diff --git a/share/images/manawall.png b/share/images/manawall.png Binary files differnew file mode 100644 index 00000000..fb54fd73 --- /dev/null +++ b/share/images/manawall.png |
