Commit graph

423 commits

Author SHA1 Message Date
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
James Fryman
1e91fdb9a3 Merge pull request #68 from maestrodev/forge
Push to forge
2013-08-01 10:09:48 -07:00
Lebedev Vadim
49b5b79b76 * Option fastcgi_script fixed
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
* Auth_basic fixed in SSL vhost header
2013-08-01 01:07:59 +04:00
Lebedev Vadim
5522f27d9b * Option fastcgi_script fixed
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
2013-08-01 00:56:32 +04:00
Adam Brenecki
58f2d2f7fc Fix erroneous auth_basic lines in SSL vhost header 2013-07-29 14:14:33 +09:30
James Fryman
4f5ea94b46 Merge pull request #98 from mnencia/patch-1
Inverted condition for IPv6 warning
2013-07-26 03:06:57 -07:00
Marco Nenciarini
e104fc5a89 Inverted condition for IPv6 warning
If $ipv6_enable is true ypu sshould warn the user only if the machine _doesn't have_ an ip address.

At the moment the warning is raised when ipv6 is configured properly
2013-07-26 10:15:55 +02:00
Justice London
30e9773aeb Merge pull request #1 from jfryman/master
Merging upstream changes
2013-07-25 09:51:45 -07:00
James Fryman
17d1edaf74 Merge pull request #96 from abraham1901/dev
Adding option http_cfg_append to class nginx
2013-07-21 11:30:02 -07:00
Lebedev Vadim
ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev
Conflicts:
	manifests/init.pp
2013-07-21 19:40:29 +04:00
James Fryman
a552e6b25a Merge pull request #90 from michaeltchapman/vhost_index
Add index_files to location for vhost
2013-07-21 04:33:04 -07:00