opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1059 commits 2 branches 0 tags 1.4 MiB
Commit graph

165 commits

Author SHA1 Message Date
Marin Vintila
66ee87b89e Fix diff lines leftover from merge 2015-05-08 12:22:31 +03:00
Marin Vintila
77aa952b20 Merge from master 2015-05-08 12:11:46 +03:00
Marin Vintila
5624e4ca55 Merge from master 2015-05-08 12:04:22 +03:00
Matthew Haughton
d1ff642c44 Merge pull request #618 from mmarod/passenger_header 
Add passenger_set_header and passenger_env_var parameters for Passenger 5.0+
 2015-04-29 23:30:37 -04:00
Michael Marod
7e524d0785 change variable names as requested to match nginx params exactly... Also passenger_env_var is not set with passenger_set_env_var and this commit undoes that 2015-04-29 17:37:58 -04:00
Michael Marod
d0464923d1 Add passenger_env_var parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:33:42 -04:00
Michael Marod
0aed6c1978 Add passenger_header parameter which deprecates passenger_cgi_param to support Passenger 5.0+ 2015-04-29 12:24:38 -04:00
Matthew Haughton
6062ecec5c package/debian: support puppetlabs-apt 2.0.0 
puppetlabs-apt 2.0.0 drops support in apt::source for key_source and required_packages.

* key_source will default to keyserver.ubuntu.com which carries both keys, so it
  doesn't need to be explicitly defined
* required_packages can be emulated with the package resource
 2015-04-21 22:08:53 -04:00
Matthew Haughton
031fb9d896 Merge pull request #607 from 3flex/beaker 
Switch acceptance tests to Beaker
 2015-04-21 13:43:57 -04:00
Matthew Haughton
cc2f6387f0 Merge pull request #608 from 3flex/572-remove-auth_basic_user_file-resource 
location: remove the auth_basic_user_file resource
 2015-04-21 13:42:20 -04:00
Matthew Haughton
d1b9221a51 location: remove the auth_basic_user_file resource 
All it's doing right now is copying a file, but the copy of the file is
never referenced by the template.
 2015-04-14 23:45:51 -04:00
Matthew Haughton
78218ac8c7 beaker: add some more basic tests 2015-04-14 00:01:51 -04:00
Matthew Haughton
69ccfae779 no need for suse tests, there's no nodeset for it 2015-04-13 23:28:51 -04:00
Matthew Haughton
fd069a3aec beaker: add more nodesets 
CentOS 5, 6 & 7
Debian 6 & 7
Ubuntu Server 12.04
 2015-04-13 23:28:51 -04:00
Matthew Haughton
9dd92e7081 Convert acceptance specs to RSpec 3.2.2 syntax 
This conversion is done by Transpec 3.1.0 with the following command:
    transpec spec/acceptance/

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

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

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

* 1 conversion
    from: it { should_not ... }
      to: it { is_expected.not_to ... }

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2015-04-13 23:28:51 -04:00
Matthew Haughton
e5085f39e6 switch to beaker-rspec from rspec-system-puppet 2015-04-13 23:28:51 -04:00
Matthew Haughton
3027d9f35a location: move auth_basic directives to header 
Allows setting these directives on any location:
* auth_basic
* auth_basic_user_file
 2015-04-13 22:58:57 -04:00
Matthew Haughton
0cd258b310 Merge pull request #590 from 3flex/540-refine-worker_processes-validation 
config: refined worker_processes validation
 2015-04-10 12:00:44 -04:00
Matthew Haughton
810d36d3a8 config: refined worker_processes validation 
Closes #540
 2015-04-01 23:34:31 -04:00
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