This repository was archived by the owner on Jan 23, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Expand file tree Collapse file tree 4 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ gem "license_finder", "~> 1.2.0"
9
9
gem "rake" , "~> 10.4.0"
10
10
gem "rubocop" , "~> 0.29.1"
11
11
gem "serverspec" , "~> 2.8.0"
12
+ gem "andand" , "~> 1.3.3"
12
13
13
14
group :integration do
14
15
gem "busser-serverspec" , "~> 0.5.3"
Original file line number Diff line number Diff line change @@ -243,7 +243,7 @@ default["postgresql"]["cfg_update_action"] = :restart
243
243
# ----------------------------------------------------------------------------
244
244
# APT REPOSITORY
245
245
# ----------------------------------------------------------------------------
246
- default[" postgresql" ][" apt_distribution" ] = node[" lsb" ][" codename" ]
246
+ default[" postgresql" ][" apt_distribution" ] = node[" lsb" ] && node[ " lsb " ] [" codename" ]
247
247
default[" postgresql" ][" apt_repository" ] = " apt.postgresql.org"
248
248
default[" postgresql" ][" apt_uri" ] = " http://apt.postgresql.org/pub/repos/apt"
249
249
default[" postgresql" ][" apt_components" ] = [" main" ]
Original file line number Diff line number Diff line change 20
20
# APT REPOSITORY
21
21
#------------------------------------------------------------------------------
22
22
23
- default [ "postgresql" ] [ "apt_distribution" ] = node [ "lsb" ] [ "codename" ]
23
+ default [ "postgresql" ] [ "apt_distribution" ] = node [ "lsb" ] && node [ "lsb" ] [ "codename" ]
24
24
default [ "postgresql" ] [ "apt_repository" ] = "apt.postgresql.org"
25
25
default [ "postgresql" ] [ "apt_uri" ] = "http://apt.postgresql.org/pub/repos/apt"
26
26
default [ "postgresql" ] [ "apt_components" ] = [ "main" , node [ "postgresql" ] [ "version" ] ]
Original file line number Diff line number Diff line change 4
4
#
5
5
6
6
# backports for initial support
7
- backports_uri = if node [ "lsb" ] [ "codename" ] == "wheezy"
7
+ backports_uri = if node [ "lsb" ] && node [ "lsb" ] [ "codename" ] == "wheezy"
8
8
"http://cdn.debian.net/debian"
9
9
else
10
10
"http://backports.debian.org/debian-backports"
11
11
end
12
12
13
13
apt_repository "debian-backports" do
14
14
uri backports_uri
15
- distribution "#{ node [ "lsb" ] [ "codename" ] } -backports"
15
+ distribution "#{ node [ "lsb" ] && node [ "lsb" ] [ "codename" ] } -backports"
16
16
components [ "main" ]
17
17
end
18
18
19
19
# backports support for debian
20
20
%w[ libpq5 postgresql-common ] . each do |pkg |
21
21
package pkg do
22
- options "-t #{ node [ "lsb" ] [ "codename" ] } -backports"
22
+ options "-t #{ node [ "lsb" ] && node [ "lsb" ] [ "codename" ] } -backports"
23
23
end
24
24
end
You can’t perform that action at this time.
0 commit comments