Commit graph

212 commits

Author SHA1 Message Date
James Fryman
7086aea8c0 Merge pull request #228 from PierreR/patch-1
Fix multi-line comment indentation
2014-01-08 08:40:25 -08:00
Pi3r
d26d9a41a8 Fix multi-line comment indentation
`puppetresources` is complaining about the wrong indentation scheme.
2014-01-08 15:46:56 +01:00
Matthew Haughton
2a82028a7b warn on inclusion of nginx:📦:suse 2014-01-07 23:16:54 -05:00
Matthew Haughton
5309136fc8 warn on inclusion of nginx:📦:redhat 2014-01-07 23:16:54 -05:00
Matthew Haughton
d7800f44ee warn on inclusion of nginx:📦:debian 2014-01-07 23:16:54 -05:00
Matthew Haughton
e2eba1dbe9 warn on inclusion of nginx::service 2014-01-07 23:16:54 -05:00
Matthew Haughton
2f36def38a warn on inclusion of nginx::params 2014-01-07 23:16:54 -05:00
Matthew Haughton
2fb7072e6e warn on inclusion of nginx::package 2014-01-07 23:16:54 -05:00
Matthew Haughton
ac8c74d78b warn on inclusion of nginx::config 2014-01-07 23:16:54 -05:00
Matthew Haughton
545056cb1a validations for nginx::resource::upstream 2014-01-07 23:16:54 -05:00
Matthew Haughton
10a1691b9e validations for nginx::resource::mailhost 2014-01-07 23:16:54 -05:00
Matthew Haughton
d683fae9ff validations for nginx::resource::vhost 2014-01-07 23:16:52 -05:00
Matthew Haughton
8e71d33121 validations for nginx::resource::location 2014-01-07 23:04:49 -05:00
Matthew Haughton
5a9767dcd8 validations for nginx::init 2014-01-07 22:17:03 -05:00
Matthew Haughton
5756568f21 variables should not be substituted in message
Using $priority meant it would be substituted with the value of the
parameter when it should be shown as static text.
2014-01-07 22:12:31 -05:00
Matthew Haughton
d22402c404 Add validation for $priority
Valid range changed to 401-599:

vhost SSL header has priority 700. If $priority is set to 400 (which
resolves to 400+300=700 for SSL locations), then it would conflict with
the priority of the header. It must be 401 or higher to avoid this.

Top end of range is limited to 599 to reflect documentation however it
could be increased to 698 and still provide expected behavior.
2014-01-03 13:03:55 -05:00
Matthew Haughton
0b93c0cebe Fix "invalid byte sequence in UTF-8" errors 2013-12-30 13:03:55 -05:00
Harry Danes
1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam
Conflicts:
	manifests/resource/vhost.pp
2013-12-30 18:33:53 +01:00
Harry Danes
d0c3168592 Implementation of the resolver parameter. 2013-12-29 15:48:32 +01:00
Harry Danes
1aff2eabcb Implementation for the ssl_stapling_* parameters. 2013-12-29 15:39:21 +01:00
Harry Danes
3db6a726cb Add support for Diffie-Hellman parameters in VHOST resource. 2013-12-27 09:10:11 +01:00
Lebedev Vadim
611c80f75e Fixed the ability to disable the index_files 2013-12-25 04:13:22 +04:00
Lebedev Vadim
658b25fe30 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2013-12-25 02:40:22 +04:00
Lebedev Vadim
fc6d66fa0b Fixed location containing '\', such as '~ \.php$' 2013-12-25 02:36:01 +04:00
James Fryman
7d1540b3bb Merge pull request #208 from hdanes/add_header
Add the possibility to add a header to the HTTP response
2013-12-24 10:50:29 -08:00
Harry Danes
e0b8cb5f3f Implemented input validation - type hash - for the (optional) add_header parameter. 2013-12-24 19:47:15 +01:00
Lebedev Vadim
d9d77837e8 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': } 2013-12-24 21:22:32 +04:00
Harry Danes
fcf11a8b18 Add the possibility to add a header to the HTTP response when response code is equal to 200, 204, 301, 302 or 304. 2013-12-24 13:07:58 +01:00
Daniel Black
520eb23ffd index_files to be defined at server level if specified in resource::vhost
This partially avoids pitfall #2 (http://wiki.nginx.org/Pitfalls)
2013-12-19 09:07:56 +10:00
Jason Clark
c7566d9134 Fix for order statements. Concat requires strings 2013-12-17 22:12:31 -06:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
2013-12-16 17:36:24 +01:00
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex'
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
2013-12-12 17:27:29 +01:00
James Fryman
7c1674202a Merge pull request #170 from TelekomCloud/feature/set_proxy_method_and_body
Add support for proxy method and body
2013-12-05 07:48:18 -08:00
Matthew Haughton
486d03b685 required to remove unused file fragments from /tmp 2013-12-02 13:54:02 -05:00
Matthew Haughton
684fafc559 Remove the now unused file fragments from /tmp 2013-12-02 13:53:10 -05:00
Matthew Haughton
a9c445b3f9 Remove unused code in vhost 2013-12-02 13:50:22 -05:00
Matthew Haughton
0e1d4adbd5 Remove unused code in mailhost 2013-12-02 13:49:47 -05:00
Matthew Haughton
eb31df40d6 Remove vhost and mailhost vhost_autogen.conf
Don't generate it anymore, and remove any existing file from
people's systems
2013-11-30 21:24:55 -05:00
Matthew Haughton
d849c31c35 switch location resource to concat pattern 2013-11-30 21:24:55 -05:00
Matthew Haughton
753283286f switch vhost resource to concat pattern
Also uses sites-available/enabled pattern for config files
2013-11-30 21:24:50 -05:00
Matthew Haughton
2023ca1d6d switch mailhost resource to concat pattern 2013-11-30 21:21:40 -05:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2013-11-27 15:12:56 +01:00
James Fryman
8691db1c83 Merge pull request #188 from 3flex/rspec-tests
Rspec tests (and fixes)
2013-11-22 09:27:53 -08:00
James Fryman
abc3093188 Merge pull request #183 from drfeelngood/nx_daemon_user_for_oracle_linux
Update params to account for oracle linux.
2013-11-22 09:27:22 -08:00
Matthew Haughton
8292be0748 set required variables before template declared
correctly sets www_root in the vhost_header template
2013-11-21 23:23:45 -05:00
Matthew Haughton
c8d9ad5680 only ensure yum repo file when yum repo created 2013-11-21 22:40:05 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp"
This reverts commit 5ee2f65.

Fixes #186
2013-11-21 22:23:44 -05:00
drfeelngood
9c787d92bf Updated params to account for oracle linux.
We should analyze the $::osfamily fact to define $nx_daemon_user.  Support for
$::operatingsystem remains but is greeted with a deprecation warning that
suggests upgrading to factor >= 1.7.2.

Corrected spec failures in redhat.pp when evaluating an undef
$::lsbmajdistrelease.  Now the variable must be defined before comparison.
2013-11-18 18:38:07 -06:00
Vadim Lebedev
5ee2f654fb Update vhost.pp
bug fix. 
User priority for location 400-499, 501-599.
Header should have a priority lower than the others.
2013-11-18 08:45:27 -08:00