Add alerts for rasdaemon events

[chef.git] / cookbooks / apt / recipes / default.rb

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 1a8eb60c7c2cedde2ea59e01b5e334fa493af840..7619d0a9c4cc018545f5ae460f9a2f37e6fc4151 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -58,11 +58,6 @@ repository_actions = Hash.new do |_, repository|
   node[:apt][:sources].include?(repository) ? :add : :remove
 end
 
   node[:apt][:sources].include?(repository) ? :add : :remove
 end
 

-apt_repository "brightbox-ruby-ng" do
-  action repository_actions["brightbox-ruby-ng"]
-  uri "ppa:brightbox/ruby-ng"
-end
-

 apt_repository "ubuntugis-stable" do
   action repository_actions["ubuntugis-stable"]
   uri "ppa:ubuntugis/ppa"
 apt_repository "ubuntugis-stable" do
   action repository_actions["ubuntugis-stable"]
   uri "ppa:ubuntugis/ppa"


@@ -112,17 +107,17 @@ apt_repository "nginx" do
   key "ABF5BD827BD9BF62"
 end
 
   key "ABF5BD827BD9BF62"
 end
 

-apt_repository "elasticsearch5.x" do
-  action repository_actions["elasticsearch5.x"]
-  uri "https://artifacts.elastic.co/packages/5.x/apt"
+apt_repository "elasticsearch6.x" do
+  action repository_actions["elasticsearch6.x"]
+  uri "https://artifacts.elastic.co/packages/6.x/apt"

   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"
 end
 
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"
 end
 

-apt_repository "elasticsearch6.x" do
-  action repository_actions["elasticsearch6.x"]
-  uri "https://artifacts.elastic.co/packages/6.x/apt"
+apt_repository "elasticsearch8.x" do
+  action repository_actions["elasticsearch8.x"]
+  uri "https://artifacts.elastic.co/packages/8.x/apt"

   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"
   distribution "stable"
   components ["main"]
   key "D27D666CD88E42B4"


@@ -143,14 +138,6 @@ apt_repository "postgresql" do
   key "7FCC7D46ACCC4CF8"
 end
 
   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"
 apt_repository "docker" do
   action repository_actions["docker"]
   uri "https://download.docker.com/linux/ubuntu"