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

279 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Fryman
f042b84686 Merge pull request #42 from igoraj/master 
Fixed typo in init.pp
 2013-04-12 04:52:18 -07:00
Igor Ajdisek
5234649b8a Fixed typo in init.pp 2013-04-12 14:44:27 +03:00
James Fryman
bd0c5c59fe Merge pull request #41 from oxilion/jfryman-add-mail-support 
add support for mail module
 2013-04-09 18:07:21 -07:00
Sander Hoentjen
4d05075f64 add support for mail module 
See http://wiki.nginx.org/Modules#Mail_modules

Sample Usage:

 nginx::resource::mailhost { 'domain1.example':
   ensure      => present,
   auth_http   => 'server2.example/cgi-bin/auth',
   protocol    => 'smtp',
   listen_port => 587,
   ssl_port    => 465,
   starttls    => 'only',
   xclient     => 'off',
   ssl         => 'true',
   ssl_cert    => '/tmp/server.crt',
   ssl_key     => '/tmp/server.pem',
 }
 2013-04-06 11:11:23 +02:00
Lebedev Vadim
bcb564776e Add new line to template 2013-03-28 18:04:50 +04:00
Lebedev Vadim
6defe17d0f Add proxy_cache parameters 
Fix puppet-lint
 2013-03-27 22:13:52 +04:00
Lebedev Vadim
9e5645670e Add fastcgi template 2013-03-27 19:46:37 +04:00
Lebedev Vadim
23c5bf7a9e Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx 
Conflicts:
	manifests/resource/location.pp
	manifests/resource/vhost.pp
 2013-03-20 21:44:45 +04:00
Lebedev Vadim
a7c9057810 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-03-20 21:11:28 +04:00
Lebedev Vadim
74cfbe6c72 Add $nx_types_hash_max_size params 
Fix puppet-lint ERROR
 2013-03-16 13:34:07 +04:00
James Fryman
6d2be4800d Merge pull request #39 from ryanfitz/amazon 
Amazon Linux support
 2013-01-22 19:34:29 -08:00
Ryan Fitzgerald
a5b7258f63 fixing vhost template 2013-01-22 18:28:06 +00:00
Ryan Fitzgerald
73f43293f7 fixing syntax error 2013-01-22 13:07:16 -05:00
Ryan Fitzgerald
884777290a adding in suport of amazon linux 2013-01-22 12:09:51 -05:00
James Fryman
f7c5108ec6 Update README.markdown 2012-12-14 00:14:25 -06:00
James Fryman
7c4041d143 Merge pull request #35 from hunner/add_tryfiles 
Add try_files option
 2012-12-13 22:12:00 -08:00
James Fryman
b4c02e23b0 Merge pull request #36 from hunner/add_scientific_linux 
Add scientific linux support
 2012-12-13 22:11:30 -08:00
James Fryman
04b20ecc01 Merge pull request #37 from hunner/add_scilinux 
Add scientific linux support
 2012-12-13 22:11:17 -08:00
Hunter Haugen
f171713662 Add scientific linux support 
This commit simply adds scientific to the `$::operatingsystem`
selectors.
 2012-12-10 15:58:58 -08:00
Hunter Haugen
1441edcfac Merge pull request #30 from hunner/merge_upstream 
Merge upstream
 2012-12-10 15:55:22 -08:00
Joe Julian
39f848c4ad Rebase bashtoni's pull request from a year ago: 
https://github.com/puppetlabs/puppetlabs-nginx/pull/9
 2012-12-05 23:11:29 -08:00
Hunter Haugen
e419006b74 Add try_files option 
Nginx supports a  option via http://wiki.nginx.org/HttpCoreModule#try_files and this adds this as a parameter
 2012-11-08 14:15:28 -08:00
Hunter Haugen
d5effb1fc8 Add scientific linux support 2012-11-08 14:13:21 -08:00
Hunter Haugen
b65114d327 Fixup incorrect changes from merge 2012-11-08 14:07:16 -08:00
Hunter Haugen
003f415beb Merge remote-tracking branch 'jfryman/master' into merge_upstream 2012-11-08 10:09:49 -08:00
James Fryman
688948a267 Merge pull request #33 from juaningan/master 
Support for SSL only server and SSL defined port
 2012-10-24 05:09:43 -07:00
James Fryman
ea04c46b9c Merge pull request #32 from lboynton/fix-template-syntax 
Fix syntax error in ERB template
 2012-10-24 05:09:16 -07:00
