Tom Booth
af7ceb0eec
Give key's group permission to read
2013-08-22 22:13:53 +01:00
Lebedev Vadim
82e5f474d7
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
2013-08-23 01:08:40 +04:00
Lebedev Vadim
15519e7eef
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
...
Conflicts:
manifests/package/redhat.pp
templates/vhost/vhost_footer.erb
templates/vhost/vhost_header.erb
2013-08-23 01:07:53 +04:00
James Fryman
d1aef6e718
bump to 0.0.4
2013-08-22 15:52:10 -05:00
James Fryman
bd57348454
Merge branch 'master' of https://github.com/jfryman/puppet-nginx
2013-08-22 15:44:51 -05:00
James Fryman
e1aa65d20c
Manual merge of https://github.com/jfryman/puppet-nginx/pull/100
2013-08-22 15:44:25 -05:00
James Fryman
41591a36ff
Merge pull request #99 from jhoblitt/select_package_by_osfamily
...
update nginx::package to select the package class by $::osfamily
2013-08-22 13:41:40 -07:00
James Fryman
b246c13285
Merge pull request #104 from stephenrjohnson/vhost_template_cleanup
...
fix template, should use @
2013-08-22 13:39:59 -07:00
Joshua Hoblitt
8a1981f640
update nginx::package to select the package class by $::osfamily
...
There were some bugs in the existing $::operatingsystem based approach.
* amazon was it's own package set when it's properly part of $::osfamily ==
'redhat' as of facter >= 1.7.2
* gentoo was improperly part of the amazon package set; this patch removes
support for gentoo but it was broken anyways
modifications to nginx:📦 :redhat were made as well
* it no longer tries to setup the nginx.org yumrepo for fedora as no packages
for fedora are currently provided
* amazon release numbers are inconsistent with EL. Unknown
$::lsbmajdistrelease values are now mapped to 6 so it's no longer nessicary to
test for $::lsbmajdistrelease being undefined. This logic will need to be
reworked after RHEL7.x is released.
* the url to the nginx repo was including $::operatingsystem in it but
nginx.org only has package dirs for 'rhel' & 'centos' which are presently
identical; the usage of the 'rhel' dir has been hardcoded. This fixes broken
yum repo setup for all $::osfamily == 'redhat' platforms other than redhat and
centos.
2013-08-22 13:32:54 -07:00
James Fryman
f98feea476
Merge pull request #114 from helldorado/master
...
Please reconsidere my pull request: Fix syntax "each" for ruby1.9 => each_line and add listen_port on rewrite_www_to_non_www
2013-08-22 13:22:41 -07:00
root
eb73601aac
Fix puppet-lint
2013-08-22 23:23:16 +04:00
root
f609f9601d
Adding option http_cfg_prepend to class nginx
2013-08-22 23:02:04 +04:00
root
0a53d710c2
Merge branch 'sort_vhost_cfg_append' of https://github.com/jhoblitt/puppet-nginx into dev
2013-08-22 22:24:55 +04:00
root
7ae4d3446c
Merge branch 'user-defined-vhost-logs' of https://github.com/vrillusions/puppet-nginx into dev
2013-08-22 17:05:10 +04:00
Tom Booth
d149c43936
Fix SSL cert and key permissions
...
It is bad practice to use 644 on a private key so we
have migrated the key mode to 0400. The cert is already
avaliable publicly through nginx so we have allowed it
0444.
Nothing should need to write either the cert of the key
after puppet has run, so we have denied any writing.
2013-08-21 16:29:31 +01:00
James Fryman
304c12974e
Last webhook Fixes #118
2013-08-18 16:26:38 -05:00
James Fryman
5f69bd3c3a
Merge branch 'master' of https://github.com/jfryman/puppet-nginx
2013-08-18 16:12:37 -05:00
James Fryman
eb438df54e
Another ServiceHook Test Fixes #117
2013-08-18 16:12:28 -05:00
James Fryman
07ff2d821e
Merge pull request #109 from vikraman/patch-1
...
Fix the error 'You cannot specify more than one of content, source, target'
2013-08-18 14:03:27 -07:00
James Fryman
9bc079f7cd
testing close webhook Fixes #116
2013-08-18 15:58:39 -05:00
Joshua Hoblitt
b8189496a3
sort $vhost_cfg_append hash in vhost_footer.erb template
...
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
2013-08-16 16:29:05 -07:00
Abdoul Bah
b40196f843
Update vhost_location_stub_status.erb
...
this does not affect ruby1.9
2013-08-15 21:08:03 +02:00
Abdoul Bah
e0f2666077
Update vhost_location_proxy.erb
...
this does not affect ruby1.9
2013-08-15 21:07:40 +02:00
Abdoul Bah
81c46e165e
Update vhost_location_fastcgi.erb
2013-08-15 21:07:06 +02:00
Abdoul Bah
2915ff22db
Update vhost_location_empty.erb
...
this does not affect ruby1.9
2013-08-15 21:06:23 +02:00
Abdoul Bah
e408cdc2f4
Update vhost_location_directory.erb
...
this does not affect ruby1.9
2013-08-15 21:05:38 +02:00
Abdoul Bah
3a2dd716a0
Update vhost_location_alias.erb
...
this does not affect ruby1.9
2013-08-15 21:05:02 +02:00
Abdoul Bah
029e40b836
Update vhost_location_stub_status.erb
2013-08-15 18:57:22 +02:00
Abdoul Bah
be5dd67875
Update vhost_location_proxy.erb
2013-08-15 18:56:58 +02:00
Abdoul Bah
0be9924df5
Update vhost_location_fastcgi.erb
2013-08-15 18:56:05 +02:00
Abdoul Bah
f87d4770df
Update vhost_location_empty.erb
2013-08-15 18:55:14 +02:00
Abdoul Bah
d10eaa423a
Update vhost_location_directory.erb
2013-08-15 18:54:41 +02:00
Abdoul Bah
939d0bd458
Update vhost_location_alias.erb
2013-08-15 18:53:45 +02:00
Abdoul Bah
b432d5269c
Update vhost_header.erb
2013-08-15 18:52:35 +02:00
Abdoul Bah
90c5b7349e
Update vhost_footer.erb
2013-08-15 18:50:20 +02:00
Abdoul Bah
1f007e3587
add listen_port on rewrite_www_to_non_www
...
Adding the port in case it is not by default.
2013-08-15 17:04:36 +02:00
Vikraman
b20b616bed
Fix the error 'You cannot specify more than one of content, source, target'
...
I get the above error message. It is easily fixed by removing the `ensure` inside `ensure_resource`, since `ensure_resource` should already be setting `$ensure` to `file`.
2013-08-11 12:15:26 +05:30
Todd Eddy
70207c9a65
Add logging customization to the main logs as well.
2013-08-07 21:27:13 -04:00
Todd Eddy
8cb8a31ade
Removed path checking to allow additional logging options.
2013-08-07 10:19:46 -04:00
Todd Eddy
c6cd476c82
Add custom logs to ssl vhosts as well.
2013-08-07 09:59:44 -04:00
Todd Eddy
94e87d86cd
Allow user modification of access and error log in vhost.
2013-08-06 21:11:58 -04:00
Stephen
28f9f74c1b
Template variables should start with @
2013-08-05 08:33:36 +01:00
James Fryman
8997529a6c
Bumping version: Bugfixes
2013-08-04 17:06:09 -05:00
James Fryman
c534763c64
Merge pull request #107 from ubc/fix-wildcard-cert
...
Fix #106 when using wildcard certificate on multiple vhosts
2013-08-04 14:59:25 -07:00
Pan
126fb413ea
Fix #106 when using wildcard certificate on multiple vhosts
2013-08-04 14:54:41 -07:00
James Fryman
d15509e6cd
Merge pull request #97 from justicel/master
...
Fixed RHEL package install and added some fastcgi options
2013-08-04 11:27:06 -07:00
Justice London
6911b91f9e
Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master
...
Conflicts:
templates/vhost/vhost_location_fastcgi.erb
2013-08-02 13:07:53 -04:00
James Fryman
fd4e3c5a37
Merge pull request #101 from adambrenecki/fix-ssl-config
...
auth_basic lines appearing in SSL vhost header when they shouldn't
2013-08-01 10:27:22 -07:00
James Fryman
b384339fa2
Merge pull request #103 from abraham1901/dev
...
Some changes have been made
2013-08-01 10:26:59 -07:00
James Fryman
1ca6a64f29
bumping to v0.0.2
2013-08-01 10:15:47 -07:00
