Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add new apt cookbook

  • Loading branch information...
commit beae90583eed348b84fb5ff99eb235ae911be937 1 parent b7ab03f
@jsierles authored
View
5 apt/CHANGELOG.md
@@ -0,0 +1,5 @@
+## v1.4.0:
+
+* [COOK-889] - overwrite existing repo source files
+* [COOK-921] - optionally use cookbook\_file or remote\_file for key
+* [COOK-1032] - fixes problem with apt repository key installation
View
29 apt/CONTRIBUTING
@@ -0,0 +1,29 @@
+If you would like to contribute, please open a ticket in JIRA:
+
+* http://tickets.opscode.com
+
+Create the ticket in the COOK project and use the cookbook name as the
+component.
+
+For all code contributions, we ask that contributors sign a
+contributor license agreement (CLA). Instructions may be found here:
+
+* http://wiki.opscode.com/display/chef/How+to+Contribute
+
+When contributing changes to individual cookbooks, please do not
+modify the version number in the metadata.rb. Also please do not
+update the CHANGELOG.md for a new version. Not all changes to a
+cookbook may be merged and released in the same versions. Opscode will
+handle the version updates during the release process. You are welcome
+to correct typos or otherwise make updates documentation in the
+README.
+
+If a contribution adds new platforms or platform versions, indicate
+such in the body of the commit message(s), and update the relevant
+COOK ticket. When writing commit messages, it is helpful for others if
+you indicate the COOK ticket. For example:
+
+ git commit -m '[COOK-1041] Updated pool resource to correctly delete.'
+
+In the ticket itself, it is also helpful if you include log output of
+a successful Chef run, but this is not absolutely required.
View
201 apt/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
View
142 apt/README.md
@@ -0,0 +1,142 @@
+Description
+===========
+
+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.
+
+Recipes
+=======
+
+default
+-------
+
+This recipe installs the `update-notifier-common` package to provide
+the timestamp file used to only run `apt-get update` if the cache is
+less than one day old.
+
+This recipe should appear first in the run list of Debian or Ubuntu
+nodes to ensure that the package cache is up to date before managing
+any `package` resources with Chef.
+
+This recipe also sets up a local cache directory for preseeding packages.
+
+cacher-ng
+---------
+
+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-ng` server as a client.
+
+Resources/Providers
+===================
+
+This LWRP provides an easy way to manage additional APT repositories.
+Adding a new repository will notify running the
+`execute[apt-get-update]` resource.
+
+# Actions
+
+- :add: creates a repository file and builds the repository listing
+- :remove: removes the repository file
+
+# Attribute Parameters
+
+- repo_name: name attribute. The name of the channel to discover
+- uri: the base of the Debian distribution
+- distribution: this is usually your release's codename...ie something
+ like `karmic`, `lucid` or `maverick`
+- components: package groupings..when it doubt use `main`
+- deb_src: whether or not to add the repository as a source repo as well
+- key_server: the GPG keyserver where the key for the repo should be retrieved
+- key: if a `key_server` is provided, this is assumed to be the
+ fingerprint, otherwise it can be either the URI to the GPG key for
+ the repo, or a cookbook_file.
+- cookbook: if key should be a cookbook_file, specify a cookbook where
+ the key is located for files/default. Defaults to nil, so it will
+ use the cookbook where the resource is used.
+
+# Examples
+
+ # add the Zenoss repo
+ apt_repository "zenoss" do
+ 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"
+ distribution node['lsb']['codename']
+ components ["main"]
+ 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
+
+ # add the Cloudkick Repo with the key downloaded in the cookbook
+ apt_repository "cloudkick" do
+ uri "http://packages.cloudkick.com/ubuntu"
+ distribution node['lsb']['codename']
+ components ["main"]
+ key "cloudkick.packages.key"
+ end
+
+
+ # remove Zenoss repo
+ apt_repository "zenoss" do
+ action :remove
+ end
+
+Usage
+=====
+
+Put `recipe[apt]` first in the run list. If you have other recipes
+that you want to use to configure how apt behaves, like new sources,
+notify the execute resource to run, e.g.:
+
+ template "/etc/apt/sources.list.d/my_apt_sources.list" do
+ notifies :run, resources(:execute => "apt-get update"), :immediately
+ end
+
+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-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
+==================
+
+Author:: Joshua Timberman (<joshua@opscode.com>)
+Author:: Matt Ray (<matt@opscode.com>)
+Author:: Seth Chisamore (<schisamo@opscode.com>)
+
+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.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+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.
View
50 apt/files/default/apt-proxy-v2.conf
@@ -0,0 +1,50 @@
+[DEFAULT]
+;; All times are in seconds, but you can add a suffix
+;; for minutes(m), hours(h) or days(d)
+
+;; commented out address so apt-proxy will listen on all IPs
+;; address = 127.0.0.1
+port = 9999
+cache_dir = /var/cache/apt-proxy
+
+;; Control files (Packages/Sources/Contents) refresh rate
+min_refresh_delay = 1s
+complete_clientless_downloads = 1
+
+;; Debugging settings.
+debug = all:4 db:0
+
+time = 30
+passive_ftp = on
+
+;;--------------------------------------------------------------
+;; Cache housekeeping
+
+cleanup_freq = 1d
+max_age = 120d
+max_versions = 3
+
+;;---------------------------------------------------------------
+;; Backend servers
+;;
+;; Place each server in its own [section]
+
+[ubuntu]
+; Ubuntu archive
+backends =
+ http://us.archive.ubuntu.com/ubuntu
+
+[ubuntu-security]
+; Ubuntu security updates
+backends = http://security.ubuntu.com/ubuntu
+
+[debian]
+;; Backend servers, in order of preference
+backends =
+ http://debian.osuosl.org/debian/
+
+[security]
+;; Debian security archive
+backends =
+ http://security.debian.org/debian-security
+ http://ftp2.de.debian.org/debian-security
View
35 apt/files/default/launchpad-update.sh
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-# Simple script to check for all PPAs refernced in your apt sources and
-# to grab any signing keys you are missing from keyserver.ubuntu.com.
-# Additionally copes with users on launchpad with multiple PPAs
-# (e.g., ~asac)
-#
-# Author: Dominic Evans https://launchpad.net/~oldman
-# License: LGPL v2
-
-for APT in `find /etc/apt/ -name *.list`; do
- grep -o "^deb http://ppa.launchpad.net/[a-z0-9\-]\+/[a-z0-9\-]\+" $APT | while read ENTRY ; do
- # work out the referenced user and their ppa
- USER=`echo $ENTRY | cut -d/ -f4`
- PPA=`echo $ENTRY | cut -d/ -f5`
- # some legacy PPAs say 'ubuntu' when they really mean 'ppa', fix that up
- if [ "ubuntu" = "$PPA" ]
- then
- PPA=ppa
- fi
- # scrape the ppa page to get the keyid
- KEYID=`wget -q --no-check-certificate https://launchpad.net/~$USER/+archive/$PPA -O- | grep -o "1024R/[A-Z0-9]\+" | cut -d/ -f2`
- sudo apt-key adv --list-keys $KEYID >/dev/null 2>&1
- if [ $? != 0 ]
- then
- echo Grabbing key $KEYID for archive $PPA by ~$USER
- sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $KEYID
- else
- echo Already have key $KEYID for archive $PPA by ~$USER
- fi
- done
-done
-
-echo DONE
-
View
17 apt/metadata.rb
@@ -1,4 +1,13 @@
-maintainer "Joshua Sierles"
-maintainer_email "joshua@diluvia.net"
-description "Configures apt"
-version "0.2"
+maintainer "Opscode, Inc."
+maintainer_email "cookbooks@opscode.com"
+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.4.2"
+recipe "apt", "Runs apt-get update during compile phase and sets up preseed directories"
+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
+end
View
114 apt/providers/repository.rb
@@ -0,0 +1,114 @@
+#
+# Cookbook Name:: apt
+# Provider:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+# install apt key from keyserver
+def install_key_from_keyserver(key, keyserver)
+ unless system("apt-key list | grep #{key}")
+ execute "install-key #{key}" do
+ command "apt-key adv --keyserver #{keyserver} --recv #{key}"
+ action :nothing
+ end.run_action(:run)
+ new_resource.updated_by_last_action(true)
+ end
+end
+
+# install apt key from URI
+def install_key_from_uri(uri)
+ key_name = uri.split(/\//).last
+ cached_keyfile = "#{Chef::Config[:file_cache_path]}/#{key_name}"
+ if (new_resource.key =~ /http/)
+ r = remote_file cached_keyfile do
+ source new_resource.key
+ mode "0644"
+ action :nothing
+ end
+ else
+ r = cookbook_file cached_keyfile do
+ source new_resource.key
+ cookbook new_resource.cookbook
+ mode "0644"
+ action :nothing
+ end
+ end
+
+ r.run_action(:create)
+
+ execute "install-key #{key_name}" do
+ command "apt-key add #{cached_keyfile}"
+ action :nothing
+ end.run_action(:run)
+ new_resource.updated_by_last_action(true)
+end
+
+# build repo file contents
+def build_repo(uri, distribution, components, add_deb_src)
+ components = components.join(' ') if components.respond_to?(:join)
+ repo_info = "#{uri} #{distribution} #{components}\n"
+ repo = "deb #{repo_info}"
+ repo << "deb-src #{repo_info}" if add_deb_src
+ repo
+end
+
+action :add do
+ new_resource.updated_by_last_action(false)
+
+ # add key
+ if new_resource.keyserver && new_resource.key
+ install_key_from_keyserver(new_resource.key, new_resource.keyserver)
+ elsif new_resource.key
+ install_key_from_uri(new_resource.key)
+ end
+
+ # build repo file
+ repository = build_repo(new_resource.uri,
+ new_resource.distribution,
+ new_resource.components,
+ new_resource.deb_src)
+
+ repo_file = file "/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list" do
+ owner "root"
+ group "root"
+ mode 0644
+ content repository
+ action :nothing
+ end
+
+ # write out the repo file, replace it if it already exists
+ repo_file.run_action(:create)
+
+ apt_get_update = execute "apt-get update" do
+ ignore_failure true
+ action :nothing
+ end
+
+ if repo_file.updated_by_last_action?
+ new_resource.updated_by_last_action(true)
+ apt_get_update.run_action(:run)
+ end
+end
+
+action :remove do
+ if ::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
+ Chef::Log.info "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/"
+ file "/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list" do
+ action :delete
+ end
+ new_resource.updated_by_last_action(true)
+ end
+end
View
55 apt/recipes/cacher-client.rb
@@ -0,0 +1,55 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-client
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+#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
+ command "sed --in-place '/^Acquire::http::Proxy/d' /etc/apt/apt.conf"
+ only_if "grep Acquire::http::Proxy /etc/apt/apt.conf"
+end
+
+servers = []
+if Chef::Config['solo']
+ if node['apt'] && node['apt']['cacher_ipaddress']
+ cacher = Chef::Node.new
+ cacher.name(node['apt']['cacher_ipaddress'])
+ cacher.ipaddress(node['apt']['cacher_ipaddress'])
+ servers << cacher
+ end
+else
+ servers += search(:node, 'recipes:apt\:\:cacher-ng')
+end
+
+if servers.length > 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"
+ group "root"
+ mode "0644"
+ content proxy
+ action :create
+ end
+else
+ 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")}
+ end
+end
View
30 apt/recipes/cacher-ng.rb
@@ -0,0 +1,30 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-ng
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+package "apt-cacher-ng" do
+ action :install
+end
+
+service "apt-cacher-ng" do
+ supports :restart => true, :status => false
+ action [ :enable, :start ]
+end
+
+#this will help seed the proxy
+include_recipe "apt::cacher-client"
View
55 apt/recipes/default.rb
@@ -1,11 +1,56 @@
+#
+# Cookbook Name:: apt
+# Recipe:: default
+#
+# Copyright 2008-2011, Opscode, Inc.
+# Copyright 2009, 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+# Run apt-get update to create the stamp file
execute "apt-get-update" do
command "apt-get update"
+ ignore_failure true
+ not_if do ::File.exists?('/var/lib/apt/periodic/update-success-stamp') end
+end
+
+# For other recipes to call to force an update
+execute "apt-get update" do
+ command "apt-get update"
+ ignore_failure true
action :nothing
end
-# run this to grab GPG keys for enabled ppas
+# provides /var/lib/apt/periodic/update-success-stamp on apt-get update
+package "update-notifier-common" do
+ notifies :run, resources(:execute => "apt-get-update"), :immediately
+end
-cookbook_file "/usr/local/bin/launchpad-update" do
- source "launchpad-update.sh"
- mode 0755
-end
+execute "apt-get-update-periodic" do
+ command "apt-get update"
+ ignore_failure true
+ only_if do
+ File.exists?('/var/lib/apt/periodic/update-success-stamp') &&
+ File.mtime('/var/lib/apt/periodic/update-success-stamp') < Time.now - 86400
+ end
+end
+
+%w{/var/cache/local /var/cache/local/preseeding}.each do |dirname|
+ directory dirname do
+ owner "root"
+ group "root"
+ mode 0644
+ action :create
+ end
+end
View
11 apt/recipes/packages.rb
@@ -1,12 +1,9 @@
require_recipe 'apt'
-if node[:packages]
- node[:packages].each do |group, packages|
- Chef::Log.debug "Installing packages for package group, #{group}"
- packages.each do |name, options|
- package name do
- options.each { |opt, arg| send(opt.to_sym, arg) }
- end
+if node[:apt][:packages]
+ node[:apt][:packages].each do |group, packages|
+ packages.each do |name|
+ package name
end
end
end
View
11 apt/recipes/ppa.rb
@@ -1,11 +0,0 @@
-require_recipe 'apt'
-
-execute "launchpad-update" do
- command "/usr/local/bin/launchpad-update"
- action :nothing
-end
-
-template "/etc/apt/sources.list.d/ppas.list" do
- notifies :run, "execute[launchpad-update]", :immediately
- notifies :run, "execute[apt-get-update]", :immediately
-end
View
15 apt/recipes/sources.rb
@@ -0,0 +1,15 @@
+template "/etc/apt/sources.list" do
+ source "sources.list.erb"
+ owner "root"
+ group "root"
+ mode 0644
+ variables(:sources => node[:apt][:sources])
+end
+
+template "/etc/apt/preferences" do
+ source "preferences.erb"
+ owner "root"
+ group "root"
+ mode 0644
+ variables(:sources => node[:apt][:sources])
+end
View
36 apt/resources/repository.rb
@@ -0,0 +1,36 @@
+#
+# Cookbook Name:: apt
+# Resource:: repository
+#
+# Copyright 2010-2011, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+#
+
+actions :add, :remove
+
+def initialize(*args)
+ super
+ @action = :add
+end
+
+#name of the repo, used for source.list filename
+attribute :repo_name, :kind_of => String, :name_attribute => true
+attribute :uri, :kind_of => String
+attribute :distribution, :kind_of => String
+attribute :components, :kind_of => Array, :default => []
+#whether or not to add the repository as a source repo as well
+attribute :deb_src, :default => false
+attribute :keyserver, :kind_of => String, :default => nil
+attribute :key, :kind_of => String, :default => nil
+attribute :cookbook, :kind_of => String, :default => nil
View
4 apt/templates/default/ppas.list.erb
@@ -1,4 +0,0 @@
-<% @node[:apt][:ppas].each do |name| %>
-deb http://ppa.launchpad.net/<%= name %>/ubuntu lucid main
-deb-src http://ppa.launchpad.net/<%= name %>/ubuntu lucid main
-<% end %>
View
10 apt/templates/default/preferences.erb
@@ -0,0 +1,10 @@
+# generated by chef for <%= @node[:fqdn] %>
+
+<% @sources.each do |name,value| -%>
+<% if !value[:pinpriority].nil? -%>
+Package: *
+Pin: release a=<%= name %>
+Pin-Priority: <%= value[:pinpriority] %>
+
+<% end -%>
+<% end -%>
View
10 apt/templates/default/sources.list.erb
@@ -0,0 +1,10 @@
+# generated by chef for <%= @node[:fqdn] %>
+
+<% @sources.each do |name, value| -%>
+#<%= name %>
+deb <%= value[:url] %> <%= value[:dist] %> <%= value[:components].join(" ") %>
+<% if value[:srcpkgs] -%>
+deb-src <%= value[:url] %> <%= value[:dist] %> <%= value[:components].join(" ") %>
+<% end -%>
+
+<% end -%>
Please sign in to comment.
Something went wrong with that request. Please try again.