Skip to content

Commit

Permalink
Merge 156d5fb into 6cd31ac
Browse files Browse the repository at this point in the history
  • Loading branch information
@teclator
teclator committed Jan 30, 2018
2 parents 6cd31ac + 156d5fb commit 9c5ed01
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 78 deletions.
6 changes: 6 additions & 0 deletions package/yast2-dns-server.changes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 25 15:26:18 UTC 2018 - knut.anderssen@suse.com

- Replace SuSEFirewall2 by firewalld (fate#323460)
- 4.0.1

-------------------------------------------------------------------
Mon Nov 6 11:55:43 UTC 2017 - knut.anderssen@suse.com

Expand Down
14 changes: 7 additions & 7 deletions package/yast2-dns-server.spec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# spec file for package yast2-dns-server
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand All @@ -17,24 +17,24 @@


Name: yast2-dns-server
Version: 4.0.0
Version: 4.0.1
Release: 0
Url: https://github.com/yast/yast-dns-server

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2

BuildRequires: perl-XML-Writer
BuildRequires: rubygem(rspec)
BuildRequires: update-desktop-files
BuildRequires: yast2
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-ldap >= 3.1.4
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
BuildRequires: rubygem(rspec)

# UI::ServiceStatus
BuildRequires: yast2 >= 3.1.161
# SuSEFirewall2 replaced by firewalld
BuildRequires: yast2 >= 4.0.39
Requires: /usr/bin/host
Requires: perl-gettext
# Exporter Data::Dumper
Expand All @@ -55,8 +55,8 @@ Requires: sed
# FATE #303386: Network setup tools
Requires: yast2-sysconfig

# UI::ServiceStatus
Requires: yast2 >= 3.1.161
# SuSEFirewall2 replaced by firewalld
Requires: yast2 >= 4.0.39

BuildArch: noarch

Expand Down
2 changes: 1 addition & 1 deletion src/include/dns-server/dialog-installwizard.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def runInstallWizardFinishDialog
)

