Commit graph

37 commits

Author SHA1 Message Date
James R. Carr
6891c37864 added tests 2015-03-23 14:40:13 -05:00
James Fryman
2c52e08925 Merge pull request #546 from b4ldr/master
allow listen_ip and ipv6_listen_ip to contain a String or Array
2015-02-05 14:09:29 -06:00
James Fryman
a212b4855b Merge pull request #549 from asgoodasnu/redirect_with_params
do www-rewrite with params
2015-02-05 14:08:15 -06:00
Stefan Baryakov
5213d950f7 fix misspelling 2015-01-26 09:36:31 +01:00
Stefan Baryakov
d909327380 sort add_header values for vhost 2015-01-23 14:33:49 +01:00
paschdan
8acfac5b6d do www-rewrite with params 2015-01-19 17:14:46 +01:00
b4ldr
fdca7199f6 allow listen_ip and ipv6_listen_ip to contain a String or Array 2015-01-13 20:44:58 +00:00
Matthew Haughton
1898182c6d spec: cleanup
* Removed some tests that no longer apply and/or are redundant
* Only set OS facts when testing OS-specific behaviors. This simplifies the
  facts that must be set in the specs and saves running the same tests
  several times when the results wouldn't differ by OS anyway.
2014-12-09 19:47:05 -05:00
Sebastian Brückner
8f793211a5 Fix proxy_set_header for default location 2014-12-04 11:27:48 +01:00
Matthew Haughton
87015f9331 add/update tests for #462 2014-11-26 21:35:24 -05:00
Pierre Radermecker
c25c957a65 Use combined as a default for $format_log 2014-11-25 23:41:45 -05:00
Derrick Dymock
06ee2ca3ce Remove the SSLv3 by default in the vhost resource. 2014-10-15 10:52:31 -07:00
James Fryman
4c5f1e3b2a pass one of spec cleanup 2014-09-20 18:25:24 -05:00
James Fryman
d11d574e8c Merge pull request #443 from rabbitt/whitespace-cleanup
cleanup whitespace and key/value alignment in config files
2014-09-20 10:06:59 -05:00
Frederik Wagner
331338abdb added parameter ssl_session_timeout to vhost 2014-09-15 23:11:26 -04:00
Carl P. Corliss
fb880576a6 cleanup resultant whitespace and key/value alignment in config files
- fix tests related to whitespace changes
2014-09-13 04:13:18 -04:00
Matthew Haughton
32bc360d45 Convert specs to RSpec 2.99.1 syntax with Transpec
This conversion is done by Transpec 2.3.4 with the following command:
    transpec -c "rake spec" spec/classes/ spec/defines/ spec/spec_helper.rb

* 210 conversions
    from: it { should ... }
      to: it { is_expected.to ... }

* 19 conversions
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

* 15 conversions
    from: == expected
      to: eq(expected)

* 15 conversions
    from: obj.should
      to: expect(obj).to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2014-07-17 22:28:38 -04:00
Carl P. Corliss
7be12d0870 new raw_prepend / raw_append feature for vhosts & locations
- added raw_prepend / raw_append to vhosts & locations, which
    adds raw lines to the vhost/location /without/ semicolons
  - added location_raw_prepend / location_raw_append to vhost
    for passing through to default location
  - added spec tests for new parameters
  - cleaned up location specs to match new header/body/footer setup
    reducing duplicate checks by testing header/footer separately.
  - cleaned up whitespace (2 space) in touched files
  - used `<%-` in erb templates to allow the use of leading
    whitespace, making the logic flow more readable
  - Also adds spec tests for recent vhost updates:
    - client_body_timeout
    - client_header_timeout
    - gzip_types
    - testing that the first server_name is used when www_to_non_www is true
2014-06-26 00:00:37 -04:00
Carl P. Corliss
9519298aba use return instead of rewrite for simple redirects (e.g., www -> naked domain) 2014-06-23 11:46:43 -04:00
Lee Packham
8eb26b792b Fix all rspec tests so they run
For some reason these have been broken forever. Travis was failing,
correctly. I have updated the tests to be correct to how the code
actually works.

I would also suggest that if this is merged, we stop merging PRs that
have failed test runs. Tests matter in a module like this.
2014-06-10 22:10:00 +01:00
Daniel Black
04e34dce39 Key value parameter maps to take array as value
Allow arrays to be specified as values in location_cfg_{prepend,append} and
vhost_cfg_{ssl_,}{prepend,append} parameters.
2014-03-07 23:53:32 +11:00
Tristan Helmich
4fb4129aa4 Update tests accroding to changed templates
Specs no longer require `ipv6only=on` in listen option when using user
supplied value since it is no longer hardcoded in the template.
2014-02-03 13:13:06 +01:00
Matthew Haughton
325ae7e6de test vhost name is sanitized 2014-01-18 13:31:05 -05:00
Matthew Haughton
d683fae9ff validations for nginx::resource::vhost 2014-01-07 23:16:52 -05:00
Matthew Haughton
d973000dfd Update tests broken by merging #203 2013-12-30 12:44:19 -05:00
Matthew Haughton
26d904c946 use new 'without_content' matcher 2013-12-08 16:54:20 -05:00
Matthew Haughton
36319cd5e0 set default facts for all manifests 2013-12-07 13:39:24 -05:00
Matthew Haughton
db68cf39ae include_class is deprecated 2013-12-07 13:39:24 -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
2459844373 add puppetlabs-concat dependency 2013-11-30 20:33:10 -05: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
99e9d82f12 accept boolean for ipv6_enable as documented 2013-11-21 23:18:04 -05:00
Matthew Haughton
e1c4c7470b sort vhost_cfg_append in vhost_ssl_footer 2013-11-21 23:08:36 -05:00
Matthew Haughton
4af2087867 fix spacing issues in various templates
Before this change, vhost_ssl_header would merge
"ssl" with any listen options, e.g.:
    listen       *:443 ssldefault;
when listen_options => 'default'.
2013-11-21 23:04:39 -05:00
Matthew Haughton
3024f2927d fix IPv6 address fact detection 2013-11-21 22:32:23 -05:00
Matthew Haughton
4204dc908b Revert "Update vhost.pp"
This reverts commit 5ee2f65.

Fixes #186
2013-11-21 22:23:44 -05:00
Matthew Haughton
962fa6672a rspec tests for v0.0.6
Resolves #65
2013-11-21 22:14:00 -05:00