Permalink
Browse files

use apt-cacher-ng instead of apt-cacher. apt-cacher-ng works better w…

…ith mixed Debian & Ubuntu repos and supposedly scales better
  • Loading branch information...
1 parent cc0551d commit 49ef0865217ecbd6d5227dc2d2cfb4fdf1479397 @mattray mattray committed Feb 6, 2012
View
@@ -1,11 +1,15 @@
Description
===========
-This cookbook includes recipes to execute apt-get update to ensure the local APT package cache is up to date or manage apt-cacher and cacher clients. It also includes a LWRP for managing APT repositories in /etc/apt/sources.list.d.
+This cookbook includes recipes to execute apt-get update to ensure the local APT package cache is up to date. There are recipes for managing the apt-cacher-ng caching proxy and proxy clients. It also includes a LWRP for managing APT repositories in /etc/apt/sources.list.d.
Changes
=======
+## v1.3.0:
+
+* COOK-593: switched from apt-cacher to apt-cacher-ng to better support multiple distributions.
+
## v1.2.2:
* COOK-804: apt-get update resource in apt cookbook changed names
@@ -28,14 +32,14 @@ This recipe should appear first in the run list of Debian or Ubuntu nodes to ens
This recipe also sets up a local cache directory for preseeding packages.
-cacher
-------
+cacher-ng
+---------
-Installs the apt-cacher package and service so the system can provide APT caching. You can check the usage report at http://{hostname}:3142/report. The cacher recipe includes the `cacher-client` recipe, so it helps seed itself.
+Installs the `apt-cacher-ng` package and service so the system can provide APT caching. You can check the usage report at http://{hostname}:3142/acng-report.html. The `cacher-ng` recipe includes the `cacher-client` recipe, so it helps seed itself.
cacher-client
-------------
-Configures the node to use the apt-cacher server as a client.
+Configures the node to use the `apt-cacher-ng` server as a client.
Resources/Providers
===================
@@ -64,7 +68,7 @@ This LWRP provides an easy way to manage additional APT repositories. Adding a n
uri "http://dev.zenoss.org/deb"
components ["main","stable"]
end
-
+
# add the Nginx PPA; grab key from keyserver
apt_repository "nginx-php" do
uri "http://ppa.launchpad.net/nginx/php5/ubuntu"
@@ -73,20 +77,20 @@ This LWRP provides an easy way to manage additional APT repositories. Adding a n
keyserver "keyserver.ubuntu.com"
key "C300EE8C"
end
-
+
# add the Cloudkick Repo
apt_repository "cloudkick" do
uri "http://packages.cloudkick.com/ubuntu"
distribution node['lsb']['codename']
components ["main"]
key "http://packages.cloudkick.com/cloudkick.packages.key"
end
-
+
# remove Zenoss repo
apt_repository "zenoss" do
action :remove
end
-
+
Usage
=====
@@ -98,7 +102,7 @@ Put `recipe[apt]` first in the run list. If you have other recipes that you want
The above will run during execution phase since it is a normal template resource, and should appear before other package resources that need the sources in the template.
-Put `recipe[apt::cacher]` in the run_list for a server to provide APT caching and add `recipe[apt::cacher-client]` on the rest of the Debian-based nodes to take advantage of the caching server.
+Put `recipe[apt::cacher-ng]` in the run_list for a server to provide APT caching and add `recipe[apt::cacher-client]` on the rest of the Debian-based nodes to take advantage of the caching server.
License and Author
==================
@@ -107,7 +111,7 @@ Author:: Joshua Timberman (<joshua@opscode.com>)
Author:: Matt Ray (<matt@opscode.com>)
Author:: Seth Chisamore (<schisamo@opscode.com>)
-Copyright 2009-2011 Opscode, Inc.
+Copyright 2009-2012 Opscode, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -120,4 +124,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
@@ -1,9 +0,0 @@
-# apt-cacher startup configuration file
-
-# IMPORTANT: check the apt-cacher.conf file before using apt-cacher as daemon.
-
-# set to 1 to start the daemon at boot time
-AUTOSTART=1
-
-# extra settings to override the ones in apt-cacher.conf
-# EXTRAOPT=" daemon_port=3142 limit=30 "
@@ -1,144 +0,0 @@
-# This file has been modified by ./apt-proxy-to-apt-cacher
-# Some lines may have been appended at the bottom of this file
-# This file has been modified by /usr/share/apt-cacher/apt-proxy-to-apt-cacher
-# Some lines may have been appended at the bottom of this file
-#################################################################
-# This is the config file for apt-cacher. On most Debian systems
-# you can safely leave the defaults alone.
-#################################################################
-
-# cache_dir is used to set the location of the local cache. This can
-# become quite large, so make sure it is somewhere with plenty of space.
-cache_dir=/var/cache/apt-cacher
-
-# The email address of the administrator is displayed in the info page
-# and traffic reports.
-admin_email=root@localhost
-
-# For the daemon startup settings please edit the file /etc/default/apt-cacher.
-
-# Daemon port setting, only useful in stand-alone mode. You need to run the
-# daemon as root to use privileged ports (<1024).
-daemon_port = 3142
-
-# optional settings, user and group to run the daemon as. Make sure they have
-# sufficient permissions on the cache and log directories. Comment the settings
-# to run apt-cacher as the native user.
-group=www-data
-user=www-data
-
-# optional setting, binds the listening daemon to one specified IP. Use IP
-# ranges for more advanced configuration, see below.
-# daemon_addr=localhost
-
-# If your apt-cacher machine is directly exposed to the Internet and you are
-# worried about unauthorised machines fetching packages through it, you can
-# specify a list of IPv4 addresses which are allowed to use it and another
-# list of IPv4 addresses which aren't.
-# Localhost (127.0.0.1) is always allowed. Other addresses must be matched
-# by allowed_hosts and not by denied_hosts to be permitted to use the cache.
-# Setting allowed_hosts to "*" means "allow all".
-# Otherwise the format is a comma-separated list containing addresses,
-# optionally with masks (like 10.0.0.0/22), or ranges of addresses (two
-# addresses separated by a hyphen, no masks, like '192.168.0.3-192.168.0.56').
-allowed_hosts=*
-denied_hosts=
-
-# And similiarly for IPv6 with allowed_hosts_6 and denied_hosts_6.
-# Note that IPv4-mapped IPv6 addresses (::ffff:w.x.y.z) are truncated to
-# w.x.y.z and are handled as IPv4.
-allowed_hosts_6=fec0::/16
-denied_hosts_6=
-
-# This thing can be done by Apache but is much simplier here - limit access to
-# Debian mirrors based on server names in the URLs
-#allowed_locations=ftp.uni-kl.de,ftp.nerim.net,debian.tu-bs.de
-
-# Apt-cacher can generate usage reports every 24 hours if you set this
-# directive to 1. You can view the reports in a web browser by pointing
-# to your cache machine with '/apt-cacher/report' on the end, like this:
-# http://yourcache.example.com/apt-cacher/report
-# Generating reports is very fast even with many thousands of logfile
-# lines, so you can safely turn this on without creating much
-# additional system load.
-generate_reports=1
-
-# Apt-cacher can clean up its cache directory every 24 hours if you set
-# this directive to 1. Cleaning the cache can take some time to run
-# (generally in the order of a few minutes) and removes all package
-# files that are not mentioned in any existing 'Packages' lists. This
-# has the effect of deleting packages that have been superseded by an
-# updated 'Packages' list.
-clean_cache=1
-
-# The directory to use for apt-cacher access and error logs.
-# The access log records every request in the format:
-# date-time|client ip address|HIT/MISS/EXPIRED|object size|object name
-# The error log is slightly more free-form, and is also used for debug
-# messages if debug mode is turned on.
-# Note that the old 'logfile' and 'errorfile' directives are
-# deprecated: if you set them explicitly they will be honoured, but it's
-# better to just get rid of them from old config files.
-logdir=/var/log/apt-cacher
-
-# apt-cacher can use different methods to decide whether package lists need to
-# be updated,
-# A) looking at the age of the cached files
-# B) getting HTTP header from server and comparing that with cached data. This
-# method is more reliable and avoids desynchronisation of data and index files
-# but needs to transfer few bytes from the server every time somebody requests
-# the files ("apt-get update")
-# Set the following value to the maximum age (in hours) for method A or to 0
-# for method B
-expire_hours=0
-
-# Apt-cacher can pass all its requests to an external http proxy like
-# Squid, which could be very useful if you are using an ISP that blocks
-# port 80 and requires all web traffic to go through its proxy. The
-# format is 'hostname:port', eg: 'proxy.example.com:8080'.
-http_proxy=proxy.example.com:8080
-
-# Use of an external proxy can be turned on or off with this flag.
-# Value should be either 0 (off) or 1 (on).
-use_proxy=0
-
-# External http proxy sometimes need authentication to get full access. The
-# format is 'username:password'.
-http_proxy_auth=proxyuser:proxypass
-
-# Use of external proxy authentication can be turned on or off with this flag.
-# Value should be either 0 (off) or 1 (on).
-use_proxy_auth=0
-
-# Rate limiting sets the maximum bandwidth in bytes per second to use
-# for fetching packages. Syntax is fully defined in 'man wget'.
-# Use 'k' or 'm' to use kilobits or megabits / second: eg, 'limit=25k'.
-# Use 0 or a negative value for no rate limiting.
-limit=0
-
-# Debug mode makes apt-cacher spew a lot of extra debug junk to the
-# error log (whose location is defined with the 'logdir' directive).
-# Leave this off unless you need it, or your error log will get very
-# big. Acceptable values are 0 or 1.
-debug=0
-
-# Adapt the line in the usage info web page to match your server configuration
-# example_sources_line=deb&nbsp;http://<b>my.cacher.server:3142/</b>ftp.au.debian.org/debian&nbsp;unstable&nbsp;main&nbsp;contrib&nbsp;non-free
-
-# Print a 410 (Gone) HTTP message with the specified text when accessed via
-# CGI. Useful to tell users to adapt their sources.list files when the
-# apt-cacher server is beeing relocated (via apt-get's error messages while
-# running "update")
-#cgi_advise_to_use = Please use http://cacheserver:3142/ as apt-cacher access URL
-#cgi_advise_to_use = Server relocated. To change sources.list, run perl -pe "s,/apt-cacher\??,:3142," -i /etc/apt/sources.list
-
-# Server mapping - this allows to hide real server names behind virtual paths
-# that appear in the access URL. This method is known from apt-proxy. This is
-# also the only method to use FTP access to the target hosts. The syntax is simple, the part of the beginning to replace, followed by a list of mirror urls, all space separated. Multiple profile are separated by semicolons
-# path_map = debian ftp.uni-kl.de/pub/linux/debian ftp2.de.debian.org/debian ; ubuntu archive.ubuntu.com/ubuntu ; security security.debian.org/debian-security ftp2.de.debian.org/debian-security
-# Note that you need to specify all target servers in the allowed_locations
-# options if you make use of it. Also note that the paths should not overlap
-# each other. FTP access method not supported yet, maybe in the future.
-
-# extra setting from apt-proxy configuration
-path_map = ubuntu us.archive.ubuntu.com/ubuntu ; ubuntu-security security.ubuntu.com/ubuntu ; debian debian.osuosl.org/debian/ ; security security.debian.org/debian-security
View
@@ -3,10 +3,10 @@
license "Apache 2.0"
description "Configures apt and apt services and an LWRP for managing apt repositories"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.2.2"
+version "1.3.0"
recipe "apt", "Runs apt-get update during compile phase and sets up preseed directories"
-recipe "apt::cacher", "Set up an APT cache"
-recipe "apt::cacher-client", "Client for the apt::cacher server"
+recipe "apt::cacher-ng", "Set up an apt-cacher-ng caching proxy"
+recipe "apt::cacher-client", "Client for the apt::cacher-ng caching proxy"
%w{ ubuntu debian }.each do |os|
supports os
@@ -2,7 +2,7 @@
# Cookbook Name:: apt
# Recipe:: cacher-client
#
-# Copyright 2011, Opscode, Inc.
+# Copyright 2011, 2012 Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -33,11 +33,11 @@
servers << cacher
end
else
- servers += search(:node, 'recipes:apt\:\:cacher')
+ servers += search(:node, 'recipes:apt\:\:cacher-ng')
end
if servers.length > 0
- Chef::Log.info("apt-cacher server found on #{servers[0]}.")
+ Chef::Log.info("apt-cacher-ng server found on #{servers[0]}.")
proxy = "Acquire::http::Proxy \"http://#{servers[0].ipaddress}:3142\";\n"
file "/etc/apt/apt.conf.d/01proxy" do
owner "root"
@@ -47,7 +47,7 @@
action :create
end
else
- Chef::Log.info("No apt-cacher server found.")
+ Chef::Log.info("No apt-cacher-ng server found.")
file "/etc/apt/apt.conf.d/01proxy" do
action :delete
only_if {File.exists?("/etc/apt/apt.conf.d/01proxy")}
@@ -1,8 +1,8 @@
#
# Cookbook Name:: apt
-# Recipe:: cacher
+# Recipe:: cacher-ng
#
-# Copyright 2008-2011, Opscode, Inc.
+# Copyright 2008-2012, Opscode, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,30 +16,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-package "apt-cacher" do
+
+package "apt-cacher-ng" do
action :install
end
-service "apt-cacher" do
+service "apt-cacher-ng" do
supports :restart => true, :status => false
action [ :enable, :start ]
end
-cookbook_file "/etc/apt-cacher/apt-cacher.conf" do
- source "apt-cacher.conf"
- owner "root"
- group "root"
- mode 0644
- notifies :restart, resources(:service => "apt-cacher")
-end
-
-cookbook_file "/etc/default/apt-cacher" do
- source "apt-cacher"
- owner "root"
- group "root"
- mode 0644
- notifies :restart, resources(:service => "apt-cacher")
-end
-
#this will help seed the proxy
include_recipe "apt::cacher-client"

0 comments on commit 49ef086

Please sign in to comment.