Commit Graph

98 Commits

Author SHA1 Message Date
cmacrae
c5a21436b4 Adding the ability to define extra options:
Defining a new variable (defaults to empty) that allows users to define
extra configuration options in the top-level 'http' block.
This allows for (optionally) finer grain control.
2015-12-22 16:05:46 +00:00
cmacrae
cc5114dc4f Re-order template deploy & add validate:
Re-ordering the tasks in this way (having the vhosts deployed first)
allows the 'validate' param to collectively check the deployed Nginx config.

Deploying vhosts after makes it hard to check their validity, as Nginx's
config checking will operate on a "master" configuration that includes
others (checking those included, also) but would error out when checking
these individual configs if they do not contain a fully working Nginx
config (which they often don't, due to their nature).
2015-12-22 16:05:28 +00:00
Jeff Geerling
1f99c72698 Merge pull request #34 from asagage/fix-vhost-check
updating vhost conditional expressions to check count of list members
2015-12-10 14:53:37 -06:00
Asa Gage
73d7140752 updating vhost conditional expressions to check count of list members 2015-12-10 09:00:39 -05:00
Jeff Geerling
e9aa607bb6 Merge pull request #23 from fritz-c/patch-1
PR #23: Remove unnecessary semicolon from vhosts config.
2015-09-04 10:03:08 -05:00
Jeff Geerling
a08f8cda11 Fixes #20: Add example of a complete nginx_vhosts entry with extra_parameters. 2015-09-03 16:24:58 -05:00
Jeff Geerling
fc88ba2570 Fixes #24: Update apt cache if it hasn't been updated in a day. 2015-08-24 13:52:44 -05:00
Chris Fritz
c5672bf89b Remove unnecessary semicolon from vhosts config
Remove semicolon after `{{ vhost.extra_parameters }}` to allow support for blocks like `location ~ \.php$ { ... }`.
2015-08-06 20:05:31 +09:00
Jeff Geerling
c892b0a2fe Merge pull request #16 from Firfi/master
Restore compartability with geerlingguy-kibana, only include .conf files.
2015-05-16 06:50:44 -07:00
Igor Loskutov
d209cbe89a restore compartability with geerlingguy-kibana 2015-05-16 17:30:31 +07:00
Jeff Geerling
0ae5084e53 PR #14: Change use of nginx_conf_path and nginx_vhost_path to match naming convention. 2015-05-12 17:47:15 -07:00
Jeff Geerling
6eff7fa665 Merge pull request #14 from markwilde/master
Added additional nginx_conf_path for Debian.
2015-05-12 17:35:27 -07:00
Jeff Geerling
0d504441c6 Merge pull request #15 from eriksencosta/patch-1
Fix nginx_vhosts comment.
2015-05-12 13:36:53 -07:00
Eriksen Costa
c9ab6ef7e7 Fix nginx_vhosts comment
The key used in the vhosts.j2 template is extra_parameters.
2015-05-12 17:18:50 -03:00
Mark Wilde
3e8df12f7a Updated nginx_vhost_path to move /* 2015-05-01 10:18:07 +01:00
Mark Wilde
c02bf089a4 Added additional nginx_conf_path for Debian
For Debian systems both conf.d and sites-enabled should be included by default. Redhat systems have not been changed.

Issues came up using Kibana on Ubuntu as it installs kibana.conf in the conf.d folder.
2015-04-29 12:58:08 +01:00
Jeff Geerling
14765e52bf Issue #13: Document new nginx_default_release variable in README. 2015-02-25 08:02:18 -06:00
Jeff Geerling
d1828e9c39 Fixes #13: Allow configuration of default_release parameter for apt installation. 2015-02-25 07:59:24 -06:00
Jeff Geerling
07868edf2e Added extra useful Nginx variables. 2015-02-24 21:10:22 -06:00
Jeff Geerling
7d8a1ace36 Fixes #12: Allow for load balancing configurations by adding upstream config. 2015-02-21 00:42:51 -06:00
Jeff Geerling
90b6ddd1b3 Fixes #11: Add default/simple virtualhost configuration. 2015-02-21 00:02:51 -06:00
Jeff Geerling
7360d9cb0b Major vhosts cleanup in preparation for issue #11. 2015-02-20 23:34:31 -06:00
Jeff Geerling
c6e3321a66 Spacing in default vars file. 2015-02-20 23:17:35 -06:00
Jeff Geerling
6f04a8f2ed Update default worker_connections to 1024, since that plays nice with default OS configs. 2015-02-20 23:17:13 -06:00
Jeff Geerling
66922e9951 Fixes #10: Better organize os-specific tasks. 2015-02-20 23:15:01 -06:00
Jeff Geerling
7e6a17cc4d Issue #9: Add nginx repo template. 2015-01-23 11:08:05 -06:00
Jeff Geerling
df35be0665 Fixes #9: Use major distro version for Nginx repo on RedHat. 2015-01-23 11:07:30 -06:00
Jeff Geerling
fabb2ecbc0 Code style cleanup. 2015-01-23 10:57:06 -06:00
Jeff Geerling
fdc9a7da78 Issue #6 and PR #8: Make nginx user more flexible. 2015-01-02 11:47:26 -06:00
Jeff Geerling
45b749af83 Issue #5: Add 'nginx_proxy_cache_path' configuration option. 2014-12-08 22:07:57 -06:00
Jeff Geerling
200011e4d1 Merge pull request #4 from mfriedenhagen/master
Move vars to defaults as otherwise they may not be overridden.
2014-12-08 22:02:52 -06:00
Mirko Friedenhagen
5f95627706 Move vars to defaults as otherwise they may not be overridden. 2014-12-03 21:11:18 +01:00
Jeff Geerling
60bc2df30f Add EL7 to supported platforms. 2014-11-11 10:39:30 -06:00
Jeff Geerling
2d05eac2c3 Update test. 2014-11-08 14:36:17 -06:00
Jeff Geerling
736a95a012 Add option to remove default nginx vhost config. 2014-08-21 15:41:31 -05:00
Jeff Geerling
38a6c071e0 Comment out curl call until we have example vhost. 2014-08-03 21:42:42 -05:00
Jeff Geerling
8b2dadc854 Debugging for tests. 2014-08-03 21:37:48 -05:00
Jeff Geerling
1f48f9905f Make tests pass. 2014-08-03 21:34:46 -05:00
Jeff Geerling
b8a84d2bd7 Add test integration status to README.md. 2014-08-03 21:27:56 -05:00
Jeff Geerling
8ef999d267 Enable Travis CI testing. 2014-08-03 21:27:16 -05:00
Jeff Geerling
45713939ee Cleanup - This nginx role now works across RedHat and Debian. 2014-08-03 21:24:54 -05:00
Jeff Geerling
373d428ad1 Merge pull request #1 from Richard-NL/master
Add support for Debian flavors (initial).
2014-08-03 21:21:38 -05:00
Richard
9b91816d3f added support for Debian based os 2014-07-30 21:09:00 +02:00
Jeff Geerling
299b70fc1e Updated default connection limit. 2014-05-02 22:24:54 -05:00
Jeff Geerling
222479109f Update Nginx role to be more customizable. 2014-05-02 22:18:10 -05:00
Jeff Geerling
3e9fbe032b Updated README.md 2014-04-21 13:06:38 -05:00
Jeff Geerling
8fc5460164 Updated README with todos. 2014-03-07 09:07:04 -06:00
Jeff Geerling
d9aebe7dee Initial commit. 2014-03-07 08:51:16 -06:00