Commit graph

145 commits

Author SHA1 Message Date
Matthew Haughton
faa974b745 spec/Gemfile: switch to rspec-puppet 2
The big win is that it's now possible to test the future parser with the
latest Puppet release. In the past it wasn't possible to test future parser
with anything higher than 3.5.x.
2015-03-30 23:39:50 -04:00
Erik R. Rygg
b8c2f44aa1 One more update to the spec test 2015-03-24 12:28:46 -06:00
Erik R. Rygg
493e5c3eec Add key for passenger and update spec tests 2015-03-24 11:51:52 -06:00
James R. Carr
1c5b453d76 spec matched against the wrong thing 2015-03-23 14:50:28 -05:00
James R. Carr
6891c37864 added tests 2015-03-23 14:40:13 -05:00
Sebastien Badia
5f1da4fce9 apt:🔑 puppetlabs-apt check now the full GPG fingerprints.
Since commit 531ef9 of puppetlabs-apt, the gpg key (apt::key) is
checked, and should use the long format.

This value is validated with a regex enforcing it to only contain valid
hexadecimal characters, be precisely 8 or 16 hexadecimal characters long
and optionally prefixed with 0x for key IDs, or 40 hexadecimal
characters long for key fingerprints.

f588f2651a
2015-03-19 15:34:42 +01:00
James Fryman
3322fb5a0e Merge pull request #574 from railsdog/prachetasp/nginx_cfg_prepend
Prepend to the nginx config block
2015-03-09 10:15:06 -05:00
Prachetas Prabhu
409f8ef4e3 Adds rspec tests for nginx_cfg_prepend 2015-03-04 23:55:30 +00:00
James Fryman
99998deb38 Revert "changed $::operatingsystemmajrelease to $::lsbmajdistrelease for Debian" 2015-02-06 15:59:14 -06: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
James Fryman
5f932dcb2b Merge pull request #551 from sbaryakov/master
sort add_header values for vhost
2015-02-05 14:06:36 -06:00
Jan Schumann
3ef76571c9 fixed tests 2015-02-05 12:16:17 +01: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
1ae85c522c Merge pull request #534 from 3flex/configurable_service_name
Configurable service name
2014-12-19 23:34:22 -05:00
Matthew Haughton
be30b57531 Merge pull request #531 from ckaenzig/optional-proxy-http-version
Allow disabling proxy_http_version directive
2014-12-18 10:08:52 -05:00
Christian Kaenzig
6a4e4b4e73 Disable proxy_http_version directive by default
The default value in nginx::config was the same as nginx's default,
so it's not necessary to be set in any version of nginx unless one
needs a specific value. This also allows us to use undef when we don't
want the directive to be set instead of false.

Also added a test for the default case.
2014-12-18 11:22:44 +01:00
Barhob
c1cb58f6f1 add configurable service name 2014-12-17 23:45:44 -05:00
Matthew Haughton
bbbb1ca130 Merge pull request #519 from 3flex/refactor-packages
Clean up package classes, allow installing mainline upstream packages
2014-12-14 21:25:56 -05:00
James Fryman
10d5f196d7 Merge pull request #526 from asgoodasnu/rewrites_in_fastcgi
moves rewrite_rules to location_header
2014-12-11 09:52:24 -08:00
paschdan
708be8263d moves rewrite_rules to location_header
so it can be used by all location-types
2014-12-11 17:43:33 +01:00
Sergio Ballesteros
1e3bf2fe88 Added test: arrays as values in http_cfg_append 2014-12-11 16:41:47 +01:00
Matthew Haughton
89b7480bfe package: mainline package support on redhat/debian
Closes #450
Closes #456
Closes #518
2014-12-10 21:23:04 -05:00
Matthew Haughton
1da7ffa6c1 package/redhat: don't ensure the yum repo file
The file wouldn't necessarily be at that location. According to Puppet it's installed in the first matching location:
* Custom directory specified by the ‘/etc/yum.conf’ reposdir property
* ‘/etc/yum/repos.d’
* ‘/etc/yum.repos.d’
* If none of these locations match, section will be created in ‘/etc/yum.conf’
2014-12-10 21:23:04 -05:00
Matthew Haughton
d16222d940 package: Differentiate between upstream's RedHat and CentOS packages
Even if they're currently identical they may diverge in future.
2014-12-10 21:23:04 -05:00
Matthew Haughton
029f73f4a2 package: removed a warning for Fedora 18 and below
Those versions no longer supported by the Fedora Project.
2014-12-10 21:23:04 -05:00
Matthew Haughton
4eea8c7397 package: install "nginx" package when OS isn't recognized
This will provide broader OS compatibility without having to manually add
support for specific OSes.
2014-12-10 21:23:01 -05:00
Matthew Haughton
1a10a23c1b package: don't install upstream package on Amazon Linux
Upstream doesn't provide a build of Nginx for Amazon Linux.
2014-12-09 21:49:40 -05: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
9647d1278f add negative test for log_format 2014-12-03 23:26:19 -05:00
Joshua B. Bussdieker
2e221a7e0f Support specifying log formats 2014-12-03 23:26:10 -05: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
Matthew Haughton
f3f2c60131 Delete hiera.yaml 2014-11-10 14:13:54 -05:00
Matthew Haughton
2bea3e7600 spec_helper: remove module-data-backend dependency 2014-11-10 14:13:27 -05:00
Derrick Dymock
06ee2ca3ce Remove the SSLv3 by default in the vhost resource. 2014-10-15 10:52:31 -07:00
Daniel Dreier
22c6a7cb57 Allow internal-only location resources
Location resources with internal == true are valid, but the module does
not allow them unless one or more of www_root, proxy, location_alias,
stub_status, fastcgi, or location_custom_cfg are set

This patch allows locations with none of those but internal == true to
be created.

This is a re-implementation of jfryman/nginx PR-388.
2014-09-25 09:40:32 -07:00
James Fryman
b8e2ccc540 Merge pull request #453 from jfryman/add-puppet-module-tool
Introducing Puppet Module Data
2014-09-24 15:07:28 -07:00
cdenneen
324179e7a4 Add include files to locations 2014-09-23 18:52:14 -04:00
Matthew Haughton
801208533f add hiera.yaml to fixtures 2014-09-21 11:40:45 -04:00
Matthew Haughton
00ec3f4e35 spec fixes 2014-09-21 01:27:35 -04: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
ad391f67bf added nginx_vhosts_defaults parameter hash 2014-09-15 23:11:26 -04: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