X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c9ea623c34055db8bcca45c8b3f46a3af7008d33..1a861da6a1387e89b90c8fdc223513c54ccdebda:/cookbooks/apt/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 195d9750e..f0c26b867 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -86,21 +86,7 @@ end apt_repository "openstreetmap" do action repository_actions["openstreetmap"] uri "ppa:osmadmins/ppa" -end - -apt_repository "squid2" do - action repository_actions["squid2"] - uri "ppa:osmadmins/squid2" -end - -apt_repository "squid3" do - action repository_actions["squid3"] - uri "ppa:osmadmins/squid3" -end - -apt_repository "squid4" do - action repository_actions["squid4"] - uri "ppa:osmadmins/squid4" + only_if { node[:lsb][:release].to_f < 22.04 } end apt_repository "management-component-pack" do @@ -158,14 +144,6 @@ apt_repository "postgresql" do key "7FCC7D46ACCC4CF8" end -apt_repository "mediawiki" do - action repository_actions["mediawiki"] - uri "https://releases.wikimedia.org/debian" - distribution "jessie-mediawiki" - components ["main"] - key "AF380A3036A03444" -end - apt_repository "docker" do action repository_actions["docker"] uri "https://download.docker.com/linux/ubuntu"