Drop separate parsoid service for mediawiki

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 06b81b89819329a52755f5667a64b82c03949417..f0a2c28915d77640584c357a38d61ef0c998d65e 100644 (file)
--- 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"
 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
 end
 
 apt_repository "management-component-pack" do


@@ -182,6 +168,13 @@ apt_repository "grafana" do
   key "https://packages.grafana.com/gpg.key"
 end
 
   key "https://packages.grafana.com/gpg.key"
 end
 

+apt_repository "timescaledb" do
+  action repository_actions["timescaledb"]
+  uri "https://packagecloud.io/timescale/timescaledb/ubuntu"
+  components ["main"]
+  key "https://packagecloud.io/timescale/timescaledb/gpgkey"
+end
+

 package "unattended-upgrades"
 
 if Dir.exist?("/usr/share/unattended-upgrades")
 package "unattended-upgrades"
 
 if Dir.exist?("/usr/share/unattended-upgrades")