Feature/meta #48
Closed
Feature/meta #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge from original repo
Fix/openssl version
Update README with geoip module
Feature/meta
|
ok the bump of the OpenSSL version is in the current master. |
Merge from upstream
|
@soupdiver Ok, I'll split features. Sorry about this, I fixed openssl version quickly in at office. |
|
@soupdiver LGTM, you too ? |
|
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? |
|
@pjan Hmm, don't know how can I rewrite the remote git history ... Do you know how ? |
|
It's in the repository you own: I believe you can try (on this branch): |
# The first commit's message is: Update README.md # This is the 2nd commit message: Add condition to Ansible.monit dependency # This is the 3rd commit message: Add conditions to source building dependencies This means that the `build-essential` and `perl` dependancies aren't installed if we're not compiling from source. # This is the 4th commit message: Bugfix for naxsi under package install. Closes #12. # This is the 5th commit message: typo # This is the 6th commit message: Ansibles -> ANXS # This is the 7th commit message: Fixed typo # This is the 8th commit message: add more granular access to access log formats and filenames # This is the 9th commit message: Avoid recompiling nginx, FIXES #10 # This is the 10th commit message: Use location that already exists # This is the 11th commit message: add possibility to enable/disable sites # This is the 12th commit message: added: Create virtual sites directories Fixes #20 # This is the 13th commit message: added Vagrantfile # This is the 14th commit message: bump nginx version to current stable version # This is the 15th commit message: Change the build status to reflect that of master # This is the 16th commit message: Added in vagrantfile # This is the 17th commit message: Add idempotence test and update readme # This is the 18th commit message: Bump IP to start sequencing at 1 # This is the 19th commit message: Check if passwd attrs have changed # This is the 20th commit message: add creates to modules unpacking, remove double installs from test.yml, avoid recursing in directory setup # This is the 21st commit message: test both binary and source # This is the 22nd commit message: upper case env var, check directories after install # This is the 23rd commit message: add PageSpeed optimization module # This is the 24th commit message: removed installation of build-essentials because this is already handled by nginx_install_method # This is the 25th commit message: Only copy pagespeed source post-download # This is the 26th commit message: add custom openssl support # This is the 27th commit message: Update modules when they have changed # This is the 28th commit message: Use modules straight from unpacked folder # This is the 29th commit message: Fix Naxsi src # This is the 30th commit message: bump version of psol # This is the 31st commit message: add build-essential package # This is the 32nd commit message: optionally disable the default site # This is the 33rd commit message: add nginx_default_foo to readme # This is the 34th commit message: Fix README typo. Add a smoke test. # This is the 35th commit message: Forgot some files related to the smoke test # This is the 36th commit message: Properly handle first-run/idempotence # This is the 37th commit message: Be more explicit in determining if this is our first run # This is the 38th commit message: Switch from run-time smoke test to actual integration test # This is the 39th commit message: use newer openssl source # This is the 40th commit message: [meta] make hostname update as optional # This is the 41st commit message: [gitignore] add inventory file # This is the 42nd commit message: [hostname] false by default # This is the 43rd commit message: Add geoip module support # This is the 44th commit message: Add geoip module installation # This is the 45th commit message: Re-add other modules (oops) and make geoip path dynamics # This is the 46th commit message: Allow `ansible-playbook` command in local env # This is the 47th commit message: newline at the EOF # This is the 48th commit message: fix on vagrant-inventory to pass build # This is the 49th commit message: fix 2 changed items on idempotency test # This is the 50th commit message: fix changed states of GeoIP unziping tasks
Add condition to Ansible.monit dependency Add conditions to source building dependencies This means that the `build-essential` and `perl` dependancies aren't installed if we're not compiling from source. Bugfix for naxsi under package install. Closes #12. typo Ansibles -> ANXS Fixed typo add more granular access to access log formats and filenames Avoid recompiling nginx, FIXES #10 Use location that already exists add possibility to enable/disable sites added: Create virtual sites directories Fixes #20 added Vagrantfile bump nginx version to current stable version Change the build status to reflect that of master Added in vagrantfile Add idempotence test and update readme Bump IP to start sequencing at 1 Check if passwd attrs have changed add creates to modules unpacking, remove double installs from test.yml, avoid recursing in directory setup test both binary and source upper case env var, check directories after install add PageSpeed optimization module removed installation of build-essentials because this is already handled by nginx_install_method Only copy pagespeed source post-download add custom openssl support Update modules when they have changed Use modules straight from unpacked folder Fix Naxsi src bump version of psol add build-essential package optionally disable the default site add nginx_default_foo to readme Fix README typo. Add a smoke test. Forgot some files related to the smoke test Properly handle first-run/idempotence Be more explicit in determining if this is our first run Switch from run-time smoke test to actual integration test use newer openssl source [meta] make hostname update as optional [gitignore] add inventory file [hostname] false by default Add geoip module support Add geoip module installation Re-add other modules (oops) and make geoip path dynamics Allow `ansible-playbook` command in local env newline at the EOF fix on vagrant-inventory to pass build fix 2 changed items on idempotency test fix changed states of GeoIP unziping tasks fix openssl version fix Vagrantfile modified for local tests add inventory tmp file to .gitignore Remove `sudo: yes` from test.yml. Added early for tests A few changes: * change client_body_buffer_size to reduce chance of buffer overflow * Turn off server_tokens to not disclose server version * Change vagrant inventory file to use vagrant user by default * ensure swap files don't get committed fix geoip checking file existence fix file checking with stat module add source condition in nginx.conf template around geoip config lines delete debug tasks Update README with geoip module [geoip] remove remaining features [geoip] remove README doc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make hostname update as optional
Depends on #46