Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 802ab186a35bac1a04dc227a5af0096bd4ade571..6ab6afb7ecaf793a2a64777e30ef812f71608e31 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -32,7 +32,7 @@ template "/etc/apt/preferences.d/99-chef" do
   source "preferences.erb"
   owner "root"
   group "root"
   source "preferences.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 apt_update "/etc/apt/sources.list" do
 end
 
 apt_update "/etc/apt/sources.list" do


@@ -49,7 +49,7 @@ template "/etc/apt/sources.list" do
   source "sources.list.erb"
   owner "root"
   group "root"
   source "sources.list.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :archive_host => archive_host, :codename => node[:lsb][:codename]
   notifies :update, "apt_update[/etc/apt/sources.list]", :immediately
 end
   variables :archive_host => archive_host, :codename => node[:lsb][:codename]
   notifies :update, "apt_update[/etc/apt/sources.list]", :immediately
 end


@@ -106,7 +106,7 @@ end
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"
 apt_repository "management-component-pack" do
   action repository_actions["management-component-pack"]
   uri "https://downloads.linux.hpe.com/SDR/repo/mcp"

-  distribution "#{node[:lsb][:codename]}/current-gen9"
+  distribution "bionic/current-gen9"

   components ["non-free"]
   key "C208ADDE26C2B797"
 end
   components ["non-free"]
   key "C208ADDE26C2B797"
 end


@@ -174,6 +174,19 @@ apt_repository "docker" do
   key "https://download.docker.com/linux/ubuntu/gpg"
 end
 
   key "https://download.docker.com/linux/ubuntu/gpg"
 end
 

+apt_repository "grafana" do
+  action repository_actions["grafana"]
+  uri "https://packages.grafana.com/enterprise/deb"
+  distribution "stable"
+  components ["main"]
+  key "https://packages.grafana.com/gpg.key"
+end
+
+apt_repository "timescaledb" do
+  action repository_actions["timescaledb"]
+  uri "ppa:timescale/timescaledb-ppa"
+end
+

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


@@ -186,7 +199,7 @@ if Dir.exist?("/usr/share/unattended-upgrades")
   file "/etc/apt/apt.conf.d/20auto-upgrades" do
     user "root"
     group "root"
   file "/etc/apt/apt.conf.d/20auto-upgrades" do
     user "root"
     group "root"

-    mode 0o644
+    mode "644"

     content auto_upgrades
   end
 end
     content auto_upgrades
   end
 end


@@ -195,5 +208,5 @@ template "/etc/apt/apt.conf.d/60chef" do
   source "apt.conf.erb"
   owner "root"
   group "root"
   source "apt.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 end