Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pure ftp drop #27

Merged
merged 21 commits into from
Feb 8, 2018
Merged

Pure ftp drop #27

merged 21 commits into from
Feb 8, 2018

Conversation

jreidinger
Copy link
Member

@jreidinger jreidinger commented Feb 8, 2018

https://trello.com/c/uL3kzh2z/1322-8-remove-yast-xinetd-autoyast-ftp-server-and-inetd-module

after approval another round of manual testing is planned. The first round was successful on SLE15.

@coveralls
Copy link

coveralls commented Feb 8, 2018

Coverage Status

Coverage decreased (-0.2%) to 2.676% when pulling 37503d7 on pure_ftp_drop into 8dec98b on master.

@jreidinger jreidinger changed the title [WIP] Pure ftp drop Pure ftp drop Feb 8, 2018
- convert starting on demand from Xinetd to systemd sockets due
to drop of Xinetd (fate#323373)
- Drop pure-ftp as it does not provide systemd socket and we want
to support only one backend to reduce maintenance loadout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maintenance loadout => the maintenance charge

Release: 0

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

# SuSEFirewall2 replace by firewalld (fate#323460)
Requires: yast2 >= 4.0.39
Requires: yast2-inetd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we only support one backend pure-ftpd can be removed from the description.

@@ -355,25 +313,25 @@ def main
"Anonymous users can create directories."
)
},
#only vsftd
# only vsftd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NP: We were removing allusions to only vsftpd below, so why not just remove them completely

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makes sense

CommandLine.Print("")
# TRANSLATORS: CommandLine header
CommandLine.Print(String.UnderlinedHeader(_("Start-Up:"), 0))
CommandLine.Print("")
# TRANSLATORS: CommandLine progress information
CommandLine.Print(_("Start FTP daemon via xinetd"))
CommandLine.Print(_("Start FTP daemon via socket"))
CommandLine.Print("")
SetStartedViaXinetd(true)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this call be removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why it should be removed? It is CLI that inform you that FTP Daemon is starting by socket listening.

Copy link
Contributor

@teclator teclator Feb 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the SetStartedViaXinetd(true) at least should be renamed as commented before trying to remove allusions to xinetd, so rename to a name that correspond with the current behavior.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, make sense, now it do socket enablement.

CommandLine.Print("")
CommandLine.Print(String.UnderlinedHeader(_("Display Settings:"), 0))
CommandLine.Print("")
#start-up settings
# start-up settings
CommandLine.PrintNoCR(_("Start-Up:"))
if GetStartedViaXinetd()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this call be removed as commented below with Set method?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why it should be removed? When systemd socket start ftp daemon, then it should be written. There are three states: socket, service and manual and this is one of the states.

Copy link
Contributor

@teclator teclator Feb 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As with Set I would rename it to correspond the behavior with the naming

@@ -2,19 +2,10 @@

require "yast"

require "y2firewall/firewalld"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thnx!

Copy link
Contributor

@teclator teclator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jreidinger jreidinger merged commit 40ea5c2 into master Feb 8, 2018
@jreidinger jreidinger deleted the pure_ftp_drop branch February 8, 2018 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants