Commit Graph

165 Commits

Author SHA1 Message Date
Amrit Singh
dec3152c2d Changed 'include' to 'import_tasks' and 'include_tasks' as 'include' will be deprecated in v2.8 2017-11-08 16:12:54 +05:30
Jeff Geerling
7aa2ea4779 Merge branch '118-flush-access-log' 2017-08-08 13:06:11 -05:00
Jeff Geerling
af45188391 Issue #118: Remove Ubuntu 12.04 support, test in Debian. 2017-08-08 13:00:05 -05:00
Jeff Geerling
b7c51b2bfb Fixes #118: Add default 2m flush to access_log. 2017-08-08 12:06:19 -05:00
Jeff Geerling
69157acbb0 Document variable nginx_extra_conf_options. 2017-07-28 11:48:07 -05:00
Jeff Geerling
6962e03511 Merge pull request #85 from icamys/change-extra-conf-location
Changed extra conf location in template
2017-07-16 23:40:44 -05:00
Prisacari Dmitrii
262eb715aa Merge branch 'master' into change-extra-conf-location 2017-07-13 10:49:42 +03:00
Jeff Geerling
da2ec60144 Merge pull request #110 from minitux/master
Fix syntax in README
2017-06-30 07:13:39 -05:00
minitux
97b91034c0 Fix syntax in README
Fix return un vhost redirect
2017-06-30 10:10:49 +02:00
Jeff Geerling
b7606808f6 PR #109 follow-up: Clean up description in README. 2017-06-13 16:23:57 -05:00
Jeff Geerling
7bdcc4811b Merge pull request #109 from bmcclure/master
Support Archlinux
2017-06-13 16:23:04 -05:00
Ben McClure
1597d0104b Add Archlinux support to meta info 2017-06-12 20:23:57 -05:00
Ben McClure
3a8af3906e Update readme 2017-06-12 20:06:31 -05:00
Ben McClure
08fbab26bd Added nginx support 2017-06-12 19:41:39 -05:00
Jeff Geerling
62e952d116 Merge pull request #107 from lioman/master
fix vhost.j2
2017-06-07 16:34:16 -05: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
Jeff Geerling
41f9d4fea3 Merge pull request #105 from oxyc/vhost-filename
Followup #91: Add `filename` option `nginx_vhosts`
2017-06-03 17:12:02 -05:00
Oskar Schöldström
3a06154e76 fix ubuntu tests using ansible-role-elasticsearch as example 2017-06-03 09:06:23 -05:00
Oskar Schöldström
7b47c3de12 vhost_filename -> filename 2017-06-03 09:01:09 -05:00
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
Prisacari Dmitrii
b8e5bb23c3 Changed extra conf location in template 2017-02-07 21:29:16 +02: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