Commit graph

1247 commits

Author SHA1 Message Date
Prachetas Prabhu
519f17a55e Adds a parameter to prepend configuration elements to the main nginx.conf file 2014-12-26 16:54:26 +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
dbd6a9ecc0 init: pass service_name to nginx::service class 2014-12-19 23:28:07 -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
9e8290e739 Merge pull request #533 from 3flex/pin-rspec-puppet-to-1.x
Gemfile: pin rspec-puppet to 1.x
2014-12-17 13:33:42 -05:00
Matthew Haughton
059f74d368 Gemfile: pin rspec-puppet to 1.x
rspec-puppet 2.0.0 will cause test failures when it's released until this module's test code is updated
2014-12-17 13:23:37 -05:00
Mathieu Bornoz
9c4e1e2ffb Sort sub hash keys to have a stable ordering 2014-12-17 09:20:24 +01:00
Christian Kaenzig
7432862fe8 Allow disabling proxy_http_version directive
The EPEL 6 repository still has version 1.0.15 which does not support
this directive proxy_http_version. Yes, this version is old, but a lot
of people prefer not to use a bleeding edge version from nginx.org.
2014-12-16 17:27:34 +01:00
Scott Buchanan
e3f19ee042 Fixing default location to use specified index files. 2014-12-15 10:14:28 -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
332be4c1b1 Merge pull request #528 from skoblenick/patch-1
Update hiera.md
2014-12-13 14:06:41 -08:00
Ryan Skoblenick
5222c5c13c Update hiera.md
Spelling correction
2014-12-13 17:01:44 -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
James Fryman
746a5bc077 Merge pull request #527 from ese/master
Allow arrays values in http_cfg_append
2014-12-11 07:48:48 -08:00
Sergio Ballesteros
1e3bf2fe88 Added test: arrays as values in http_cfg_append 2014-12-11 16:41:47 +01:00
Sergio Ballesteros
4a3f7f1e31 Allow arrays values in 2014-12-11 16:17:30 +01:00
James Fryman
361b49820e Merge pull request #520 from 3flex/add-os-to-metadata
metadata: add operatingsystem_support
2014-12-10 18:28:43 -08:00
Matthew Haughton
fef520fc21 debian/package: warn on incorrect package name w/ Passenger
According to Passenger docs:

"You should install nginx-extras even if you have already installed an Nginx package from the
official Debian/Ubuntu repository. This is because the Nginx binary that our packages supply
is compiled with the Passenger module."
2014-12-10 21:23:04 -05:00
Matthew Haughton
c486649005 package/debian: install ca-certificates for passenger
Required per the Passenger install guide
2014-12-10 21:23:04 -05: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
d57729d733 package/debian: use more puppetlabs-apt features
* puppetlabs-apt does an APT update after every apt::source is added, so no
  need to do it again in this module.
* Use the 'required_packages' feature of apt::source instead of
  ensure_resources
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
2e4bc1bb1d package: fail on Solaris if $package_name undef
The comments say this must be set on that OS so the failure makes that
explicit.
2014-12-10 21:23:04 -05:00
Matthew Haughton
78d3b101d0 package: only set manage_repo => true when appropriate
i.e. upstream provides a package for it
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
5b09b23b12 package: refactor 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
8a90486f66 metadata: add operatingsystem_support
Improves search on the Forge, also gives us a higher Quality Score on the module.
2014-12-10 21:18:45 -05:00
James Fryman
677e70d9d2 Merge pull request #525 from radford/notify-on-purge
Notify the service after purging configuration files
2014-12-10 11:19:10 -08:00
Jim Radford
4883b3a1c2 Notify the service after purging configuration files 2014-12-10 11:16:03 -08:00
James Fryman
be4cc50964 Merge pull request #524 from 3flex/container-builds-on-travis
travis: enable container-based builds
2014-12-10 10:38:12 -08:00
Matthew Haughton
d6e04480b5 travis: enable container-based builds
Jobs running on container-based infrastructure:
1. start up faster
2. allow the use of caches for public repositories
3. disallow the use of sudo, setuid and setgid executables

http://docs.travis-ci.com/user/workers/container-based-infrastructure/
2014-12-10 12:47:46 -05:00
James Fryman
5c031c3e81 Merge pull request #521 from 3flex/remove-lint-ignores
don't ignore lint errors
2014-12-10 09:05:38 -08:00
James Fryman
ba4b67a02d Merge pull request #522 from 3flex/puppet-lint
Update puppet-lint config
2014-12-10 09:05:25 -08:00
Matthew Haughton
2c6c6b4f21 Rakefile: use Puppet Approved puppet-lint config 2014-12-10 09:02:59 -05:00
Matthew Haughton
f0753b6551 move puppet-lint config back to Rakefile
You can't set 'ignore_paths' in .puppet-lint.rc and having config in two places
is confusing.
2014-12-10 09:01:05 -05:00
Matthew Haughton
8df2e752c6 don't ignore lint errors 2014-12-10 08:56:40 -05:00
Matthew Haughton
3cec62042e package: package resource is titled "nginx" 2014-12-09 22:06:51 -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
Matthew Haughton
50c1e57c4c metadata: bound dependencies
New requirement for the Puppet Forge.

These ranges ensure dependencies will stay on backwards compatible versions for the foreseeable future.
2014-12-08 21:51:35 -05:00
Matthew Haughton
f02885289e metadata: use SPDX identifier for license info
New requirement for the Puppet Forge
2014-12-08 21:45:46 -05:00
Matthew Haughton
4cb0fb0d6f Merge pull request #517 from radford/fix-location-ensure
location: fix ensure
2014-12-08 15:05:07 -05:00
Matthew Haughton
faa6131bab Merge pull request #516 from 3flex/pass-parameters-to-service-class
init: pass parameters when declaring nginx::service
2014-12-08 14:31:54 -05:00
Jim Radford
c9c8361990 location: fix ensure 2014-12-08 11:27:58 -08:00
Matthew Haughton
08c4a64b90 init: pass parameters when declaring nginx::service 2014-12-08 14:16:40 -05:00