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"
99gem "rake" , "~> 10.4.0"
1010gem "rubocop" , "~> 0.29.1"
1111gem "serverspec" , "~> 2.8.0"
12+ gem "andand" , "~> 1.3.3"
1213
1314group :integration do
1415 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
243243# ----------------------------------------------------------------------------
244244# APT REPOSITORY
245245# ----------------------------------------------------------------------------
246- default[" postgresql" ][" apt_distribution" ] = node[" lsb" ][" codename" ]
246+ default[" postgresql" ][" apt_distribution" ] = node[" lsb" ] && node[ " lsb " ] [" codename" ]
247247default[" postgresql" ][" apt_repository" ] = " apt.postgresql.org"
248248default[" postgresql" ][" apt_uri" ] = " http://apt.postgresql.org/pub/repos/apt"
249249default[" postgresql" ][" apt_components" ] = [" main" ]
Original file line number Diff line number Diff line change 2020# APT REPOSITORY
2121#------------------------------------------------------------------------------
2222
23- default [ "postgresql" ] [ "apt_distribution" ] = node [ "lsb" ] [ "codename" ]
23+ default [ "postgresql" ] [ "apt_distribution" ] = node [ "lsb" ] && node [ "lsb" ] [ "codename" ]
2424default [ "postgresql" ] [ "apt_repository" ] = "apt.postgresql.org"
2525default [ "postgresql" ] [ "apt_uri" ] = "http://apt.postgresql.org/pub/repos/apt"
2626default [ "postgresql" ] [ "apt_components" ] = [ "main" , node [ "postgresql" ] [ "version" ] ]
Original file line number Diff line number Diff line change 44#
55
66# backports for initial support
7- backports_uri = if node [ "lsb" ] [ "codename" ] == "wheezy"
7+ backports_uri = if node [ "lsb" ] && node [ "lsb" ] [ "codename" ] == "wheezy"
88 "http://cdn.debian.net/debian"
99 else
1010 "http://backports.debian.org/debian-backports"
1111 end
1212
1313apt_repository "debian-backports" do
1414 uri backports_uri
15- distribution "#{ node [ "lsb" ] [ "codename" ] } -backports"
15+ distribution "#{ node [ "lsb" ] && node [ "lsb" ] [ "codename" ] } -backports"
1616 components [ "main" ]
1717end
1818
1919# backports support for debian
2020%w[ libpq5 postgresql-common ] . each do |pkg |
2121 package pkg do
22- options "-t #{ node [ "lsb" ] [ "codename" ] } -backports"
22+ options "-t #{ node [ "lsb" ] && node [ "lsb" ] [ "codename" ] } -backports"
2323 end
2424end
You can’t perform that action at this time.
0 commit comments