Commit Graph

144 Commits

Author SHA1 Message Date
Oskar Schöldström
d227a1803c server_name_redirect is only added if defined 2017-06-03 08:56:03 -05:00
Oskar Schöldström
4c5df1faea Change README vhost example for the common SSL option with a http redirect 2017-06-03 08:49:55 -05:00
Oskar Schöldström
98b736f479 Add optional vhost_filename option to nginx_vhosts 2017-06-03 08:48:00 -05:00
Oskar Schöldström
235a0053a7 Document missing nginx_vhost parameters 2017-06-03 08:46:33 -05:00
Jeff Geerling
57889e8ad6 Merge pull request #99 from oxyc/issue-95
Issue #95: Add support for setting template on a per vhost basis
2017-04-27 00:50:15 -04:00
Oskar Schöldström
5e41c6b1f9 Issue #95: Add support for setting template on a per vhost basis 2017-04-26 19:37:36 -05:00
Jeff Geerling
072001bed3 Merge pull request #92 from oxyc/template-inheritance
Template inheritance
2017-04-23 16:16:23 -05:00
Oskar Schöldström
125cc7a884 Add template inheritance docs [ci skip] 2017-04-22 17:10:08 -05: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
Jeff Geerling
c9046d9f3a Merge pull request #91 from oxyc/separate-configs
Write vhost configurations to separate config files
2017-04-22 16:21:35 -05:00
Oskar Schöldström
0d931c53c3 Remove legacy vhosts.conf file 2017-04-22 10:03:18 -05:00
Oskar Schöldström
9cf49ac6c2 when statements should not include jinja2 templating delimiters 2017-04-21 07:46:45 -05:00
Oskar Schöldström
b7b4a1cb4b Add integration test 2017-04-21 07:41:41 -05:00
Oskar Schöldström
f319f9d195 Update docs 2017-04-21 07:41:41 -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
Jeff Geerling
10548f1909 Update test script README. [ci skip] 2017-04-02 10:41:46 -05:00
Jeff Geerling
8616f4cf2f Switch to more efficient and compact test setup. 2017-04-01 23:34:07 -05:00
Jeff Geerling
a3a6f279b9 Add a LICENSE file for MIT license. [ci skip] 2017-03-31 11:24:44 -05:00
Jeff Geerling
d63de2113b Merge pull request #83 from edwinsteele/add-openbsd-support
Add OpenBSD support
2017-02-01 16:23:34 -06:00
Edwin Steele
32d536242d Add OpenBSD support 2017-02-02 05:21:57 +11:00
Jeff Geerling
3d8591fa17 PR #77 follow-up: Document nginx_log_format variable. 2017-01-30 22:29:33 -06:00
Jeff Geerling
769a84ece8 Merge pull request #77 from bersace/log_format
Parametrize log_format
2017-01-30 22:27:10 -06:00
Jeff Geerling
490b4ad21f PR #82 follow-up: docs fix. 2017-01-30 22:26:30 -06:00
Jeff Geerling
59cdc01362 Merge pull request #82 from Russell-IO/master
Adding server_tokens variable
2017-01-30 22:25:07 -06:00
Russell Clare
dc2723a753
Updating readme 2017-01-31 06:49:15 +08:00
Russell Clare
2fffc382a4
Adding in ability to disable server_tokens, defaulting to on (previous behaviour) 2017-01-31 06:40:11 +08:00
Jeff Geerling
fa5b412daf PR #81 follow-up: Docs. 2017-01-25 14:40:45 -06:00
Jeff Geerling
3fc0071953 Merge pull request #81 from morgajel/master
adding yum repo flag for Redhat
2017-01-25 14:38:51 -06:00
Jesse Morgan
6f2b69b9b5 adding yum repo flag for Redhat
In environments where RHEL uses Satellite or production servers can't
reach out to the internet, and the Yum repo is not wanted. This commit
adds a flag to disable the functionality. It also removes the
enablerepo: nginx line from the package since a) it's redundant and b)
working around it overly complicates  the situation.
2017-01-25 11:49:27 -05:00
Jeff Geerling
c2102714de Update the author's URL. Now with more HTTPS! 2017-01-21 20:01:31 -06:00
Étienne BERSAC (bersace)
c4605ded8f Parametrize log_format 2016-11-23 17:51:02 +01:00
Jeff Geerling
19b1c5c9ba Merge pull request #73 from olo-dw/vhost_restart
Restart instead of reload after remove default.
2016-11-23 09:35:41 -06:00
Jeff Geerling
8c8da64495 Merge pull request #74 from shieldwed/nginxconf_indent
format nginx_extra_http_options with indent
2016-11-23 09:35:09 -06:00
Jeff Geerling
84b308c3d4 Fix test failures on Ubuntu 12.04. 2016-11-23 09:27:25 -06: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
Olivier LOCARD
f01357976c restart instead of reload after remove default. 2016-10-06 13:59:29 +02:00
Jeff Geerling
eb2b1a5753 Remove sudo requirement from Travis build. 2016-09-25 15:50:13 -05:00
Jeff Geerling
23f92af920 Tweak syntax and docs for vhosts config. 2016-09-24 10:35:18 -05:00
Jeff Geerling
ee5cd31375 Merge pull request #60 from danlamanna/fix-nginx-vhost-path-customization
Create the Nginx vhost path directory
2016-09-24 10:33:51 -05:00
Jeff Geerling
1b442ede40 Merge pull request #71 from strategist333/indent
Fix unnatural indentation in extra_parameters block
2016-09-24 10:33:05 -05: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
3f11a46b50 Better default for nginx_worker_processes. 2016-09-14 14:53:46 -05:00
Jeff Geerling
23866e4b31 Fix stalling tests on init systems. 2016-09-13 22:35:21 -05:00
Jeff Geerling
5fc63d4a6f Modern Docker multi-OS test layout. 2016-09-13 22:31:30 -05: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
Jeff Geerling
e5b8b18e5f Updated byline. 2016-09-12 16:48:27 -05:00
Jeff Geerling
a6ed2a9cc6 Merge pull request #68 from seeafish/master
Fixing vhosts.j2 indentation
2016-09-12 16:47:57 -05:00
Sia Gholami
1e14a1e0c7 Fixing vhosts.j2 indentation 2016-08-18 14:34:21 +01:00