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

551 commits

Author SHA1 Message Date
Matthew Haughton
678a361106 vhost: add ssl_crl parameter 2015-05-09 00:51:49 -04:00
Matthew Haughton
be4decdb78 vhost: don't copy any SSL files 2015-05-09 00:40:57 -04:00
Marin Vintila
a8cb664ef5 Fix uwsgi related tests 2015-05-08 18:00:35 +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
6f84e08bda fix new lint issues 2015-05-07 22:36:39 -04:00
Martin Loy
7912f0074b remove ensure from concat::fragment as its deprecated 2015-05-07 11:30:44 -03:00
Martin Loy
952805aaeb fix traling slash and aligment 2015-05-07 10:46:28 -03:00
Martin Loy
72bb663caf require vhost folder 2015-05-06 12:04:12 -03:00
Martin Loy
23fe0404c8 require conf.d folder 2015-05-06 12:03:26 -03:00
Matthew Haughton
3f95e281b9 Merge pull request #616 from Cofyc/cofyc_master 
fix docs
 2015-05-05 00:07:32 -04:00
Matthew Haughton
fd6b4cc088 Merge pull request #621 from 3flex/620-debian-8 
Add support for Debian 8
 2015-05-05 00:06:40 -04:00
Matthew Haughton
5ffb235e21 params: support debian 8 
Install from upstream by default like for other OSs
 2015-05-01 14:39:34 -04:00
Matthew Haughton
b8454400ac Merge pull request #613 from 3flex/test-on-puppet-4 
travis: test on Puppet 4 for real
 2015-05-01 12:00:27 -04: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
Yecheng Fu
b65a5f08f7 fix docs 2015-04-28 12:44:44 +08:00
Matthew Haughton
8d36089dff location: mini-refactor for puppet 4 
Without this an undef will be passed to regsubst when vhost => undef,
which causes an error with Puppet 4 so the friendly message from the
module won't be shown.
 2015-04-23 09:45:19 -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
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
51291ebee6 Merge pull request #530 from scottsb/master 
Fixing default location to use specified index files.
 2015-04-15 12:51:19 -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
dfaa572525 init: fix create_resources declarations for old puppet versions 
Fixes #550
 2015-04-13 15:41:25 -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
James Fryman
0a741c8713 Merge pull request #595 from 3flex/correct-package-dependency 
package/redhat: correct dependency on package
 2015-04-08 15:06:06 -05:00
Matthew Haughton
446ab37979 package/redhat: correct dependency on package 
When $package_name is not 'nginx' the dependency on the package resource would be incorrect.

Probably never an issue in practice since 'nginx' is the package name in the nginx.org repo.
 2015-04-08 15:16:53 -04:00
Mickaël Canévet
29e327aa96 Fix typo 2015-04-07 10:56:15 +02:00
Matthew Haughton
810d36d3a8 config: refined worker_processes validation 
Closes #540
 2015-04-01 23:34:31 -04:00
James Fryman
e6d1695f82 Merge pull request #571 from mayflower/fix/package-name 
Fix possibility to set package name
 2015-03-26 07:06:52 -05:00
James Fryman
2354132aa9 Merge pull request #584 from brunoleon/maintenance 
feat (maintenance): allow to specify maintenance behavior. Add docs.
 2015-03-26 07:06:29 -05:00
James Fryman
ef98b6324f Merge pull request #569 from Zophar78/master 
Flags parameter supported only on OpenBSD
 2015-03-26 07:05:38 -05:00
Erik R. Rygg
493e5c3eec Add key for passenger and update spec tests 2015-03-24 11:51:52 -06:00
Bruno Léon
6f1744b11d feat (maintenance): allow to specify maintenance behavior. Add docs. 2015-03-24 15:45:29 +01:00
Erik R. Rygg
d9b1d8cf8c Changing apt key to 40 characters to support new apt module 2015-03-23 16:03:56 -06:00
James R. Carr
466641a1f0 Copy and pasta error. 2015-03-23 14:14:15 -05:00
James R. Carr
e333db6c39 provides ssl_client_verify support 2015-03-23 13:59:30 -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
Bruno Léon
c18ba1d499 feat: add an easy maintenance page support 2015-03-17 17:06:54 +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
Robin Gloster
1ea7d6b96f fix possibility to set package name 2015-02-16 16:44:11 +01:00
Pierre Hanselmann
07f063040e Fix flags parameter 2015-02-12 09:36:24 +01:00
Pierre Hanselmann
54dc2ba6fd Flags parameter is only supported on OpenBSD and breaks on some other systems like RH (on puppet 3.4.x) 2015-02-12 09:15:05 +01: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
878ea8ef25 Merge pull request #552 from buzzdeee/master 
Allow to use OpenBSD specific service_flags and package_flavors.
 2015-02-05 14:06:09 -06:00
