X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d0446717f1f755850a9698fcf1998e7fc8614837..9f7bd649654a83e58e87f4d3605f7097abeb42fb:/cookbooks/apt/recipes/default.rb diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb index 1cac23bff..fe79213c0 100644 --- a/cookbooks/apt/recipes/default.rb +++ b/cookbooks/apt/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: apt +# Cookbook:: apt # Recipe:: default # -# Copyright 2010, Tom Hughes +# Copyright:: 2010, Tom Hughes # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -73,6 +73,11 @@ apt_repository "ubuntugis-unstable" do uri "ppa:ubuntugis/ubuntugis-unstable" end +apt_repository "maxmind" do + action repository_actions["maxmind"] + uri "ppa:maxmind/ppa" +end + apt_repository "openstreetmap" do action repository_actions["openstreetmap"] uri "ppa:osmadmins/ppa" @@ -153,7 +158,15 @@ apt_repository "mediawiki" do uri "https://releases.wikimedia.org/debian" distribution "jessie-mediawiki" components ["main"] - key "90E9F83F22250DD7" + key "AF380A3036A03444" +end + +apt_repository "docker" do + action repository_actions["docker"] + uri "https://download.docker.com/linux/ubuntu" + arch "amd64" + components ["stable"] + key "https://download.docker.com/linux/ubuntu/gpg" end package "unattended-upgrades"