Permalink
Browse files

Add setup.py for distribution

Remove chef-solo.rb and create it on the fly
  • Loading branch information...
1 parent b0880d1 commit 34138ea0eaaba86f93d4988fff3807d5b5ac1949 @tobami tobami committed Oct 26, 2010
Showing with 99 additions and 1,482 deletions.
  1. +4 −0 MANIFEST.in
  2. +25 −29 README.textile
  3. +0 −3 chef-solo.rb
  4. +15 −2 cook
  5. +0 −55 cookbooks/apt/README.md
  6. +0 −9 cookbooks/apt/files/default/apt-cacher
  7. +0 −144 cookbooks/apt/files/default/apt-cacher.conf
  8. +0 −50 cookbooks/apt/files/default/apt-proxy-v2.conf
  9. +0 −38 cookbooks/apt/metadata.json
  10. +0 −12 cookbooks/apt/metadata.rb
  11. +0 −42 cookbooks/apt/recipes/cacher.rb
  12. +0 −33 cookbooks/apt/recipes/default.rb
  13. +0 −34 cookbooks/apt/recipes/proxy.rb
  14. +2 −2 cookbooks/haproxy/attributes/default.rb
  15. +0 −61 cookbooks/nginx/README.rdoc
  16. +0 −44 cookbooks/nginx/attributes/default.rb
  17. +0 −35 cookbooks/nginx/definitions/nginx_site.rb
  18. +0 −73 cookbooks/nginx/files/default/mime.types
  19. +0 −255 cookbooks/nginx/metadata.json
  20. +0 −86 cookbooks/nginx/metadata.rb
  21. +0 −66 cookbooks/nginx/recipes/backports.rb
  22. +0 −56 cookbooks/nginx/recipes/default.rb
  23. +0 −133 cookbooks/nginx/recipes/source.rb
  24. +0 −1 cookbooks/nginx/templates/default/backports.list.erb
  25. +0 −11 cookbooks/nginx/templates/default/default-site.erb
  26. +0 −40 cookbooks/nginx/templates/default/nginx.conf.erb
  27. +0 −92 cookbooks/nginx/templates/default/nginx.init.erb
  28. +0 −1 cookbooks/nginx/templates/default/nginx.sysconfig.erb
  29. +0 −29 cookbooks/nginx/templates/default/nxdissite.erb
  30. +0 −38 cookbooks/nginx/templates/default/nxensite.erb
  31. +0 −2 cookbooks/nginx/templates/default/sv-nginx-log-run.erb
  32. +0 −3 cookbooks/nginx/templates/default/sv-nginx-run.erb
  33. +9 −3 littlechef.py
  34. +44 −0 setup.py
View
@@ -0,0 +1,4 @@
+include README.textile
+include LICENSE
+graft cookbooks
+graft roles
View
@@ -6,11 +6,9 @@ h2. Overview
You can think of this like a pocket Chef. You don't need to worry about installation, repository syncing, nor Chef Server authentication. You also won't have to remotely edit cookbooks, or commit little changes just to test things.
-Downloading LittleChef is all you need to get you started.
+Installing or downloading LittleChef is all you need to get you started.
-in the @littlechef@ directory there is:
-@cook@: Bash script that calls fabric so that you can type 'cook' instead of 'fab'
-@fabfile.py@: this is where the actual code is
+in your working @littlechef@ directory there is:
@nodes/@: after recipes are run on nodes, their configuration is stored here
@cookbooks/@: This will be your cookbooks repository. You should put this under version control. Note that it is not recommended to clone the whole opscode cookbooks repository because its 7 MB compressed would make syncing cookbooks at the nodes a bit slow
@roles/@: Where roles are defined
@@ -24,22 +22,22 @@ The result is that you can play as often with your recipes and nodes as you want
h2. Requirements
* Python 2.6+
+* Setuptools
* Fabric 0.9.2
All needed packages should get installed by typing
-@sudo apt-get install python-fabric@ for Debian and Ubuntu
+@sudo apt-get install python-setuptools python-fabric@ for Debian and Ubuntu
or
-@yum install fabric@ for RHEL and CentOS
+@yum install python-setuptools fabric@ for RHEL and CentOS
h2. Installation
-There is none. You just need to install the required packages and download and uncompress LittleChef.
+You can install LittleChef directly from the PyPI:
+@easy_install littlechef@
-To start cooking change to the @littlechef@ dir and always issue commands from there, calling @./cook@
+A directory called @littlechef@ will be created in your home directory with a sample recipe and role. You can however copy or remove it and use any other directory to keep your deployment "projects".
-For convenience, you can copy the file @cook@ to your PATH. For example:
-@sudo cp cook /user/bin/@
-You will then be able to type @cook@ instead of @./cook@.
+Note: there is a package that also provides a cook executable. To avoid it colliding with LittleChef's executable, you need to remove the "cook" package.
h2. Usage
@@ -61,7 +59,7 @@ password = yourpassword
h3. Deploy
There is a command that allows you to deploy chef-client/-solo to a node using the packages from the "Opscode repository":http://wiki.opscode.com/display/chef/Installation#Installation-InstallingChefClientandChefSolo:
-@./cook node:MYNODE deploy_chef:MYDISTRO@
+@cook node:MYNODE deploy_chef:MYDISTRO@
MYDISTRO can have one of the following values for debian based distributions:
'lucid', 'karmic', 'jaunty', 'hardy', 'sid', 'squeeze', 'lenny'
@@ -74,32 +72,30 @@ Also, the CentOS and RHEL installation method has not been tested. Feedback is w
h3. Cook
-Note: Allways cook inside your local @littlechef/@ directory.
+Note: Always cook inside your working directory, where you should have a roles, a nodes, and a recipes directory.
-* @./cook -l@: Show a list of all available commands.
-* @./cook node:MYNODE recipe:MYRECIPE@: Cook a recipe on a particular node by giving its hostname or IP.
+* @cook -l@: Show a list of all available commands.
+* @cook node:MYNODE recipe:MYRECIPE@: Cook a recipe on a particular node by giving its hostname or IP.
Note that the first time this is run for a node, a configuration file will be created at @nodes/hostname.json@. You can then edit this file to override recipe attributes for example. Further runs of this command will not overwrite this configuration file.
-You can force the saving of the run with @./cook node:MYNODE recipe:MYRECIPE,save=True@.
-* @./cook node:MYNODE role:MYROLE@: The same as above but role-based
-* @./cook configure@: It will apply all roles, recipes and attributes defined in @nodes/MYNODE.json@ to ALL nodes present in @littlechef/nodes/@.
-* @./cook node:MYNODE configure@: Configures a particular pre-configured node
-* @./cook debug configure@: You can start all your commands with @./cook debug@ to see all Chef Solo debbuging information
+You can force the saving of the run with @cook node:MYNODE recipe:MYRECIPE,save=True@.
+* @cook node:MYNODE role:MYROLE@: The same as above but role-based
+* @cook configure@: It will apply all roles, recipes and attributes defined in @nodes/MYNODE.json@ to ALL nodes present in @littlechef/nodes/@.
+* @cook node:MYNODE configure@: Configures a particular pre-configured node
+* @cook debug configure@: You can start all your commands with @cook debug@ to see all Chef Solo debbuging information
h3. Consulting the inventory
-* @./cook list_nodes@: Lists all nodes showing its associated recipes, roles and attributes
-* @./cook list_nodes_with_recipe:MYRECIPE@: The same as above but it only lists nodes which have associated the recipe @MYRECIPE@
-* @./cook list_nodes_with_role:MYROLE@: The same as above but it only lists nodes which have associated the role @MYROLE@
+* @cook list_nodes@: Lists all nodes showing its associated recipes, roles and attributes
+* @cook list_nodes_with_recipe:MYRECIPE@: The same as above but it only lists nodes which have associated the recipe @MYRECIPE@
+* @cook list_nodes_with_role:MYROLE@: The same as above but it only lists nodes which have associated the role @MYROLE@
h2. Getting started
-There are some sample cookbooks and a sample role to get you started.
+There is a sample cookbook and a sample role to get you started.
try:
-@./cook node:MYNODE1 recipe:nginx@
-and
-@./cook node:MYNODE2 recipe:haproxy@
+@cook node:MYNODE recipe:haproxy@
-The haproxy is a modified opscode recipe so that it accepts an array of load balanced servers. You can edit the new configuration file at @nodes/MYNODE2.json@ and add some attributes. Make it look like this (ignore the littlechef custom fields):
+The haproxy is a modified opscode recipe so that it accepts an array of load balanced servers. You can edit the new configuration file at @nodes/MYNODE.json@ and add some attributes. Make it look like this (ignore the littlechef custom fields):
bc. {
"littlechef": {"nodename": "myhostname", "nodeid": "myhostnameorip"},
@@ -113,6 +109,6 @@ bc. {
}
Next, reapply configuration to all nodes:
-@./cook configure@
+@cook configure@
Happy cooking!
View
@@ -1,3 +0,0 @@
-file_cache_path "/tmp/chef-solo"
-cookbook_path "/tmp/chef-solo/cookbooks"
-role_path "/tmp/chef-solo/roles"
View
17 cook
@@ -1,2 +1,15 @@
-#!/bin/bash
-fab -f littlechef.py $@
+#!/usr/bin/env python
+import sys
+from subprocess import call
+from distutils.sysconfig import get_python_lib
+
+args = ['fab', '-f', '%s/littlechef.py' % get_python_lib()]
+
+if len(sys.argv) > 1:
+ # Pass on arguments to fabric
+ args.extend(sys.argv[1:])
+else:
+ sys.exit("No command given. Type '%s -l' for a list of commands" % sys.argv[0])
+
+# Call fabric with the given arguments
+call(args)
View
@@ -1,55 +0,0 @@
-DESCRIPTION
-===========
-
-Configures various APT components on Debian-like systems.
-
-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 be an APT cache.
-
-proxy
------
-
-Installs the apt-proxy package and service so the system can be an APT proxy.
-
-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.
-
-LICENSE AND AUTHOR
-==================
-
-Author:: Joshua Timberman (<joshua@opscode.com>)
-
-Copyright 2009, 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.
-
@@ -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
@@ -1,50 +0,0 @@
-[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
Oops, something went wrong.

0 comments on commit 34138ea

Please sign in to comment.