James Fryman
6b4f35fd4d Merge pull request #553 from steakknife/fix__541 
closes #541 (maybe: needs user feedback)
 2015-02-05 14:05:32 -06:00
Jan Schumann
a98caa993c changed $::operatingsystemmajrelease to $::lsbmajdistrelease for Debian as it does not exists in facter anymore 2015-02-03 19:54:31 +01:00
Jim Radford
c2389b8e1e Set up relationships for nginx::config even when overridden 
This keeps the user from having to duplicate them when defining
nginx::config externally.
 2015-01-29 12:32:34 -08:00
Barry Allard
4d0a2dd969
maybe closes #541 2015-01-24 14:14:17 -08:00
Sebastian Reitenbach
2960c10cd4 Allow to use OpenBSD specific service_flags and package_flavors. 
Give example for passenger in README.md and add OpenBSD to the
supported OSs in metadata.json.
 2015-01-23 15:34:53 +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
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
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
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
Jim Radford
4883b3a1c2 Notify the service after purging configuration files 2014-12-10 11:16:03 -08: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
4cb0fb0d6f Merge pull request #517 from radford/fix-location-ensure 
location: fix ensure
 2014-12-08 15:05:07 -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
Sebastian Brückner
8f793211a5 Fix proxy_set_header for default location 2014-12-04 11:27:48 +01:00
Matthew Haughton
f07058a5fb fix a future parser failure introduced by #510 2014-12-03 23:41:53 -05:00
Joshua B. Bussdieker
2e221a7e0f Support specifying log formats 2014-12-03 23:26:10 -05:00
Matthew Haughton
f18dcf0f1f fully qualify classes, defines and variables 2014-11-26 23:37:11 -05:00
Pierre Radermecker
c25c957a65 Use combined as a default for $format_log 2014-11-25 23:41:45 -05:00
Frank Groeneveld
ad4e74d5a2 Add initial OpenBSD support. 2014-11-25 20:08:05 +01:00
James Fryman
c87744aab9 Adjust integers to strings. 
As part of merging #501, default values for config.pp were integers. However,
many of the current logic expects to see strings for many values. This commit
fixes things up while the validation logic can be adjusted to take account
integer.
 2014-11-24 11:22:41 -06:00
Pi3r
4110c6b82b Deprecated comment. 
I believe the hiera backend `module_data` has been introduced in 0.1 and then dropped again in 0.2 (I don't know why exactly).

Is this correct ?

Anyhow, there is no `data` directory anymore. Please update the docs. I am not sure I can really trust any comment now ?
 2014-11-23 23:54:42 +01:00
James Fryman
0d939d3e13 fixing up specs/config parameters 2014-11-22 12:40:01 -06:00
James Fryman
cb5cb839c7 make sure to call the right variable for log_dir 2014-11-17 12:56:45 -06:00
James Fryman
45728b8f71 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 12:37:40 -06:00
James Fryman
785a5c9901 inherit params 2014-11-17 12:37:23 -06:00
Matthew Haughton
1f79a5d848 change logdir to log_dir when calling config from init 2014-11-17 12:20:51 -05:00
James Fryman
9310f7e660 adjust default worker count 2014-11-17 09:28:51 -06:00
James Fryman
c8e2b0eeaf fix up mismatched params 2014-11-17 09:15:01 -06:00
James Fryman
486dcd76b2 Merge branch 'rip-out-module-data' of https://github.com/jfryman/puppet-nginx into rip-out-module-data 2014-11-17 09:11:29 -06:00
James Fryman
d57c787087 allow user to declare nginx::config per docs 2014-11-17 09:11:04 -06:00
Matthew Haughton
95f3cf13ab config.pp: add missing comma 2014-11-10 14:11:14 -05:00
James Fryman
487c8cae2c Changing deprecation notice 2014-11-08 17:38:06 +01:00
James Fryman
ef5f04d474 rename parameter logdir -> log_dir 2014-11-08 17:24:26 +01:00