-
-
Notifications
You must be signed in to change notification settings - Fork 881
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/voxpupuli/puppet-nginx in…
…to dev
- Loading branch information
Showing
12 changed files
with
868 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
modulesync_config_version: '0.12.4' | ||
modulesync_config_version: '0.12.5' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
.travis.yml: | ||
secure: "SDpX6jzritODonEQBqy9g0NbOmk2a9dBfAtZLrvHwM8BTpM2W0Y1daqzIbpzxFiqlNX+6r2GSq9SV70N0A9Ko/uPV9aG/XZx7MsBR9DNVjgqjJSl7+aF88VJfRpOv4PAyTM33JMx91nLFxM/ql61YX+2DXGXrhUkBsMZcdBgQnk=" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,30 @@ | ||
# NGINX Module | ||
|
||
This module got migrated from James Fryman <[email protected]> and Matthew Haughton <[email protected]> to Vox Pupuli. | ||
|
||
|
||
## INSTALLING OR UPGRADING | ||
** Please note **: This module is currently undergoing some structural | ||
maintenance. Please take a look at [https://github.com/jfryman/puppet-nginx/blob/master/docs/hiera.md](https://github.com/jfryman/puppet-nginx/blob/master/docs/hiera.md) | ||
maintenance. Please take a look at [https://github.com/voxpupuli/puppet-nginx/blob/master/docs/hiera.md](https://github.com/voxpupuli/puppet-nginx/blob/master/docs/hiera.md) | ||
before upgrading or installing Version 0.1.0 or greater. | ||
|
||
[![Puppet | ||
Forge](http://img.shields.io/puppetforge/v/jfryman/nginx.svg)](https://forge.puppetlabs.com/jfryman/nginx) | ||
[![Build Status](https://travis-ci.org/jfryman/puppet-nginx.svg?branch=master)](https://travis-ci.org/jfryman/puppet-nginx) | ||
|
||
Forge](http://img.shields.io/puppetforge/v/puppet/nginx.svg)](https://forge.puppetlabs.com/puppet/nginx) | ||
[![Build Status](https://travis-ci.org/voxpupuli/puppet-nginx.svg?branch=master)](https://travis-ci.org/voxpupuli/puppet-nginx) | ||
|
||
* James Fryman <[email protected]> | ||
* Matthew Haughton <[email protected]> | ||
|
||
This module manages NGINX configuration. | ||
|
||
### Requirements | ||
|
||
* Puppet-2.7.0 or later | ||
* Puppet 3.0.0 or later | ||
* Facter 1.7.0 or later | ||
* Ruby-1.9.3 or later (Support for Ruby-1.8.7 is not guaranteed. YMMV). | ||
* Ruby 1.9.3 or later (Support for Ruby-1.8.7 is not guaranteed. YMMV). | ||
|
||
### Additional Documentation | ||
|
||
* [A Quickstart Guide to the NGINX Puppet Module][quickstart] | ||
[quickstart]: https://github.com/jfryman/puppet-nginx/blob/master/docs/quickstart.md | ||
[quickstart]: https://github.com/voxpupuli/puppet-nginx/blob/master/docs/quickstart.md | ||
|
||
|
||
### Install and bootstrap an NGINX instance | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters