kosmos/chef
8
3
Fork 0
Code Issues 34 Pull Requests 3 Projects 2 Activity

Update apt cookbook

Browse Source
This commit is contained in:
Greg Karékinian
2018-04-17 13:43:22 +02:00
parent 6a86fc64fa
commit b92cc6e5d7
21 changed files with 833 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
cookbooks/apt/recipes/cacher-client.rb
View File

@@ -1,8 +1,8 @@
#
# Cookbook Name:: apt
# Cookbook:: apt
# Recipe:: cacher-client
#
# Copyright 2011-2013 Chef Software, Inc.
# Copyright:: 2011-2017, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,10 +17,6 @@
# limitations under the License.
#
class ::Chef::Recipe
include ::Apt
end
# remove Acquire::http::Proxy lines from /etc/apt/apt.conf since we use 01proxy
# these are leftover from preseed installs
execute 'Remove proxy from /etc/apt/apt.conf' do
@@ -28,56 +24,29 @@ execute 'Remove proxy from /etc/apt/apt.conf' do
only_if 'grep Acquire::http::Proxy /etc/apt/apt.conf'
end
servers = []
if node['apt']
if node['apt']['cacher_ipaddress']
cacher = Chef::Node.new
cacher.default.name = node['apt']['cacher_ipaddress']
cacher.default.ipaddress = node['apt']['cacher_ipaddress']
cacher.default.apt.cacher_port = node['apt']['cacher_port']
cacher.default.apt.cacher_interface = node['apt']['cacher_interface']
cacher.default.apt.cacher_ssl_support = node['apt']['cacher_ssl_support']
servers << cacher
elsif node['apt']['caching_server']
node.override['apt']['compiletime'] = false
servers << node
if node['apt']['cacher_client']['cacher_server'].empty?
Chef::Log.warn("No cache server defined in node['apt']['cacher_client']['cacher_server']. Not setting up caching")
f = file '/etc/apt/apt.conf.d/01proxy' do
action(node['apt']['compiletime'] ? :nothing : :delete)
end
end
unless Chef::Config[:solo] || servers.length > 0
query = 'apt_caching_server:true'
query += " AND chef_environment:#{node.chef_environment}" if node['apt']['cacher-client']['restrict_environment']
Chef::Log.debug("apt::cacher-client searching for '#{query}'")
servers += search(:node, query)
end
if servers.length > 0
Chef::Log.info("apt-cacher-ng server found on #{servers[0]}.")
if servers[0]['apt']['cacher_interface']
cacher_ipaddress = interface_ipaddress(servers[0], servers[0]['apt']['cacher_interface'])
else
cacher_ipaddress = servers[0].ipaddress
f.run_action(:delete) if node['apt']['compiletime']
else
apt_update 'update for notification' do
action :nothing
end
t = template '/etc/apt/apt.conf.d/01proxy' do
source '01proxy.erb'
owner 'root'
group 'root'
mode 00644
mode '0644'
variables(
proxy: cacher_ipaddress,
port: servers[0]['apt']['cacher_port'],
proxy_ssl: servers[0]['apt']['cacher_ssl_support'],
bypass: node['apt']['cache_bypass']
server: node['apt']['cacher_client']['cacher_server']
)
action(node['apt']['compiletime'] ? :nothing : :create)
notifies :run, 'execute[apt-get update]', :immediately
notifies :update, 'apt_update[update for notification]', :immediately
end
t.run_action(:create) if node['apt']['compiletime']
else
Chef::Log.info('No apt-cacher-ng server found.')
file '/etc/apt/apt.conf.d/01proxy' do
action :delete
end
end
include_recipe 'apt::default'

14
cookbooks/apt/recipes/cacher-ng.rb
View File

@@ -1,8 +1,8 @@
#
# Cookbook Name:: apt
# Cookbook:: apt
# Recipe:: cacher-ng
#
# Copyright 2008-2013, Chef Software, Inc.
# Copyright:: 2008-2017, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -17,23 +17,19 @@
# limitations under the License.
#
node.set['apt']['caching_server'] = true
package 'apt-cacher-ng' do
action :install
end
package 'apt-cacher-ng'
directory node['apt']['cacher_dir'] do
owner 'apt-cacher-ng'
group 'apt-cacher-ng'
mode 0755
mode '0755'
end
template '/etc/apt-cacher-ng/acng.conf' do
source 'acng.conf.erb'
owner 'root'
group 'root'
mode 00644
mode '0644'
notifies :restart, 'service[apt-cacher-ng]', :immediately
end

64
cookbooks/apt/recipes/default.rb
View File

@@ -1,9 +1,9 @@
#
# Cookbook Name:: apt
# Cookbook:: apt
# Recipe:: default
#
# Copyright 2008-2013, Chef Software, Inc.
# Copyright 2009, Bryan McLellan <btm@loftninjas.org>
# Copyright:: 2008-2017, Chef Software, Inc.
# Copyright:: 2009-2017, Bryan McLellan <btm@loftninjas.org>
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -23,90 +23,76 @@
# or other cookbooks which notify these resources will fail on non-apt-enabled
# systems.
Chef::Log.debug 'apt is not installed. Apt-specific resources will not be executed.' unless apt_installed?
first_run_file = File.join(Chef::Config[:file_cache_path], 'apt_compile_time_update_first_run')
file '/var/lib/apt/periodic/update-success-stamp' do
owner 'root'
group 'root'
only_if { apt_installed? }
action :nothing
end
# If compile_time_update run apt-get update at compile time
if node['apt']['compile_time_update'] && (!apt_up_to_date? || !::File.exist?(first_run_file))
e = bash 'apt-get-update at compile time' do
code <<-EOH
apt-get update
touch #{first_run_file}
EOH
if node['apt']['compile_time_update'] && apt_installed?
apt_update('compile time') do
frequency node['apt']['periodic_update_min_delay']
ignore_failure true
only_if { apt_installed? }
action :nothing
notifies :touch, 'file[/var/lib/apt/periodic/update-success-stamp]', :immediately
end
e.run_action(:run)
end.run_action(:periodic)
end
# Updates 'apt-get update' timestamp after each update success
directory '/etc/apt/apt.conf.d' do
recursive true
end
cookbook_file '/etc/apt/apt.conf.d/15update-stamp' do
source '15update-stamp'
apt_update 'periodic' do
frequency node['apt']['periodic_update_min_delay']
end
# For other recipes to call to force an update
execute 'apt-get update' do
command 'apt-get update'
ignore_failure true
only_if { apt_installed? }
action :nothing
notifies :touch, 'file[/var/lib/apt/periodic/update-success-stamp]', :immediately
only_if { apt_installed? }
end
# Automatically remove packages that are no longer needed for dependencies
execute 'apt-get autoremove' do
command 'apt-get -y autoremove'
only_if { apt_installed? }
environment(
'DEBIAN_FRONTEND' => 'noninteractive'
)
action :nothing
only_if { apt_installed? }
end
# Automatically remove .deb files for packages no longer on your system
execute 'apt-get autoclean' do
command 'apt-get -y autoclean'
only_if { apt_installed? }
action :nothing
end
execute 'apt-get-update-periodic' do
command 'apt-get update'
ignore_failure true
only_if { apt_installed? }
not_if { apt_up_to_date? }
notifies :touch, 'file[/var/lib/apt/periodic/update-success-stamp]', :immediately
end
%w(/var/cache/local /var/cache/local/preseeding).each do |dirname|
directory dirname do
owner 'root'
group 'root'
mode 00755
mode '0755'
action :create
only_if { apt_installed? }
end
end
template '/etc/apt/apt.conf.d/10dpkg-options' do
owner 'root'
group 'root'
mode '0644'
source '10dpkg-options.erb'
only_if { apt_installed? }
end
template '/etc/apt/apt.conf.d/10recommends' do
owner 'root'
group 'root'
mode '644'
mode '0644'
source '10recommends.erb'
only_if { apt_installed? }
end
package 'apt-transport-https' do
only_if { apt_installed? }
action :install
end

10
cookbooks/apt/recipes/unattended-upgrades.rb
View File

@@ -1,8 +1,8 @@
#
# Cookbook Name:: apt
# Cookbook:: apt
# Recipe:: unattended-upgrades
#
# Copyright 2014, Chef Software, Inc.
# Copyright:: 2014-2017, Chef Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the 'License');
# you may not use this file except in compliance with the License.
@@ -29,19 +29,19 @@ package 'unattended-upgrades' do
end
package 'bsd-mailx' do
only_if { node['apt']['unattended_upgrades']['mail'] }
not_if { node['apt']['unattended_upgrades']['mail'].nil? }
end
template '/etc/apt/apt.conf.d/20auto-upgrades' do
owner 'root'
group 'root'
mode '644'
mode '0644'
source '20auto-upgrades.erb'
end
template '/etc/apt/apt.conf.d/50unattended-upgrades' do
owner 'root'
group 'root'
mode '644'
mode '0644'
source '50unattended-upgrades.erb'
end