Commit graph

24 commits

Author SHA1 Message Date
Lebedev Vadim
a5ebd57b3b Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 18:41:44 +04:00
Lebedev Vadim
8d33fd63f1 Merge branch 'master' of https://github.com/jfryman/puppet-nginx
Conflicts:
	manifests/config.pp
	manifests/init.pp
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	manifests/service.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
	templates/vhost/vhost_location_directory.erb
	templates/vhost/vhost_location_proxy.erb
	templates/vhost/vhost_ssl_header.erb
	tests/vhost.pp
2013-05-21 16:30:21 +04:00
Lebedev Vadim
4f0c311901 * Fixed listen parameter in template vhost_ssl_header
* Added auth basic support
* Added vhost_cfg_append parameter to `nginx::resource::vhost`
2013-05-20 18:30:32 +04:00
Sander Hoentjen
57ee1ec1e7 make proxy_http_version configurable 2013-05-06 11:40:46 +02:00
Sander Hoentjen
8859c4e8db linting 2013-05-06 11:37:37 +02:00
David Kitchen
7e33272f84 Changed SSL ciphers to the recent default for Nginx which is much
more secure
Added SSL caching to speed up SSL requests
Add server_tokens to the global config so this can be turned on|off
    between dev and prod
Add proxy_set_header to vhost as different vhosts may require different
    headers and the global setting is not ideal
Minor space formatting so that the generated files are fractionally
    more readable
2013-04-24 09:42:06 +01:00
Igor Ajdisek
5234649b8a Fixed typo in init.pp 2013-04-12 14:44:27 +03: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
6defe17d0f Add proxy_cache parameters
Fix puppet-lint
2013-03-27 22:13:52 +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
91165742b6 fixing dangling commas at the end of class parameters 2012-10-04 15:17:31 -05: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
Lee Boynton
193775263d Include stdlib rather than using class to fix conflicts with other modules using stdlib 2012-09-24 15:52:48 +01:00
Jeff McCune
f608b8ffd8 Contain all classes within Class[nginx]
This change uses the anchor relationship from the puppetlabs-stdlib
module to contain all of the module classes within the main "ntp" class.

Without this change, end users of the module may have difficulty
ordering things correctly since they will have to peek inside the module
and figure out it's internal workings to identify all classes that
require relationship edges.
2012-01-03 11:39:34 -08:00
James Fryman
b9aac9292e added anchor pattern 2011-06-21 12:03:47 -07:00
Jeff McCune
694ad98986 Whitespace only removal of tabs and trailing spaces
Watch out for tab characters.  =)
2011-06-14 20:02:55 -07:00
Jeff McCune
3e380e242b Add transitive relationships to Class['nginx']
Without this change, the end user of the module may run into issues
establishing relationships to the composite class (the main nginx class)

For example, the user may declare this relationship expecting
nginx to be managed after the yum repositories have been configured:

    node default {
      class { 'site::yumconfig': }
      -> class { 'nginx': }
    }

However, all of the resources exist in implementation classes, which
do not have a transitive relationship declared to the nginx class.
Without this change, Puppet may very well manage Class['nginx::config']
before Class['site::yumconfig'] even though the user clearly indicated
this should not be the case.
2011-06-14 20:02:17 -07:00
James Fryman
7320a0ae56 Updated Documentation 2011-06-06 18:05:27 -05:00
James Fryman
ebd481d570 Added SuSE Support 2011-06-06 17:25:04 -05:00
James Fryman
4558791e49 Updated Package Layout 2011-06-06 10:04:24 -05:00
James Fryman
fe3e409c9c Added vhost support 2011-06-02 14:49:39 -05:00
James Fryman
3b036c95e5 20110524 Work Snapshot 2011-05-24 21:20:48 -05:00