Commit Graph

51 Commits

Author SHA1 Message Date
Jeff Geerling 1820e90b4c PR #86 follow-up: Fix a couple code style issues. 2021-04-13 22:37:05 -05:00
Robert O'Connor 2aa9dd5f06
Fixes #86 -- Add ipv6 support 2021-04-13 00:06:36 -04:00
Prisacari Dmitrii 262eb715aa Merge branch 'master' into change-extra-conf-location 2017-07-13 10:49:42 +03:00
Lioman 7e0a33c492 Update vhost.j2
move "server {" to if block
2017-06-07 10:35:26 +02:00
Lioman 58645502b4 Update vhost.j2
Add missing server {  to vhost template
2017-06-07 09:52:27 +02:00
Oskar Schöldström c9a6015281 move gzip to separate block as it's pretty common to override 2017-04-22 16:26:45 -05:00
Oskar Schöldström 36cd4d3aec Allow users to extend config files through template inheritance 2017-04-22 16:26:45 -05:00
Oskar Schöldström 3f0442fe63 Set default listen value to 80 rather than 80 default_server 2017-04-21 07:41:41 -05:00
Oskar Schöldström f8a04dd544 Write vhost configurations to separate config files 2017-04-21 07:25:18 -05:00
Prisacari Dmitrii b8e5bb23c3 Changed extra conf location in template 2017-02-07 21:29:16 +02:00
Jeff Geerling 769a84ece8 Merge pull request #77 from bersace/log_format
Parametrize log_format
2017-01-30 22:27:10 -06:00
Russell Clare 2fffc382a4
Adding in ability to disable server_tokens, defaulting to on (previous behaviour) 2017-01-31 06:40:11 +08:00
Étienne BERSAC (bersace) c4605ded8f Parametrize log_format 2016-11-23 17:51:02 +01:00
Daniel Wilhelm f91ed1ffd4 format nginx_extra_http_options with indent
http section in nginx.conf is indented by default. To increase
readability format the variable nginx_extra_http_options with
the same indent for multiline string blocks. Therefore indent
needs not to be done in yaml.
2016-11-12 16:55:01 +01:00
strategist333 0d399a67a7 Fix unnatural indentation in extra_parameters block
Previously, one needed to extra-indent subsequent lines by 4 spaces.
This changes makes reading the configuration in yaml much more
pleasant.
2016-09-23 21:48:31 -07:00
Jeff Geerling a767f2741c Merge pull request #65 from chaordic/upstreams-keepalive
Add keepalive option to upstreams configuration
2016-09-12 16:49:27 -05:00
Sia Gholami 1e14a1e0c7 Fixing vhosts.j2 indentation 2016-08-18 14:34:21 +01:00
Thiago Caiubi 86a18f8fd1 Add keepalive option to upstreams configuration 2016-08-08 11:53:45 -03:00
Jeff Geerling 4fb38405f9 Revert "prevent whitespace from jinja control structures from making it into templates" 2016-05-06 16:44:36 -05:00
Jeff Geerling f7e43de918 Merge pull request #53 from benjamin-smith/feature/whitespace-control
prevent whitespace from jinja control structures from making it into templates
2016-05-06 11:16:33 -05:00
Jeff Geerling ddd118a2fd Merge pull request #52 from benjamin-smith/feature/optional-server_name
make the "server_name" directive optional
2016-05-06 11:14:16 -05:00
Jeff Geerling 1d3ac0840d Fixes #28: Make server_names_hash_bucket_size configurable. 2016-05-06 11:13:17 -05:00
Bartek Rutkowski 3d71531209 Add FreeBSD support. 2016-04-22 20:29:39 +01:00
Benjamin Smith 295584baf8 update jinja templates to not leave whitespace from jinja control structures 2016-03-29 13:15:33 -04:00
Benjamin Smith 102949fcb8 make the "server_name" directive optional 2016-03-29 12:35:06 -04:00
Jeff Geerling baa802befe Merge pull request #47 from colinhoglund/master
Convert pidfile into a variable.
2016-03-17 10:06:00 -05:00
Levent YALCIN 5f6b023f68 multi_accept option added 2016-03-17 14:46:59 +00:00
Jeff Geerling 90aeacbdd3 Merge pull request #49 from techraf/restore-enabled-sites-default-behaviour
Restore nginx's default search pattern for sites-enabled
2016-02-29 15:00:50 -06:00
techraf c4816d0c08 Restore nginx's default search pattern for sites-enabled 2016-02-29 23:04:05 +09:00
Colin Hoglund aebf9c6c63 changing Debian pidfile 2016-02-17 13:52:17 -05:00
Marcin Wolny 790badecb3 Define nginx's global options and package name. 2016-02-11 19:03:30 +01:00
Jeff Geerling 357ab200f7 PR #36 follow-up: rename var to nginx_extra_http_options. 2015-12-28 10:01:42 -06:00
Jeff Geerling 9848800982 PR #36 follow-up: clean up and reformat docs. 2015-12-28 09:57:11 -06:00
Jeff Geerling a8620b9b32 Merge pull request #36 from cmacrae/master
Collective config validation & "extra options"
2015-12-28 09:53:44 -06:00
Jeff Geerling 3ea03870a6 Merge pull request #37 from opdavies/vhost-make-root-optional
Only add root if it's defined
2015-12-28 09:52:12 -06:00
Oliver Davies 3de8c915a0 Add error_log 2015-12-28 13:09:41 +00:00
Oliver Davies 19ddc34cbb Only add root if it's defined 2015-12-25 19:42:17 +00:00
cmacrae cd5e355707 Cleaner indentation for 'nginx_extra_options' 2015-12-22 16:21:16 +00:00
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
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
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
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 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 7e6a17cc4d Issue #9: Add nginx repo template. 2015-01-23 11:08:05 -06:00
Jeff Geerling 45b749af83 Issue #5: Add 'nginx_proxy_cache_path' configuration option. 2014-12-08 22:07:57 -06:00