Nick Lewis
4aa2dd3d35 Merge remote-tracking branch 'grooverdan/ticket/11667-try_files_support' 2012-10-18 19:15:09 -07:00
Nick Lewis
7f3f238f96 Merge remote-tracking branch 'cwarden/alternative-ports' 2012-10-18 18:58:59 -07:00
Nick Lewis
20d3e2fc33 Merge pull request #10 from grooverdan/ticket/11664-listen_port_fix 
(#11664) Fix listen_port in template so it isn't ignored
 2012-10-18 18:52:54 -07:00
juaningan
b4ddaf22df Added SSL port support and if SSL and listen port are the same just creates SSL vhost and location 2012-10-18 15:33:07 +02:00
Lee Boynton
13174e0a3a Fix syntax error in ERB template 2012-10-18 11:12:43 +01:00
Stephen Johnson
6f40d2765e Merge pull request #27 from tobixen/master 
Support for Scientific Linux
 2012-10-16 08:30:06 -07:00
Tobias Brox
ddf026443e Added support for yet another redhat clone - scientific linux 2012-10-14 00:46:45 +02:00
James Fryman
4f6f488f6d Merge pull request #31 from guruHub/pull_listen_option 
Added listen_options and ipv6_listen_options feature
 2012-10-04 13:32:55 -07:00
Guzmán Brasó
1e6f9dc93c Added listen_options and ipv6_listen_options feature 
* Allows to set exta option to listen directives like 'default'.
* This won't change on ipv6 listen template the option ipv6only=on.
 2012-10-04 17:17:50 -03:00
James Fryman
91165742b6 fixing dangling commas at the end of class parameters 2012-10-04 15:17:31 -05:00
James Fryman
a6d82bffd0 Merge pull request #29 from guruHub/pull_feature_location_cfg 
Pull feature location cfg
 2012-10-03 11:37:41 -07:00
James Fryman
c63df59d12 Merge pull request #28 from guruHub/pull_feature_stub_status 
Feature status locations
 2012-10-03 06:16:23 -07:00
Guzmán Brasó
49beb91993 James, 
This is the best way I found to tackle the problem of custom directives, trying to
avoid common usage of module involve hacking the module/template to be able place
custom directives.

Right now support was added only for location context (default and custom ones),
it expects a hash with key value and it's supported on all current location types.

Added an example inside location.pp, usage it's pretty easy.
 2012-10-02 23:35:56 -03:00
Guzmán Brasó
b487f64426 Merge branch 'guzmandev' into pull_feature_stub_status 2012-10-02 20:08:08 -03:00
Guzmán Brasó
a9273d7fb8 Added support for stub_status location 
If stub_status is provided as true a location will be created to provide
nginx status information from stub_status module.
 2012-10-02 20:07:19 -03:00
James Fryman
c8ec712d07 Merge pull request #27 from guruHub/pull_feature_cfgtest 
Implementation of new vars configtest_enable and service_restart...
 2012-10-02 10:37:40 -07:00
James Fryman
32ea70c393 Merge pull request #26 from guruHub/pull_feature_confd_purge 
Allow purge of confd dir as optional argument.
 2012-10-02 10:37:12 -07:00
James Fryman
d10a514c6e Merge pull request #25 from guruHub/pull_refactor 
puppet-nginx refactor to class/arguments
 2012-10-02 10:36:54 -07:00
James Fryman
3607491270 Merge pull request #24 from guruHub/pull_issue_20 
Fixed error from cat when trying nginx.d/* on nodes without vhosts defined
 2012-10-02 10:36:23 -07:00
Guzmán Brasó
e9fce56092 Fixing merge from latest code on master plus guruhub 2012-10-02 01:56:37 -03:00
Guzmán Brasó
197ad06bce Implementation of new vars configtest_enable and service_restart and their respective optional arguments. 
Argument configtest_enable / params.pp $nx_configtest_enable
* Default false
* If true will set service[nginx] restart with contents of nx_service_restart.

Argument service_restart / params.pp $nx_service_restart
* Default '/etc/init.d/nginx configtest && /etc/init.d/nginx restart'
* Since nginx 0.7.53 nginx supports '-s HUP' which will reload testing configuration first, to be backwards compatible above default was choosen.

Many distributions of nginx already implement a configtest before restart, however many doesn't, and many
even don't provide restart but a stop/start combination. If configtest_enable is true then puppet will force
nginx to do a configtest no matter if it was going or not to do it itself.
 2012-10-02 01:43:36 -03:00
Guzmán Brasó
e9d984eaaf Added purge support in confd. 
Added confd_purge option to tell it to purge files non managed by pupet in conf.d, default is false.

Because vhost_autogen it's not actually managed by puppet but indirectly created by a puppet executed
command, it's added as ignore to avoid getting it removed.

Better formating for confd purge support

Better formating for confd purge support
 2012-10-01 23:31:50 -03:00
Guzmán Brasó
e1363545ae Moved worker_connections, worker_process and proxy_set_header to the new structure, backwards compatible 
Defaults are set inside params, nginx class will set default and send it from local var to nginx::config,
so even when there is no need for set default values on nginx::config, in case someone already using
this module it's for some reason calling directly nginx::config, to avoid breaking anything defaults are
set inside nginx::config too.
 2012-10-01 22:02:44 -03:00