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.

Sign up for GitHub

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

Feature/meta #48

Closed
wants to merge 31 commits into from
Closed

Feature/meta #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4e1b5d6
Add geoip module support
welcoMattic Jul 1, 2015
2e12433
Add geoip module installation
welcoMattic Jul 1, 2015
bdeb64e
Re-add other modules (oops) and make geoip path dynamics
welcoMattic Jul 2, 2015
013c1f1
Allow `ansible-playbook` command in local env
welcoMattic Jul 2, 2015
830c9cb
newline at the EOF
welcoMattic Jul 2, 2015
613e7de
fix on vagrant-inventory to pass build
welcoMattic Jul 9, 2015
81c9d9f
fix 2 changed items on idempotency test
welcoMattic Jul 9, 2015
3e976fe
fix changed states of GeoIP unziping tasks
welcoMattic Jul 9, 2015
adce707
fix openssl version
welcoMattic Jul 9, 2015
eb0ae01
fix Vagrantfile modified for local tests
welcoMattic Jul 9, 2015
216d348
add inventory tmp file to .gitignore
welcoMattic Jul 9, 2015
de2b578
Remove `sudo: yes` from test.yml. Added early for tests
welcoMattic Jul 9, 2015
ade6f26
Merge pull request #2 from ANXS/master
Jul 9, 2015
edf1f85
Merge branch 'master' of github.com:welcoMattic/nginx into welcomatti…
welcoMattic Jul 9, 2015
9dbe7ba
fix geoip checking file existence
welcoMattic Jul 9, 2015
bd35b11
fix file checking with stat module
welcoMattic Jul 10, 2015
f5f780c
add source condition in nginx.conf template around geoip config lines
welcoMattic Jul 10, 2015
99913ab
delete debug tasks
welcoMattic Jul 10, 2015
079be50
Merge pull request #1 from welcoMattic/fix/openssl-version
Jul 10, 2015
20f75bc
Update README with geoip module
welcoMattic Jul 10, 2015
b6874e9
[meta] make hostname update as optional
welcoMattic Jul 16, 2015
40b1bc1
[gitignore] add inventory file
welcoMattic Jul 16, 2015
c15e4a9
[hostname] false by default
welcoMattic Jul 16, 2015
7401007
Merge pull request #3 from welcoMattic/fix/openssl-version
Jul 16, 2015
22bd782
Merge branch 'master' of github.com:welcoMattic/nginx into feature/meta
welcoMattic Jul 16, 2015
479beda
Merge pull request #4 from welcoMattic/feature/meta
Jul 16, 2015
35f9fad
Merge pull request #7 from ANXS/master
Jul 28, 2015
71917b0
Merge branch 'fix/openssl-version' of github.com:welcoMattic/nginx in…
welcoMattic Jul 28, 2015
5474794
# This is a combination of 50 commits.
pjan Apr 1, 2014
8edac04
Update README.md
welcoMattic Jul 28, 2015
347f5d8
Merge branch 'master' of github.com:welcoMattic/nginx into feature/meta
welcoMattic Jul 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Icon
.Trashes
.vagrant
test
inventory
10 changes: 9 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,14 +187,22 @@ You can put Nginx under monit monitoring protection, by setting `monit_protectio
###### naxsi module
- `nginx_naxsi_version` - version of the naxsi module

<<<<<<< HEAD
=======
###### geoip module
- `nginx_geoip: 'on'`
- `nginx_geoip_country: "{{nginx_dir}}/geoip/GeoIP.dat"`
- `nginx_geoip_city: "{{nginx_dir}}/geoip/GeoLiteCity.dat"`

>>>>>>> 71917b087691252188d2604c0d461a2e6e445a4e
#### Thanks

To the contributors:
- [Jean-Denis Vauguet](https://github.com/chikamichi)


#### Testing
This project comes with a VagrantFile, this is a fast and easy way to test changes to the role, fire it up with `vagrant up`.
This project comes with a VagrantFile, this is a fast and easy way to test changes to the role, fire it up with `vagrant up`.

See [vagrant docs](https://docs.vagrantup.com/v2/) for getting setup with vagrant

Expand Down
8 changes: 5 additions & 3 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# file: nginx/defaults/main.yml

nginx_install_method: "source"
nginx_source_version: "1.6.2"
nginx_source_version: "1.8.0"

nginx_user: www-data
nginx_group: www-data
Expand Down Expand Up @@ -117,7 +117,6 @@ nginx_gzip_types:
- image/svg+xml
nginx_gzip_disable: "MSIE [1-6]\\."


# http_stub_status_module configuration
nginx_remote_ip_var: "remote_addr"
nginx_authorized_ips:
Expand Down Expand Up @@ -164,4 +163,7 @@ nginx_naxsi_url: "https://github.com/nbs-system/naxsi/archive/{{nginx_naxsi_vers
nginx_ngx_pagespeed_version: 1.9.32.3

# OpenSSL configuration
openssl_version: "1.0.2d"
openssl_version: "1.0.2s"

# Hostname update
hostname_update: false
3 changes: 2 additions & 1 deletion meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ galaxy_info:
- system

dependencies:
- ANXS.hostname
- role: ANXS.hostname
when: hostname_update is defined and hostname_update == true
- ANXS.apt
- role: ANXS.build-essential
when: nginx_install_method is defined and nginx_install_method == "source"
Expand Down
2 changes: 1 addition & 1 deletion tasks/configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
name: nginx
state: started
register: nginx_first_start
when: not nginx_config.stat.exists
when: not nginx_config.stat.exists
1 change: 1 addition & 0 deletions test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- hosts: all
vars_files:
- 'defaults/main.yml'

tasks:
- name: install the dependencies
apt:
Expand Down