Merge pull request #24 from teclator/firewalld

Replace SuSEFirewall2 by firewalld

.gitignore

@@ -29,3 +29,4 @@ stamp-h*
 /testsuite/run/runtest.sh
 *.bak
 /testsuite/yast2-nfs-server.test/
+.yardoc/

.yardopts

@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb

package/yast2-nfs-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  2 15:16:24 UTC 2018 - knut.anderssen@suse.com
+
+- Replace SuSEFirewall2 by firewalld (fate#323460)
+- 4.0.0
+
 -------------------------------------------------------------------
 Tue Jun  7 08:24:14 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-nfs-server.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-server
-Version:        3.1.9
+Version:        4.0.0
 Release:        0
 URL:            https://github.com/yast/yast-nfs-server
 
@@ -26,13 +26,12 @@ Source0:        %{name}-%{version}.tar.bz2
 
 Group:	        System/YaST
 License:        GPL-2.0+
-# Changed implementation for checking if service is enabled 2.23.23 (affects testsuite)
-BuildRequires:	yast2 >= 2.23.23
+# SuSEFirewall2 replaced by firewalld (fate#323460)
+BuildRequires:	yast2 >= 4.0.39
 BuildRequires:	perl-XML-Writer update-desktop-files yast2-testsuite
 BuildRequires:  yast2-devtools >= 3.1.10
-# Service::Find
-# Wizard::SetDesktopTitleAndIcon
-Requires:	yast2 >= 2.21.22
+# SuSEFirewall2 replaced by firewalld (fate#323460)
+Requires:	yast2 >= 4.0.39
 Requires:	yast2-nfs-common
 Recommends:     nfs-kernel-server
 

src/include/nfs_server/ui.rb

@@ -281,13 +281,9 @@ def BeginDialog
 
       changed = false
 
-      # firewall widget using CWM
-      fw_settings = {
-        "services"        => ["service:nfs-kernel-server"], # bnc#446163
-        "display_details" => true
-      }
       fw_cwm_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget(
-        fw_settings
+        "services"        => ["nfs-kernel-server"],
+        "display_details" => true
       )
 
       help_text =
@@ -464,7 +460,7 @@ def BeginDialog
       end while ret != :back && ret != :next && ret != :abort
 
       if ret == :next
-        # grab current settings, store them to SuSEFirewall::
+        # grab current settings, store them to firewalld::
         CWMFirewallInterfaces.OpenFirewallStore(fw_cwm_widget, "", event)
         NfsServer.start = start_nfs_server
         NfsServer.domain = Convert.to_string(

src/modules/NfsServer.rb

@@ -15,6 +15,7 @@
 # $Id$
 #
 require "yast"
+require "y2firewall/firewalld"
 
 module Yast
   class NfsServerClass < Module
@@ -25,7 +26,6 @@ def main
       Yast.import "Report"
       Yast.import "Service"
       Yast.import "Summary"
-      Yast.import "SuSEFirewall"
       Yast.import "Wizard"
 
       # default value of settings modified
@@ -137,7 +137,7 @@ def Read
       end
 
       progress_orig = Progress.set(false)
-      SuSEFirewall.Read
+      firewalld.read
       Progress.set(progress_orig)
 
       @exports != nil
@@ -306,8 +306,7 @@ def Write
       end
 
       progress_orig = Progress.set(false)
-      SuSEFirewall.WriteOnly
-      SuSEFirewall.ActivateConfiguration if !@write_only
+      @write_only ? firewalld.write_only : firewalld.write
       Progress.set(progress_orig)
 
       Progress.NextStage
@@ -379,6 +378,12 @@ def AutoPackages
     publish :function => :Write, :type => "boolean ()"
     publish :function => :Summary, :type => "string ()"
     publish :function => :AutoPackages, :type => "map ()"
+
+  private
+
+    def firewalld
+      Y2Firewall::Firewalld.instance
+    end
   end
 
   NfsServer = NfsServerClass.new