Skip to content
This repository was archived by the owner on Jun 9, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
.sass-cache

/tmp/
/.env
/.env
/.vagrant
38 changes: 38 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

Vagrant.configure("2") do |config|
config.vm.box = "precise32"
config.vm.box_url = "http://files.vagrantup.com/precise32.box"

config.ssh.forward_agent = true

config.vm.network :forwarded_port, guest: 5000, host: 5000

config.vm.provision :chef_solo do |chef|
chef.cookbooks_path = ["chef/cookbooks"]
chef.add_recipe "apt"
chef.add_recipe "mysql"
chef.add_recipe "rvm::vagrant"
chef.add_recipe "rvm::system"
chef.json = {
:rvm => {
'user_installs' => [
{
'user' => 'vagrant',
'default_ruby' => 'ruby-1.9.2-p320',
'rubies' => ['1.9.2']
}
],
:rubies => [
"1.9.2"
],
:default_ruby => "ruby-1.9.2-p320",
:user_default_ruby => "ruby-1.9.2-p320",
'vagrant' => {
'system_chef_solo' => '/usr/local/ruby/bin/chef-solo'
}
}
}
end
end
14 changes: 14 additions & 0 deletions chef/cookbooks/apt/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.vagrant
Berksfile.lock
Gemfile.lock
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
.bundle
.cache
.kitchen
bin
.kitchen.local.yml
38 changes: 38 additions & 0 deletions chef/cookbooks/apt/.kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
driver_plugin: vagrant
driver_config:
require_chef_omnibus: true

platforms:
- name: ubuntu-12.04
driver_config:
box: canonical-ubuntu-12.04
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
run_list:
- recipe[apt]

- name: ubuntu-10.04
driver_config:
box: opscode-ubuntu-10.04
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
run_list:
- recipe[apt]

suites:
- name: default
run_list:
- recipe[minitest-handler]
- recipe[apt_test]
attributes: {}

- name: cacher-ng
run_list:
- recipe[minitest-handler]
- recipe[apt_test::cacher-ng]
attributes: {}

- name: lwrps
run_list:
- recipe[minitest-handler]
- recipe[apt_test::lwrps]
attributes: {}
8 changes: 8 additions & 0 deletions chef/cookbooks/apt/Berksfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
site :opscode

metadata

group :integration do
cookbook "minitest-handler"
cookbook "apt_test", :path => "./test/cookbooks/apt_test"
end
91 changes: 91 additions & 0 deletions chef/cookbooks/apt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
## v1.10.0:

### Improvement

- [COOK-2885]: Improvements for apt cache server search

### Bug

- [COOK-2441]: Apt recipe broken in new chef version
- [COOK-2660]: Create Debian 6.0 "squeeze" specific template for
apt-cacher-ng

## v1.9.2:

* [COOK-2631] - Create Ubuntu 10.04 specific template for apt-cacher-ng

## v1.9.0:

* [COOK-2185] - Proxy for apt-key
* [COOK-2338] - Support pinning by glob() or regexp

## v1.8.4:

* [COOK-2171] - Update README to clarify required Chef version: 10.18.0
or higher.

## v1.8.2:

* [COOK-2112] - need [] around "arch" in sources.list entries
* [COOK-2171] - fixes a regression in the notification

## v1.8.0:

* [COOK-2143] - Allow for a custom cacher-ng port
* [COOK-2171] - On `apt_repository.run_action(:add)` the source file
is not created.
* [COOK-2184] - apt::cacher-ng, use `cacher_port` attribute in
acng.conf

## v1.7.0:

* [COOK-2082] - add "arch" parameter to apt_repository LWRP

## v1.6.0:

* [COOK-1893] - `apt_preference` use "`package_name`" resource instead of "name"
* [COOK-1894] - change filename for sources.list.d files
* [COOK-1914] - Wrong dir permissions for /etc/apt/preferences.d/
* [COOK-1942] - README.md has wrong name for the keyserver attribute
* [COOK-2019] - create 01proxy before any other apt-get updates get executed

## v1.5.2:

* [COOK-1682] - use template instead of file resource in apt::cacher-client
* [COOK-1875] - cacher-client should be Environment-aware

## V1.5.0:

* [COOK-1500] - Avoid triggering apt-get update
* [COOK-1548] - Add execute commands for autoclean and autoremove
* [COOK-1591] - Setting up the apt proxy should leave https
connections direct
* [COOK-1596] - execute[apt-get-update-periodic] never runs
* [COOK-1762] - create /etc/apt/preferences.d directory
* [COOK-1776] - apt key check isn't idempotent

## v1.4.8:

* Adds test-kitchen support
* [COOK-1435] - repository lwrp is not idempotent with http key

## v1.4.6:

* [COOK-1530] - apt_repository isn't aware of update-success-stamp
file (also reverts COOK-1382 patch).

## v1.4.4:

* [COOK-1229] - Allow cacher IP to be set manually in non-Chef Solo
environments
* [COOK-1530] - Immediately update apt-cache when sources.list file is dropped off

## v1.4.2:

* [COOK-1155] - LWRP for apt pinning

## 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
29 changes: 29 additions & 0 deletions chef/cookbooks/apt/CONTRIBUTING
Original file line number Diff line number Diff line change
@@ -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 to 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.
Loading