Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/nginx/manifests/init.pp

Issue 10590026: Install Nginx 1.4.1 from the official repository (Closed)
Patch Set: Created May 17, 2013, 11:04 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/discourse/files/intraforum.adblockplus.org ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/nginx/manifests/init.pp
===================================================================
--- a/modules/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
@@ -4,8 +4,18 @@
$ssl_session_cache = $nginx::params::ssl_session_cache
) inherits nginx::params {
+ include apt
+
+ apt::source {'nginx':
+ location => "http://nginx.org/packages/ubuntu",
+ repos => "nginx",
+ key => "A524C53E",
+ key_source => "http://sysoev.ru/pgp.txt"
+ }
+
package {'nginx':
- ensure => present
+ ensure => '1.4.1-1~precise',
Wladimir Palant 2013/05/18 09:52:32 Will that also allow for newer versions?
Felix Dahlke 2013/05/21 05:40:58 No, this will install exactly this version. I've t
+ require => Apt::Source['nginx']
}
File {
@@ -20,6 +30,16 @@
notify => Service['nginx']
}
+ file {'/etc/nginx/sites-available':
+ ensure => directory,
+ require => Package['nginx']
+ }
+
+ file {'/etc/nginx/sites-enabled':
+ ensure => directory,
+ require => Package['nginx']
+ }
+
file {'/etc/nginx/sites-available/default':
ensure => absent,
require => Package['nginx']
« no previous file with comments | « modules/discourse/files/intraforum.adblockplus.org ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld