solokit 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.1.3
+
+Updated the apt cookbook.
+
 0.1.2
 
 Major speed improvment by reducing the number of ssh logins.

data/cookbooks/upstream/apt/README.md

@@ -0,0 +1,109 @@
+Description
+===========
+
+Configures various APT components on Debian-like systems.  Also includes a LWRP.
+
+Recipes
+=======
+
+default
+-------
+The default recipe runs apt-get update during the Compile Phase of the Chef run to ensure that the system's package cache is updated with the latest. It is recommended that this recipe appear first in a node's run list (directly or through a role) to ensure that when installing packages, Chef will be able to download the latest version available on the remote APT repository.
+
+This recipe also sets up a local cache directory for preseeding packages.
+
+cacher
+------
+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.
+
+cacher-client
+-------------
+Configures the node to use the apt-cacher server as a client.
+
+Resources/Providers
+===================
+
+This LWRP provides an easy way to manage additional APT repositories.
+
+# 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 is the URI to the GPG key for the repo
+
+# Example
+
+    # add the Zenoss repo
+    apt_repository "zenoss" do
+      uri "http://dev.zenoss.org/deb"
+      components ["main","stable"]
+      action :add
+    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"
+      action :add
+    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"
+      action :add
+    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]` 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-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.
+

data/cookbooks/upstream/apt/metadata.rb

@@ -1,10 +1,12 @@
 maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
-description       "Configures apt and apt services"
-version           "0.8"
+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.1.1"
+recipe            "apt", "Runs apt-get update during compile phase and sets up preseed directories"
 recipe            "apt::cacher", "Set up an APT cache"
-recipe            "apt::proxy", "Set up an APT proxy"
+recipe            "apt::cacher-client", "Client for the apt::cacher server"
 
 %w{ ubuntu debian }.each do |os|
   supports os

data/cookbooks/upstream/apt/providers/repository.rb

@@ -0,0 +1,72 @@
+#
+# 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.
+#
+
+action :add do
+  unless ::File.exists?("/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list")
+    Chef::Log.info "Adding #{new_resource.repo_name} repository to /etc/apt/sources.list.d/#{new_resource.repo_name}-source.list"
+    # add key
+    if new_resource.keyserver && new_resource.key
+      execute "install-key #{new_resource.key}" do
+        command "apt-key adv --keyserver #{new_resource.keyserver} --recv #{new_resource.key}"
+        action :nothing
+      end.run_action(:run)
+    elsif new_resource.key && (new_resource.key =~ /http/)
+      key_name = new_resource.key.split(/\//).last
+      remote_file "#{Chef::Config[:file_cache_path]}/#{key_name}" do
+        source new_resource.key
+        mode "0644"
+        action :nothing
+      end.run_action(:create_if_missing)
+      execute "install-key #{key_name}" do
+        command "apt-key add #{Chef::Config[:file_cache_path]}/#{key_name}"
+        action :nothing
+      end.run_action(:run)
+    end
+    # build our listing
+    repository = "deb"
+    repository = "deb-src" if new_resource.deb_src
+    repository = "# Created by the Chef apt_repository LWRP\n" + repository
+    repository += " #{new_resource.uri}"
+    repository += " #{new_resource.distribution}"
+    new_resource.components.each {|component| repository += " #{component}"}
+    # write out the file, replace it if it already exists
+    file "/etc/apt/sources.list.d/#{new_resource.repo_name}-source.list" do
+      owner "root"
+      group "root"
+      mode 0644
+      content repository + "\n"
+      action :nothing
+    end.run_action(:create)
+    execute "update package index" do
+      command "apt-get update"
+      action :nothing
+    end.run_action(:run)
+    new_resource.updated_by_last_action(true)
+  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

data/cookbooks/upstream/apt/recipes/cacher-client.rb

@@ -0,0 +1,37 @@
+#
+# Cookbook Name:: apt
+# Recipe:: cacher-client
+#
+# Copyright 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.
+#
+
+servers = search(:node, 'recipes:apt\:\:cacher') || []
+if servers.length > 0
+  Chef::Log.info("apt-cacher server found on #{servers[0]}.")
+  proxy = "Acquire::http::Proxy \"http://#{servers[0].ipaddress}:3142\";"
+  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 server found.")
+  file "/etc/apt/apt.conf.d/01proxy" do
+    action :delete
+    only_if {File.exists?("/etc/apt/apt.conf.d/01proxy")}
+  end
+end

data/cookbooks/upstream/apt/recipes/cacher.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: apt
 # Recipe:: cacher
 #
-# Copyright 2008-2009, Opscode, Inc.
+# Copyright 2008-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.
@@ -25,7 +25,7 @@ service "apt-cacher" do
   action [ :enable, :start ]
 end
 
-remote_file "/etc/apt-cacher/apt-cacher.conf" do
+cookbook_file "/etc/apt-cacher/apt-cacher.conf" do
   source "apt-cacher.conf"
   owner "root"
   group "root"
@@ -33,10 +33,13 @@ remote_file "/etc/apt-cacher/apt-cacher.conf" do
   notifies :restart, resources(:service => "apt-cacher")
 end
 
-remote_file "/etc/default/apt-cacher" do
+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"

data/cookbooks/upstream/apt/{recipes/proxy.rb → resources/repository.rb}

@@ -1,8 +1,8 @@
 #
 # Cookbook Name:: apt
-# Recipe:: proxy
+# Resource:: repository
 #
-# Copyright 2008-2009, Opscode, Inc.
+# 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.
@@ -16,19 +16,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-package "apt-proxy" do 
-  action :install
-end
 
-service "apt-proxy" do
-  supports :restart => true, :status => false
-  action [ :enable, :start ]
-end
+actions :add, :remove
 
-remote_file "/etc/apt-proxy/apt-proxy-v2.conf" do
-  source "apt-proxy-v2.conf"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :restart, resources(:service => "apt-proxy")
-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

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 +02:00
+date: 2011-06-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,14 +71,16 @@ files:
 - chef/solo.rb
 - cookbooks/site/users/definitions/add_keys.rb
 - cookbooks/site/users/recipes/default.rb
+- cookbooks/upstream/apt/README.md
 - cookbooks/upstream/apt/files/default/apt-cacher
 - cookbooks/upstream/apt/files/default/apt-cacher.conf
 - cookbooks/upstream/apt/files/default/apt-proxy-v2.conf
-- cookbooks/upstream/apt/metadata.json
 - cookbooks/upstream/apt/metadata.rb
+- cookbooks/upstream/apt/providers/repository.rb
+- cookbooks/upstream/apt/recipes/cacher-client.rb
 - cookbooks/upstream/apt/recipes/cacher.rb
 - cookbooks/upstream/apt/recipes/default.rb
-- cookbooks/upstream/apt/recipes/proxy.rb
+- cookbooks/upstream/apt/resources/repository.rb
 - cookbooks/upstream/ruby-shadow/attributes/ruby-shadow.rb
 - cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/HISTORY
 - cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/MANIFEST

data/cookbooks/upstream/apt/metadata.json

@@ -1,51 +0,0 @@
-{
-  "maintainer": "Opscode, Inc.",
-  "description": "Configures apt and apt services",
-  "recommendations": {
-
-  },
-  "maintainer_email": "cookbooks@opscode.com",
-  "recipes": {
-    "apt::proxy": "Set up an APT proxy",
-    "apt": "",
-    "apt::cacher": "Set up an APT cache"
-  },
-  "suggestions": {
-
-  },
-  "platforms": {
-    "ubuntu": [
-
-    ],
-    "debian": [
-
-    ]
-  },
-  "version": "0.8.0",
-  "name": "apt",
-  "conflicting": {
-
-  },
-  "attributes": {
-
-  },
-  "providing": {
-    "apt::proxy": [
-
-    ],
-    "apt": [
-
-    ],
-    "apt::cacher": [
-
-    ]
-  },
-  "license": "Apache 2.0",
-  "long_description": "",
-  "replacing": {
-
-  },
-  "dependencies": {
-
-  }
-}