firewall_settings = {
"services" => ["service:bind"],
"services" => ["dns"],
"display_details" => true
}
firewall_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget(
Expand Down
2 changes: 1 addition & 1 deletion src/include/dns-server/dialog-main.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2092,7 +2092,7 @@ def new_widgets
"help" => status_widget.help
},
"firewall" => CWMFirewallInterfaces.CreateOpenFirewallWidget(
{ "services" => ["service:bind"], "display_details" => true }
{ "services" => ["dns"], "display_details" => true }
),
"use_ldap" => CWMServiceStart.CreateLdapWidget(
{
Expand Down
2 changes: 1 addition & 1 deletion src/include/dns-server/dialogs.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def initialize_dns_server_dialogs(include_target)
Yast.import "CWM"
Yast.import "Wizard"
Yast.import "Message"
Yast.import "SuSEFirewall"
Yast.import "FirewalldWrapper"
Yast.import "Punycode"
Yast.import "Confirm"
end
Expand Down
11 changes: 4 additions & 7 deletions src/modules/DnsServer.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ YaST::YCP::Import ("Popup");
YaST::YCP::Import ("Progress");
YaST::YCP::Import ("Report");
YaST::YCP::Import ("Service");
YaST::YCP::Import ("SuSEFirewall");
YaST::YCP::Import ("FirewalldWrapper");
YaST::YCP::Import ("Message");
YaST::YCP::Import ("CWMTsigKeys");
YaST::YCP::Import ("NetworkService");
Expand Down Expand Up @@ -1022,7 +1022,7 @@ sub Read {
Progress->NextStage ();

my $current_progress = Progress->set(0);
SuSEFirewall->Read();
FirewalldWrapper->read();
Progress->set($current_progress);

Progress->NextStage ();
Expand Down Expand Up @@ -1392,7 +1392,7 @@ sub Write {
}
}

if ((! $modified) && (! SuSEFirewall->GetModified()))
if ((! $modified) && (! FirewalldWrapper->read()))
{
return $ok;
}
Expand Down Expand Up @@ -1582,10 +1582,7 @@ sub Write {

Progress->NextStage ();

# Firewall has it's own Progress
my $progress_orig = Progress->set (0);
SuSEFirewall::Write();
Progress->set ($progress_orig);
FirewalldWrapper->write();

Progress->NextStage ();

Expand Down
2 changes: 1 addition & 1 deletion src/modules/DnsServerUI.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def main
Yast.import "Progress"
Yast.import "Report"
Yast.import "Summary"
Yast.import "SuSEFirewall"
Yast.import "FirewalldWrapper"

Yast.import "DnsFakeTabs" # FIXME remove when possbile

Expand Down
60 changes: 0 additions & 60 deletions testsuite/tests/Read.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,6 @@ def main
}
},
"sysconfig" => {
"SuSEfirewall2" => {
"FW_ALLOW_FW_TRACEROUTE" => "yes",
"FW_AUTOPROTECT_SERVICES" => "no",
"FW_DEV_DMZ" => "",
"FW_DEV_EXT" => "eth-id-00:c0:df:22:c6:a8",
"FW_DEV_INT" => "",
"FW_IPSEC_TRUST" => "no",
"FW_LOG_ACCEPT_ALL" => "no",
"FW_LOG_ACCEPT_CRIT" => "yes",
"FW_LOG_DROP_ALL" => "no",
"FW_LOG_DROP_CRIT" => "yes",
"FW_MASQUERADE" => "no",
"FW_MASQ_NETS" => "",
"FW_PROTECT_FROM_INTERNAL" => "yes",
"FW_ROUTE" => "no",
"FW_SERVICES_DMZ_IP" => "",
"FW_SERVICES_DMZ_TCP" => "",
"FW_SERVICES_DMZ_UDP" => "",
"FW_SERVICES_EXT_IP" => "",
"FW_SERVICES_EXT_RPC" => "nlockmgr status nfs nfs_acl mountd ypserv fypxfrd ypbind ypasswdd",
"FW_SERVICES_EXT_TCP" => "32768 5801 5901 dixie domain hostname microsoft-ds netbios-dgm netbios-ns netbios-ssn nfs ssh sunrpc",
"FW_SERVICES_EXT_UDP" => "222 bftp domain ipp sunrpc",
"FW_SERVICES_INT_IP" => "",
"FW_SERVICES_INT_TCP" => "ddd eee fff 44 55 66",
"FW_SERVICES_INT_UDP" => "aaa bbb ccc 11 22 33",
"FW_SERVICES_INT_RPC" => "",
"FW_SERVICES_DMZ_RPC" => "",
"FW_ALLOW_FW_BROADCAST" => ""
},
"personal-firewall" => { "REJECT_ALL_INCOMING_CONNECTIONS" => "" },
"displaymanager" => { "DISPLAYMANAGER" => "" },
"network" => { "NETCONFIG_DNS_FORWARDER" => "resolver" },
Expand Down Expand Up @@ -112,8 +83,6 @@ def main
Mode.SetMode("test")

# avoid reading SuSEFirewall sysconfig
Yast.import "SuSEFirewall"

@progress_orig = Progress.set(false)

@READ = {
Expand Down Expand Up @@ -215,35 +184,6 @@ def main
"FILE_SERVER" => "",
"BIND_DN" => ""
},
"SuSEfirewall2" => {
"FW_ALLOW_FW_TRACEROUTE" => "yes",
"FW_AUTOPROTECT_SERVICES" => "no",
"FW_DEV_DMZ" => "",
"FW_DEV_EXT" => "eth-id-00:c0:df:22:c6:a8",
"FW_DEV_INT" => "",
"FW_IPSEC_TRUST" => "no",
"FW_LOG_ACCEPT_ALL" => "no",
"FW_LOG_ACCEPT_CRIT" => "yes",
"FW_LOG_DROP_ALL" => "no",
"FW_LOG_DROP_CRIT" => "yes",
"FW_MASQUERADE" => "no",
"FW_MASQ_NETS" => "",
"FW_PROTECT_FROM_INTERNAL" => "yes",
"FW_ROUTE" => "no",
"FW_SERVICES_DMZ_IP" => "",
"FW_SERVICES_DMZ_TCP" => "",
"FW_SERVICES_DMZ_UDP" => "",
"FW_SERVICES_EXT_IP" => "",
"FW_SERVICES_EXT_RPC" => "nlockmgr status nfs nfs_acl mountd ypserv fypxfrd ypbind ypasswdd",
"FW_SERVICES_EXT_TCP" => "32768 5801 5901 dixie domain hostname microsoft-ds netbios-dgm netbios-ns netbios-ssn nfs ssh sunrpc",
"FW_SERVICES_EXT_UDP" => "222 bftp domain ipp sunrpc",
"FW_SERVICES_INT_IP" => "",
"FW_SERVICES_INT_TCP" => "ddd eee fff 44 55 66",
"FW_SERVICES_INT_UDP" => "aaa bbb ccc 11 22 33",
"FW_SERVICES_INT_RPC" => "",
"FW_SERVICES_DMZ_RPC" => "",
"FW_ALLOW_FW_BROADCAST" => ""
},
"personal-firewall" => { "REJECT_ALL_INCOMING_CONNECTIONS" => "" },
"network" => {
"config" => {
Expand Down

0 comments on commit 9c5ed01

Please sign in to comment.