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

Update README.md #2195

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update README.md #2195

wants to merge 2 commits into from

Conversation

azlux
Copy link

@azlux azlux commented Aug 7, 2018

List of change:

  • Only the README : The fail2ban executable are into /usr/local/bin with the master branch.

Before submitting your PR, please review the following checklist:

  • CHOOSE CORRECT BRANCH: if filing a bugfix/enhancement
    against 0.9.x series, choose master branch

edit @yarikoptic adjusted branch to be master

The fail2ban executable are into `/usr/local/bin` with the master branch.
@coveralls
Copy link

coveralls commented Aug 7, 2018

Coverage Status

Coverage decreased (-0.02%) to 97.781% when pulling b095e5b on azlux:0.11 into 606761b on fail2ban:0.11.

@codecov-io
Copy link

codecov-io commented Aug 7, 2018

Codecov Report

Merging #2195 into 0.11 will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             0.11    #2195      +/-   ##
==========================================
- Coverage   95.68%   95.66%   -0.03%     
==========================================
  Files          78       78              
  Lines       14338    14338              
  Branches     2266     2266              
==========================================
- Hits        13720    13717       -3     
- Misses        320      322       +2     
- Partials      298      299       +1
Impacted Files Coverage Δ
fail2ban/server/filterpyinotify.py 94.36% <0%> (-1.41%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 606761b...b095e5b. Read the comment docs.

README.md Outdated
@@ -56,7 +56,7 @@ Alternatively, you can clone the source from GitHub to a directory of Your choic
sudo python setup.py install

This will install Fail2Ban into the python library directory. The executable
scripts are placed into `/usr/bin`, and configuration in `/etc/fail2ban`.
scripts are placed into `/usr/local/bin`, and configuration in `/etc/fail2ban`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm... this depends on distribution-version resp. platform where you try to install fail2ban.
I don't think it's correct so... Maybe:

- scripts are placed into `/usr/bin`, and configuration in `/etc/fail2ban`.
+ scripts are placed into `/usr/bin` or `/usr/local/bin`, and configuration in `/etc/fail2ban`.

Copy link
Author

Choose a reason for hiding this comment

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

I change that because the manual install but the fail2ban into /usr/local/bin (where distrib installer usually use /usr/bin
But we can add both.

Copy link
Member

Choose a reason for hiding this comment

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

or /usr/sbin or /usr/local/sbin since admin-oriented... so may be "scripts are placed in a directory listed in the PATH environment variable (e.g., /usr/bin), ..."

@yarikoptic yarikoptic changed the base branch from 0.11 to master November 22, 2023 15:56
@yarikoptic
Copy link
Member

@sebres in your experience it still the case right? I changed base to master

@sebres
Copy link
Contributor

sebres commented Nov 22, 2023

Nothing changed between 0.11 and 1.1 concerning this matter, so yes.

@yarikoptic
Copy link
Member

@sebres what is overall the flow of accepting PRs: you approved but nobody merged... was it me who failed to press the Merge back then? ;)

Merge attempt failed
Head branch is out of date. Review and try the merge again.

I guess there are some extra rules enforcing cleaner history etc? Would it be ok to just cherry pick into master?

@sebres
Copy link
Contributor

sebres commented Nov 22, 2023

you approved but nobody merged...

Mostly it means either time pressure, or I wanted do it from git (e. g. squash, cherry-pick, whatever) but don't have the repo to hand at that point, and/or just forgotten after all.
Unfortunately I'm persistently busy.

I guess there are some extra rules enforcing cleaner history etc?

Probably... no Idea why it happens.

Would it be ok to just cherry pick into master?

Sure.

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

5 participants