provizioning 0.9.1 → 0.9.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,3 @@
1
1
  module Provizioning
2
- VERSION = "0.9.1"
2
+ VERSION = "0.9.2"
3
3
  end
@@ -13,40 +13,42 @@
13
13
  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
14
14
 
15
15
  class postgres {
16
- include "postgres::$operatingsystem"
16
+ if $operatingsystem == /(Darwin|FreeBSD)/ && $operatingsystemrelease < '12.04' {
17
+ include "postgres::$operatingsystem"
18
+ }
17
19
 
18
20
  package { [postgresql]: ensure => installed }
19
21
  package { [libpq-dev]: ensure => installed }
20
22
 
21
23
  service { "postgresql":
22
- ensure => running,
23
- enable => true,
24
- hasstatus => true,
25
- subscribe => [Package[postgresql]],
26
- require => [File['/etc/apt/sources.list.d/postgres.list']]
24
+ ensure => running,
25
+ enable => true,
26
+ hasstatus => true,
27
+ subscribe => [Package[postgresql]],
28
+ require => [File['/etc/apt/sources.list.d/postgres.list']]
27
29
  }
28
30
 
29
31
  class ubuntu {
30
32
  include apt
31
33
 
32
- exec {"get-postgres-apt-key":
33
- command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2"
34
- }
34
+ exec {"get-postgres-apt-key":
35
+ command => "apt-key adv --keyserver keyserver.ubuntu.com --recv 8683D8A2"
36
+ }
35
37
 
36
- file {"/etc/apt/sources.list.d/postgres.list":
37
- ensure => present,
38
- owner => root,
39
- group => root,
40
- content => $operatingsystemrelease ? {
41
- '10.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu lucid main',
42
- '11.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu natty main',
43
- },
44
- require => Exec["get-postgres-apt-key"],
45
- }
38
+ file {"/etc/apt/sources.list.d/postgres.list":
39
+ ensure => present,
40
+ owner => root,
41
+ group => root,
42
+ content => $operatingsystemrelease ? {
43
+ '10.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu lucid main',
44
+ '11.04' => 'deb http://ppa.launchpad.net/pitti/postgresql/ubuntu natty main',
45
+ },
46
+ require => Exec["get-postgres-apt-key"],
47
+ }
46
48
 
47
- exec {"update apt to find postgres":
48
- command => '/usr/bin/apt-get -y update',
49
- require => File['/etc/apt/sources.list.d/postgres.list'],
50
- }
49
+ exec {"update apt to find postgres":
50
+ command => '/usr/bin/apt-get -y update',
51
+ require => File['/etc/apt/sources.list.d/postgres.list'],
52
+ }
51
53
  }
52
54
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: provizioning
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1
4
+ version: 0.9.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-28 00:00:00.000000000 Z
12
+ date: 2012-08-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: capistrano