search

ANXS / nginx

A fairly flexible and feature full Ansible role for the NGINX web server.
MIT License
151 stars 82 forks source link

Feature/meta #48

Closed welcoMattic closed 5 years ago

welcoMattic commented 9 years ago

Make hostname update as optional

Depends on https://github.com/ANXS/nginx/pull/46

soupdiver commented 9 years ago

ok the bump of the OpenSSL version is in the current master. Could you somehow split/clean the remaining features like geoip module?

welcoMattic commented 9 years ago

@soupdiver Ok, I'll split features. Sorry about this, I fixed openssl version quickly in at office.

welcoMattic commented 9 years ago

@soupdiver LGTM, you too ?

pjan commented 9 years ago

looks ok to me, but I'd like @soupdiver to confirm.

Any chance you could squash the commits in order to keep the commit-history of master reasonably clean-ish?

welcoMattic commented 9 years ago

@pjan Hmm, don't know how can I rewrite the remote git history ... Do you know how ?

pjan commented 9 years ago

It's in the repository you own:

I believe you can try (on this branch):

git rebase -i HEAD~30    
// interactive rebase on 30 commits. change the "pick" in line 2 to the last commit to "s" and save
// now all these commits should be squashed onto the first one

git push origin feature/meta --force
// force push it to rewrite the git history of that branch