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

264 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James Fryman
20fa345416 Merge pull request #13 from drdla/patch-3 
This is part of patch-1!
 2012-09-17 10:28:15 -07:00
James Fryman
8562ff4a9a Merge pull request #12 from drdla/patch-2 
This is part of patch-1!
 2012-09-17 10:28:08 -07:00
James Fryman
a5b8acbd6e Merge pull request #11 from drdla/patch-1 
Add parameter to rewrite www to non-www
 2012-09-17 10:27:53 -07:00
James Fryman
26c6302227 Merge pull request #14 from maestrodev/master 
support operatingsystem RedHat
 2012-09-17 10:26:55 -07:00
Duncan Hutty
411419960b add an array parameter to resource::vhost, server_name, that goes into the server_name nginx directive for that vhost 2012-09-10 17:15:32 -04:00
Brett Porter
b9afd221a3 support platforms that don't supply lsbmajdistrelease fact 2012-09-03 11:31:40 -07:00
Brett Porter
f2a14b9961 support redhat as operating system in addition to rhel 2012-09-02 01:48:52 -07:00
Brett Porter
85ce2c42db correct class name in README 2012-09-02 00:50:57 -07:00
drdla
cc4b9615f7 Update templates/vhost/vhost_footer.erb 2012-09-01 18:52:55 +03:00
drdla
4667811324 Update templates/vhost/vhost_header.erb 2012-09-01 18:51:30 +03:00
drdla
9ca7e2b218 Add parameter to rewrite www to non-www 2012-09-01 18:46:27 +03:00
James Fryman
375dd0fa49 fixing merge conflict 2012-08-28 15:24:27 -05:00
James Fryman
3b7e191c1e fixing escape sequences 2012-08-28 15:08:30 -05:00
James Fryman
afa8586e73 Merge pull request #10 from drdla/patch-3 
Fixed typo (missing , at end of line)
 2012-08-28 12:53:04 -07:00
drdla
435f3a3b4f Fixed typo (missing , at end of line) 2012-08-28 22:50:18 +03:00
James Fryman
721fb2f79f Merge branch 'master' of github.com:jfryman/puppet-nginx 
Conflicts:
	manifests/package/redhat.pp
 2012-08-28 14:36:40 -05:00
James Fryman
08021c837c adding correct variable interpolation for nginx 2012-08-28 14:35:25 -05:00
James Fryman
6cc34f9c16 Merge pull request #9 from drdla/patch-2 
removed remainder of merge conflict
 2012-08-27 11:21:10 -07:00
drdla
57e82fcaa3 removed remainder of merge conflict 2012-08-27 21:18:50 +03:00
James Fryman
b9b3210a73 Merge pull request #8 from drdla/patch-1 
Fixed typo (missing , at end of line)
 2012-08-27 11:16:05 -07:00
drdla
6ddef7ff0e Fixed typo (missing , at end of line) 2012-08-27 21:14:44 +03:00
James Fryman
4d02012150 Merge branch 'master' of github.com:jfryman/puppet-nginx 
Conflicts:
	README.markdown
	manifests/resource/location.pp
 2012-08-27 09:29:46 -05:00
James Fryman
49cc046ac8 addding yumrepo for RHEL systems to ensure latest from NGINX 2012-08-27 09:26:48 -05:00
James Fryman
df8a1b5059 Merge pull request #4 from luxflux/patch-1 
Fix small typo in variable name
 2012-06-27 07:04:21 -07:00
Raffael Schmid
fdbccd5688 Fix small typo in variable name 2012-06-27 16:39:49 +03:00
lifton
b302fcf598 Merge pull request #21 from dukejones/master 
Remove the tab characters
 2012-03-04 09:36:06 -08:00
Duke Dorje
d6ac760618 Remove tab characters. 2012-03-04 09:19:44 -08:00
Christian G. Warden
a214b0ff21 Support vhosts that listen on alternative ports 
- Include the port in the listen directive
- Add an optional $server_name parameter to nginx::resource::vhost so
  server_name doesn't have to match the resource's name.  This allows
  the creation of multiple vhosts with the same server_name that listen
  on different ports.
 2012-01-30 11:26:10 -08:00
James Turnbull
6cbefd7144 Merge pull request #16 from cwarden/per-location-proxy-read-timeout 
Add per-location proxy read timeout parameter
 2012-01-30 11:19:04 -08:00
Christian G. Warden
942c659fd0 Add per-location proxy read timeout parameter 
Add a proxy_read_timeout parameter to set the read timeout setting
per-location.  The parameter can also be passed when declaring a vhost,
in which case it will apply to the root location.
 2012-01-30 11:14:57 -08:00
James Turnbull
d2f559055b Merge pull request #7 from cwarden/qualify-facter-variables 
Fully-qualify facter variables
 2012-01-30 11:12:58 -08:00
James Turnbull
84257dcb9b Merge pull request #8 from cwarden/vhost-doc-cleanup 
Fix up references to location that should be vhost
 2012-01-30 11:08:34 -08:00
Daniel Black
719028ce5e (#11667) add try_files support in vhost and location directives 
Try_files is how NGINX files the files to serve particularly in a
fallback mode. Using an array for try_files will interate through
these options in the generated configuration file.
 2012-01-22 12:49:41 +11:00
James Turnbull
14d6281d5a Merge pull request #4 from jeffmccune/feedback/master/containment_with_anchors 
Contain all classes within Class[nginx]
 2012-01-05 11:12:14 -08:00
Jeff McCune
c1166fde1a Whitespace only cleanup of Class[nginx::service] 2012-01-03 11:41:19 -08:00
Jeff McCune
1a3d758d4b Update init.pp test with relationships 
This shows the module user how relationships can be easily added
to the main nginx class without peeking inside the guts of the module.
 2012-01-03 11:39:34 -08: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
Daniel Black
dede78ab3d (#11664) Fix listen_port in template so it isn't ignored 
listen_port was being ignore when the template was generated.
This commit fixes it.
 2012-01-03 12:20:27 +11:00
James Fryman
a0c18b79f8 Merge pull request #1 from Frost/patch-1 
Fixed broken README markdown.
 2012-01-02 07:31:46 -08:00
Martin Frost
e048f9a782 Fixed broken README markdown. 2012-01-02 10:49:11 +01:00
Christian G. Warden
9ba2e3a1d9 Fix up references to location that should be vhost 
It looks like the comments were copied from nginx::resource::location.
This updates the comments to refer to vhosts where appropriate.
 2011-12-13 14:49:18 -08:00
Christian G. Warden
77f209d383 Fully-qualify facter variables 
Fully-qualify facter variables, $::kernel and $::operatingsystem.
 2011-12-13 11:45:31 -08:00
James Fryman
a6f98a88c2 Fixed README.markup 2011-06-30 12:37:12 -05:00
James Fryman
b9aac9292e added anchor pattern 2011-06-21 12:03:47 -07:00
James Fryman
9c9b5c2c78 Merge pull request #5 from ody/feedback/master/style 
Style compliance
 2011-06-15 14:50:26 -07:00
Cody Herriges
3a27502ba9 Style compliance 
This commit puts the majority of the code provided by this module into
  compliance with the published style guide. Also updated Modulefile to
  have more sane pre-release values.
 2011-06-15 14:43:01 -07:00
James Fryman
7e4b8bfbb4 Merge pull request #3 from jeffmccune/feedback/master/composite_transitive_relationships 
Feedback/master/composite transitive relationships
 2011-06-14 20:07:15 -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