provizioning 0.9.2 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
data/lib/provizioning/version.rb
CHANGED
@@ -50,10 +50,7 @@ class nginx {
|
|
50
50
|
ensure => present,
|
51
51
|
owner => root,
|
52
52
|
group => root,
|
53
|
-
content =>
|
54
|
-
'10.04' => 'deb http://ppa.launchpad.net/brightbox/passenger-nginx/ubuntu lucid main',
|
55
|
-
'11.04' => 'deb http://ppa.launchpad.net/brightbox/passenger-nginx/ubuntu natty main',
|
56
|
-
},
|
53
|
+
content => "deb http://ppa.launchpad.net/brightbox/passenger-nginx/ubuntu ${lsbdistcodename} main",
|
57
54
|
require => Exec["get-nginx-apt-key"],
|
58
55
|
}
|
59
56
|
|
@@ -13,8 +13,11 @@
|
|
13
13
|
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
14
14
|
|
15
15
|
class postgres {
|
16
|
-
if $operatingsystem ==
|
17
|
-
include "postgres::$operatingsystem"
|
16
|
+
if $operatingsystem == 'ubuntu' and $operatingsystemrelease < '12.04' {
|
17
|
+
include "postgres::$operatingsystem"
|
18
|
+
$require = File['/etc/apt/sources.list.d/postgres.list']
|
19
|
+
} else {
|
20
|
+
$require = []
|
18
21
|
}
|
19
22
|
|
20
23
|
package { [postgresql]: ensure => installed }
|
@@ -25,7 +28,7 @@ class postgres {
|
|
25
28
|
enable => true,
|
26
29
|
hasstatus => true,
|
27
30
|
subscribe => [Package[postgresql]],
|
28
|
-
require =>
|
31
|
+
require => $require,
|
29
32
|
}
|
30
33
|
|
31
34
|
class ubuntu {
|