[DRE-commits] [ruby-ldap] 04/08: Imported Upstream version 0.9.16
Jonas Genannt
jonas at brachium-system.net
Tue Dec 31 14:56:14 UTC 2013
This is an automated email from the git hooks/post-receive script.
hggh-guest pushed a commit to branch master
in repository ruby-ldap.
commit eb748e63aa11c2d4f2ce545f3f381c0167ca597f
Author: Jonas Genannt <jonas at brachium-system.net>
Date: Tue Dec 31 15:41:49 2013 +0100
Imported Upstream version 0.9.16
---
ChangeLog | 28 +++-
NOTES | 35 +++++
README | 4 +
TODO | 10 --
checksums.yaml.gz | Bin 0 -> 424 bytes
conn.c | 70 +++++++++-
extconf.rb | 1 +
ldap.c | 3 +
lib/ldap/ldif.rb | 3 +-
metadata.yml | 87 +++++--------
rbldap.h | 9 +-
saslconn.c | 25 +++-
test/cookbooks/apt/metadata.rb | 13 --
test/cookbooks/apt/providers/repository.rb | 73 -----------
test/cookbooks/apt/recipes/cacher-client.rb | 44 -------
test/cookbooks/apt/recipes/cacher.rb | 45 -------
test/cookbooks/apt/recipes/default.rb | 50 -------
test/cookbooks/apt/resources/repository.rb | 30 -----
test/cookbooks/nginx/attributes/default.rb | 35 -----
test/cookbooks/nginx/definitions/nginx_site.rb | 35 -----
test/cookbooks/nginx/metadata.rb | 86 -------------
test/cookbooks/nginx/recipes/default.rb | 56 --------
test/cookbooks/nginx/recipes/source.rb | 143 ---------------------
test/cookbooks/openldap/attributes/default.rb | 61 ---------
test/cookbooks/openldap/metadata.rb | 99 --------------
test/cookbooks/openldap/recipes/auth.rb | 70 ----------
test/cookbooks/openldap/recipes/client.rb | 28 ----
test/cookbooks/openldap/recipes/default.rb | 18 ---
test/cookbooks/openldap/recipes/server.rb | 110 ----------------
test/cookbooks/postgresql/attributes/default.rb | 68 ----------
test/cookbooks/postgresql/metadata.rb | 15 ---
test/cookbooks/postgresql/recipes/client.rb | 27 ----
test/cookbooks/postgresql/recipes/default.rb | 20 ---
test/cookbooks/postgresql/recipes/server.rb | 36 ------
test/cookbooks/postgresql/recipes/server_debian.rb | 51 --------
test/cookbooks/postgresql/recipes/server_redhat.rb | 84 ------------
test/cookbooks/sqlite/metadata.rb | 11 --
test/cookbooks/sqlite/recipes/default.rb | 26 ----
test/cookbooks/vagrant_main/recipes/default.rb | 12 --
test/moz_cert.rb | 1 -
40 files changed, 194 insertions(+), 1428 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed5b4fe..f33f238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,32 @@
+Fri Sep 6 07:04:07 UTC 2013 Alexey Chebotar <alexey.chebotar at gmail.com>
+ * Version 0.9.16
+ * Fixed undefined method 'each' in LDAP::LDIF.mods_to_ldif (GH-26).
+ Thanks to Francesco Malvezzi.
+
+Thu Aug 29 10:18:48 UTC 2013 Alexey Chebotar <alexey.chebotar at gmail.com>
+ * Version 0.9.15
+ * Accept nil for new_parent_dn for rename. Thanks to Kouhei Sutou.
+
+Wed Aug 28 13:21:53 UTC 2013 Alexey Chebotar <alexey.chebotar at gmail.com>
+ * Version 0.9.14
+ * Fixed option parsing bug for LDAP::Conn.sasl_bind. Thanks to Brian Leake.
+ * Added possibility to use :nocanon option in rb_ldap_conn_sasl_bind.
+ See ldap_set_option(3) for more information. Thanks to Brian Leake.
+ * Added function conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls) => self
+ Modify the RDN of the entry with DN, dn, giving it the new RDN in parent new_parent_dn,
+ new_rdn. If delete_old_rdn is true, the old RDN value will be deleted from the entry.
+ Thanks to Marek Veber.
+ * Added option LDAP_OPT_NETWORK_TIMEOUT for openLDAP. Thanks to David Campbell.
+ * Fixed build error with GCC 4.8.1. Thanks to Kouhei Sutou.
+ * Add missing ldap_raname_s() function availability check. Thanks to Kouhei Sutou.
+
+Wed Jun 5 17:44:47 UTC 2013 Alexey Chebotar <alexey.chebotar at gmail.com>
+ * Version 0.9.13
+ * Prevent SyntaxError raised under Ruby 2.0.0 by line 107 regex
+ (invalid multibyte escape). Thanks to Andrew Broman.
+
Tue Dec 27 15:17:03 UTC 2011 Alexey Chebotar <alexey.chebotar at gmail.com>
* Version 0.9.12
-
* Enable client certificate authentication for mozilla ldap 6.0 only.
Thank to Yuri Arabadji.
* New patch for LDAP::Mod data corruption. Thanks to Aprotim Sanyal.
diff --git a/NOTES b/NOTES
index 59601cd..7eb49c4 100644
--- a/NOTES
+++ b/NOTES
@@ -1,3 +1,38 @@
+0.9.16
+-----
+
+* Fixed undefined method 'each' in LDAP::LDIF.mods_to_ldif (GH-26).
+ Thanks to Francesco Malvezzi.
+
+
+0.9.15
+-----
+
+* Accept nil for new_parent_dn for rename. Thanks to Kouhei Sutou.
+
+
+0.9.14
+-----
+
+* Fixed option parsing bug for LDAP::Conn.sasl_bind. Thanks to Brian Leake.
+* Added possibility to use :nocanon option in rb_ldap_conn_sasl_bind.
+ See ldap_set_option(3) for more information. Thanks to Brian Leake.
+* Added function conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls) => self
+ Modify the RDN of the entry with DN, dn, giving it the new RDN in parent new_parent_dn,
+ new_rdn. If delete_old_rdn is true, the old RDN value will be deleted from the entry.
+ Thanks to Marek Veber.
+* Added option LDAP_OPT_NETWORK_TIMEOUT for openLDAP. Thanks to David Campbell.
+* Fixed build error with GCC 4.8.1. Thanks to Kouhei Sutou.
+* Add missing ldap_raname_s() function availability check. Thanks to Kouhei Sutou.
+
+
+0.9.13
+-----
+
+* Prevent SyntaxError raised under Ruby 2.0.0 by line 107 regex
+ (invalid multibyte escape)
+
+
0.9.12
-----
diff --git a/README b/README
index d41265d..c428544 100644
--- a/README
+++ b/README
@@ -246,10 +246,14 @@ This list maybe not correct. If you notice mistakes of this list, please point o
* Adam Doligalski
* Akinori MUSHA
* Akira Yamada
+* Andrew Broman
* Anthony M. Martinez
* Antonio Terceiro
* Aprotim Sanyal
+* Brian Leake
* Chris Scharf
+* David Campbell
+* Francesco Malvezzi
* Hadmut Danisch
* Hiroki Najima
* Jan Mikkelsen
diff --git a/TODO b/TODO
index ae85dfd..24d2eec 100644
--- a/TODO
+++ b/TODO
@@ -3,16 +3,6 @@
To-do list
----------
-- Setup a vagrant boxes for tests:
-* 32/64 Ubuntu Lucid ( ruby-ldap http://packages.ubuntu.com/lucid/libldap-ruby1.8 )
-* 32/64 Debian 6.0.3 ( ruby-ldap http://packages.debian.org/sid/ruby/libldap-ruby1.8 )
-* 32/64 Arch 2011.08.19 ( ruby-ldap https://aur.archlinux.org/packages.php?ID=13471 )
-* 32/64 FreeBSD 8.2 (9.0-RC1, 7.4) ( ruby-ldap http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/ruby-ldap/ )
-
-
-Ian's Td-do list
-----------
-
- Support for more LDAPv3 controls and extensions.
- DSML support.
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
new file mode 100644
index 0000000..d30b0c7
Binary files /dev/null and b/checksums.yaml.gz differ
diff --git a/conn.c b/conn.c
index 632ddd2..c92d6da 100644
--- a/conn.c
+++ b/conn.c
@@ -471,6 +471,15 @@ rb_ldap_conn_set_option (VALUE self, VALUE opt, VALUE data)
switch (copt)
{
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+ case LDAP_OPT_NETWORK_TIMEOUT:
+ {
+ struct timeval tv;
+ tv = rb_time_interval(data);
+ optdata = &tv;
+ }
+ break;
+#endif
case LDAP_OPT_REFERRALS:
optdata = (void *) NUM2INT (data);
break;
@@ -595,6 +604,20 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
ldapdata->err = ldap_get_option (NULL, copt, (void *) info);
data = (long *) info;
}
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+ else if (copt == LDAP_OPT_NETWORK_TIMEOUT)
+ {
+ struct timeval tv;
+ ldapdata->err = ldap_get_option (ldapdata->ldap, copt, &tv);
+ if (!tv.tv_sec)
+ {
+ long x = -1;
+ data = &x;
+ }
+ else
+ data = (void *) tv.tv_sec;
+ }
+#endif
else
{
data = (void *) ALLOCA_N (char, LDAP_GET_OPT_MAX_BUFFER_SIZE);
@@ -616,6 +639,9 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
case LDAP_OPT_RESTART:
case LDAP_OPT_PROTOCOL_VERSION:
case LDAP_OPT_ERROR_NUMBER:
+#if defined(USE_OPENLDAP1) || defined(USE_OPENLDAP2)
+ case LDAP_OPT_NETWORK_TIMEOUT:
+#endif
#ifdef USE_OPENLDAP2
#ifdef LDAP_OPT_X_TLS
case LDAP_OPT_X_TLS:
@@ -674,7 +700,7 @@ rb_ldap_conn_get_option (VALUE self, VALUE opt)
}
else
{
- rb_raise (rb_eLDAP_Error, ldap_err2string (ldapdata->err));
+ rb_raise (rb_eLDAP_Error, "%s", ldap_err2string (ldapdata->err));
};
#else
rb_notimplement ();
@@ -1626,6 +1652,45 @@ rb_ldap_conn_modrdn_s (VALUE self, VALUE dn, VALUE newrdn, VALUE delete_p)
return self;
};
+#if defined(HAVE_LDAPCONTROL) && defined(HAVE_LDAP_RENAME_S)
+/*
+ * call-seq:
+ * conn.rename(dn, new_rdn, new_parent_dn, delete_old_rdn, sctrls, cctrls) => self
+ *
+ * Modify the RDN of the entry with DN, +dn+, giving it the new RDN in
+ * parent +new_parent_dn+, +new_rdn+. If you don't want to change
+ * parent, specify *nil* to +new_parent_dn+. If +delete_old_rdn+ is
+ * *true*, the old RDN value will be deleted from the entry.
+ */
+VALUE
+rb_ldap_conn_rename_s (VALUE self, VALUE dn, VALUE newrdn, VALUE newparentdn, VALUE delete_p,
+ VALUE serverctrls, VALUE clientctrls)
+{
+ RB_LDAP_DATA *ldapdata;
+ char *c_dn;
+ char *c_newrdn;
+ char *c_newparentdn = NULL;
+ int c_delete_p;
+ LDAPControl **sctrls, **cctrls;
+
+ GET_LDAP_DATA (self, ldapdata);
+ c_dn = StringValueCStr (dn);
+ c_newrdn = StringValueCStr (newrdn);
+ if (!NIL_P(newparentdn)) {
+ c_newparentdn = StringValueCStr (newparentdn);
+ }
+ c_delete_p = (delete_p == Qtrue) ? 1 : 0;
+ sctrls = rb_ldap_get_controls (serverctrls);
+ cctrls = rb_ldap_get_controls (clientctrls);
+
+ ldapdata->err =
+ ldap_rename_s (ldapdata->ldap, c_dn, c_newrdn, c_newparentdn, c_delete_p, sctrls, cctrls);
+ Check_LDAP_Result (ldapdata->err);
+
+ return self;
+}
+#endif
+
/*
* call-seq:
* conn.delete(dn) => self
@@ -1817,6 +1882,9 @@ Init_ldap_conn ()
rb_ldap_conn_define_method ("add", rb_ldap_conn_add_s, 2);
rb_ldap_conn_define_method ("modify", rb_ldap_conn_modify_s, 2);
rb_ldap_conn_define_method ("modrdn", rb_ldap_conn_modrdn_s, 3);
+#if defined(HAVE_LDAPCONTROL) && defined(HAVE_LDAP_RENAME_S)
+ rb_ldap_conn_define_method ("rename", rb_ldap_conn_rename_s, 6);
+#endif
rb_ldap_conn_define_method ("delete", rb_ldap_conn_delete_s, 1);
#if defined(HAVE_LDAP_COMPARE_S)
rb_ldap_conn_define_method ("compare", rb_ldap_conn_compare_s, 3);
diff --git a/extconf.rb b/extconf.rb
old mode 100644
new mode 100755
index db1ee75..9df2349
--- a/extconf.rb
+++ b/extconf.rb
@@ -245,6 +245,7 @@ have_func("ldap_sort_entries")
have_func("ldapssl_init") # NS SDK
have_func("ldap_sslinit") # WLDAP32
have_func("ldap_sasl_bind_s")
+have_func("ldap_rename_s")
have_func("ldap_compare_s")
have_func("ldap_add_ext_s")
have_func("ldap_compare_ext_s")
diff --git a/ldap.c b/ldap.c
index 7d103aa..a26aa48 100644
--- a/ldap.c
+++ b/ldap.c
@@ -407,6 +407,9 @@ Init_ldap ()
#ifdef LDAP_OPT_TIMELIMIT
rb_ldap_define_opt (LDAP_OPT_TIMELIMIT);
#endif
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
+ rb_ldap_define_opt (LDAP_OPT_NETWORK_TIMEOUT);
+#endif
#ifdef LDAP_OPT_THREAD_FN_PTRS
rb_ldap_define_opt (LDAP_OPT_THREAD_FN_PTRS);
#endif
diff --git a/lib/ldap/ldif.rb b/lib/ldap/ldif.rb
index fc09966..9bf57d0 100644
--- a/lib/ldap/ldif.rb
+++ b/lib/ldap/ldif.rb
@@ -1,3 +1,4 @@
+# encoding: US-ASCII
# Manipulation of LDIF data.
#
#--
@@ -504,7 +505,7 @@ module LDAP
end
ldif << "-\n" if plural
- ldif << LDIF.to_ldif( change_type, mod.mod_type )
+ ldif << LDIF.to_ldif( change_type, [mod.mod_type] )
ldif << LDIF.to_ldif( mod.mod_type, mod.mod_vals )
plural = true
diff --git a/metadata.yml b/metadata.yml
index ba107f4..c7624b4 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,15 +1,14 @@
--- !ruby/object:Gem::Specification
name: ruby-ldap
version: !ruby/object:Gem::Version
- version: 0.9.12
- prerelease:
+ version: 0.9.16
platform: ruby
authors:
- Alexey Chebotar
autorequire:
bindir: bin
cert_chain: []
-date: 2011-12-27 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
dependencies: []
description: ! 'It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape
SDK and Active Directory). The common API for application development is described
@@ -28,96 +27,68 @@ files:
- NOTES
- README
- TODO
-- extconf.rb
-- lib/ldap/control.rb
-- lib/ldap/ldif.rb
-- lib/ldap/schema.rb
+- test/ext.rb
+- test/compare.rb
+- test/bind-sasl.rb
+- test/misc1.rb
- test/add.rb
+- test/tc_schema.rb
- test/add2.rb
+- test/search.rb
- test/add3.rb
-- test/bind-ldaps.rb
-- test/bind-sasl.rb
+- test/modrdn.rb
- test/bind-ssl.rb
-- test/bind.rb
-- test/compare.rb
-- test/conf.rb
-- test/cookbooks/apt/metadata.rb
-- test/cookbooks/apt/providers/repository.rb
-- test/cookbooks/apt/recipes/cacher-client.rb
-- test/cookbooks/apt/recipes/cacher.rb
-- test/cookbooks/apt/recipes/default.rb
-- test/cookbooks/apt/resources/repository.rb
-- test/cookbooks/nginx/attributes/default.rb
-- test/cookbooks/nginx/definitions/nginx_site.rb
-- test/cookbooks/nginx/metadata.rb
-- test/cookbooks/nginx/recipes/default.rb
-- test/cookbooks/nginx/recipes/source.rb
-- test/cookbooks/openldap/attributes/default.rb
-- test/cookbooks/openldap/metadata.rb
-- test/cookbooks/openldap/recipes/auth.rb
-- test/cookbooks/openldap/recipes/client.rb
-- test/cookbooks/openldap/recipes/default.rb
-- test/cookbooks/openldap/recipes/server.rb
-- test/cookbooks/postgresql/attributes/default.rb
-- test/cookbooks/postgresql/metadata.rb
-- test/cookbooks/postgresql/recipes/client.rb
-- test/cookbooks/postgresql/recipes/default.rb
-- test/cookbooks/postgresql/recipes/server.rb
-- test/cookbooks/postgresql/recipes/server_debian.rb
-- test/cookbooks/postgresql/recipes/server_redhat.rb
-- test/cookbooks/sqlite/metadata.rb
-- test/cookbooks/sqlite/recipes/default.rb
-- test/cookbooks/vagrant_main/recipes/default.rb
+- test/setup.rb
+- test/search3.rb
- test/delete.rb
-- test/ext.rb
-- test/misc1.rb
-- test/misc2.rb
-- test/modrdn.rb
-- test/moz_cert.rb
-- test/search.rb
- test/search2.rb
-- test/search3.rb
-- test/setup.rb
-- test/subschema.rb
- test/tc_conn.rb
-- test/tc_ldif.rb
-- test/tc_schema.rb
-- test/tc_search.rb
- test/ts_ldap.rb
+- test/conf.rb
+- test/misc2.rb
+- test/bind-ldaps.rb
+- test/tc_search.rb
+- test/bind.rb
+- test/tc_ldif.rb
+- test/subschema.rb
+- test/moz_cert.rb
+- lib/ldap/schema.rb
+- lib/ldap/control.rb
+- lib/ldap/ldif.rb
+- extconf.rb
- rbldap.h
- win/winlber.h
- win/winldap.h
-- clientauth.c
- conn.c
+- sslconn.c
- entry.c
+- clientauth.c
- ldap.c
-- misc.c
- mod.c
- saslconn.c
-- sslconn.c
+- misc.c
- win/wldap32.def
homepage: http://ruby-ldap.sourceforge.net/
licenses: []
+metadata: {}
post_install_message:
rdoc_options: []
require_paths:
- lib
required_ruby_version: !ruby/object:Gem::Requirement
- none: false
requirements:
- - ! '>='
- !ruby/object:Gem::Version
version: '0'
required_rubygems_version: !ruby/object:Gem::Requirement
- none: false
requirements:
- - ! '>='
- !ruby/object:Gem::Version
version: '0'
requirements: []
rubyforge_project: ruby-ldap
-rubygems_version: 1.8.13
+rubygems_version: 2.0.7
signing_key:
-specification_version: 3
+specification_version: 4
summary: Ruby/LDAP is an extension module for Ruby
test_files: []
diff --git a/rbldap.h b/rbldap.h
index 2a5663a..7ea4143 100644
--- a/rbldap.h
+++ b/rbldap.h
@@ -27,8 +27,8 @@
#define RB_LDAP_MAJOR_VERSION 0
#define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 12
-#define RB_LDAP_VERSION "0.9.12"
+#define RB_LDAP_PATCH_VERSION 16
+#define RB_LDAP_VERSION "0.9.16"
#define LDAP_GET_OPT_MAX_BUFFER_SIZE (1024) /* >= sizeof(LDAPAPIInfo) */
@@ -62,6 +62,7 @@ typedef struct rb_ldapmod_data
LDAPMod *mod;
} RB_LDAPMOD_DATA;
+struct timeval rb_time_interval(VALUE num);
#ifndef HAVE_LDAP_MEMFREE
# define ldap_memfree(ptr) free(ptr)
@@ -141,13 +142,13 @@ VALUE rb_ldap_mod_vals (VALUE);
#define Check_LDAP_Result(err) { \
if( (err) != LDAP_SUCCESS && (err) != LDAP_SIZELIMIT_EXCEEDED ){ \
- rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
+ rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
} \
}
#define Check_LDAP_OPT_Result(err) { \
if( (err) != LDAP_OPT_SUCCESS ){ \
- rb_raise(rb_eLDAP_ResultError, ldap_err2string(err)); \
+ rb_raise(rb_eLDAP_ResultError, "%s", ldap_err2string(err)); \
} \
}
diff --git a/saslconn.c b/saslconn.c
index 042f85f..dbd796d 100644
--- a/saslconn.c
+++ b/saslconn.c
@@ -106,7 +106,7 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
{
RB_LDAP_DATA *ldapdata;
- VALUE arg1, arg2, arg3, arg4, arg5, sasl_options = Qnil;
+ VALUE arg1, arg2, arg3, arg4, arg5, sasl_options, other_options = Qnil;
int version;
char *dn = NULL;
char *mechanism = NULL;
@@ -145,19 +145,32 @@ rb_ldap_conn_sasl_bind (int argc, VALUE argv[], VALUE self)
rb_raise (rb_eLDAP_Error, "already bound.");
};
- switch (rb_scan_args (argc, argv, "24", &arg1, &arg2, &arg3, &arg4, &arg5, &sasl_options))
+ switch (rb_scan_args (argc, argv, "25", &arg1, &arg2, &arg3, &arg4, &arg5, &sasl_options, &other_options))
{
+ case 7:
+ /* Parse through the hash. Currently there's only one option, nothing fancy needed. */
+ if (!NIL_P(rb_ldap_indifferent_hash_aref(other_options, "nocanon")))
+ {
+ /* Inspired by the ldapsearch -N option, inspired by the code in OpenLDAP (BSD style license) in clients/tools/common.c */
+ ldapdata->err = ldap_set_option( ldapdata->ldap, LDAP_OPT_X_SASL_NOCANON, LDAP_OPT_ON);
+ Check_LDAP_Result(ldapdata->err);
+ }
case 6:
/* nothing. this requires credentials to be parsed first. we'll get defaults after arg-scanning */
case 5:
- clientctrls = rb_ldap_get_controls (arg5);
+ if(!NIL_P(arg5))
+ clientctrls = rb_ldap_get_controls (arg5);
/* down seems more likely */
case 4:
- serverctrls = rb_ldap_get_controls (arg4);
+ if(!NIL_P(arg4))
+ serverctrls = rb_ldap_get_controls (arg4);
/* down seems more likely */
case 3:
- cred->bv_val = StringValueCStr (arg3);
- cred->bv_len = RSTRING_LEN (arg3);
+ if(!NIL_P(arg3))
+ {
+ cred->bv_val = StringValueCStr (arg3);
+ cred->bv_len = RSTRING_LEN (arg3);
+ }
/* down seems more likely */
case 2: /* don't need the cred for GSSAPI */
dn = StringValuePtr (arg1);
diff --git a/test/cookbooks/apt/metadata.rb b/test/cookbooks/apt/metadata.rb
deleted file mode 100644
index 4fed79b..0000000
--- a/test/cookbooks/apt/metadata.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks at 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.2.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"
-
-%w{ ubuntu debian }.each do |os|
- supports os
-end
diff --git a/test/cookbooks/apt/providers/repository.rb b/test/cookbooks/apt/providers/repository.rb
deleted file mode 100644
index eaeaef6..0000000
--- a/test/cookbooks/apt/providers/repository.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# 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"
- ignore_failure true
- 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
diff --git a/test/cookbooks/apt/recipes/cacher-client.rb b/test/cookbooks/apt/recipes/cacher-client.rb
deleted file mode 100644
index e8c56c3..0000000
--- a/test/cookbooks/apt/recipes/cacher-client.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-
-#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 = 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\";\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 server found.")
- file "/etc/apt/apt.conf.d/01proxy" do
- action :delete
- only_if {File.exists?("/etc/apt/apt.conf.d/01proxy")}
- end
-end
diff --git a/test/cookbooks/apt/recipes/cacher.rb b/test/cookbooks/apt/recipes/cacher.rb
deleted file mode 100644
index 3d4a086..0000000
--- a/test/cookbooks/apt/recipes/cacher.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Cookbook Name:: apt
-# Recipe:: cacher
-#
-# 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.
-# 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" do
- action :install
-end
-
-service "apt-cacher" 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"
diff --git a/test/cookbooks/apt/recipes/default.rb b/test/cookbooks/apt/recipes/default.rb
deleted file mode 100644
index 63a691f..0000000
--- a/test/cookbooks/apt/recipes/default.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Cookbook Name:: apt
-# Recipe:: default
-#
-# Copyright 2008-2011, Opscode, Inc.
-# Copyright 2009, Bryan McLellan <btm at 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
- action :nothing
-end
-
-# 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
-
-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
diff --git a/test/cookbooks/apt/resources/repository.rb b/test/cookbooks/apt/resources/repository.rb
deleted file mode 100644
index 1b36734..0000000
--- a/test/cookbooks/apt/resources/repository.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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
-
-#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
diff --git a/test/cookbooks/nginx/attributes/default.rb b/test/cookbooks/nginx/attributes/default.rb
deleted file mode 100644
index 24525b2..0000000
--- a/test/cookbooks/nginx/attributes/default.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-default[:nginx][:version] = "0.8.54"
-
-case platform
-when "debian","ubuntu"
- set[:nginx][:dir] = "/etc/nginx"
- set[:nginx][:log_dir] = "/var/log/nginx"
- set[:nginx][:user] = "www-data"
- set[:nginx][:binary] = "/usr/sbin/nginx"
-else
- set[:nginx][:dir] = "/etc/nginx"
- set[:nginx][:log_dir] = "/var/log/nginx"
- set[:nginx][:user] = "www-data"
- set[:nginx][:binary] = "/usr/sbin/nginx"
-end
-
-default[:nginx][:gzip] = "on"
-default[:nginx][:gzip_http_version] = "1.0"
-default[:nginx][:gzip_comp_level] = "2"
-default[:nginx][:gzip_proxied] = "any"
-default[:nginx][:gzip_types] = [
- "text/plain",
- "text/html",
- "text/css",
- "application/x-javascript",
- "text/xml",
- "application/xml",
- "application/xml+rss",
- "text/javascript"
-]
-
-default[:nginx][:keepalive] = "on"
-default[:nginx][:keepalive_timeout] = 65
-default[:nginx][:worker_processes] = cpu[:total]
-default[:nginx][:worker_connections] = 2048
-default[:nginx][:server_names_hash_bucket_size] = 64
diff --git a/test/cookbooks/nginx/definitions/nginx_site.rb b/test/cookbooks/nginx/definitions/nginx_site.rb
deleted file mode 100644
index c55c08c..0000000
--- a/test/cookbooks/nginx/definitions/nginx_site.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Cookbook Name:: nginx
-# Definition:: nginx_site
-# Author:: AJ Christensen <aj at junglist.gen.nz>
-#
-# Copyright 2008-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.
-#
-
-define :nginx_site, :enable => true do
- if params[:enable]
- execute "nxensite #{params[:name]}" do
- command "/usr/sbin/nxensite #{params[:name]}"
- notifies :restart, resources(:service => "nginx")
- not_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
- end
- else
- execute "nxdissite #{params[:name]}" do
- command "/usr/sbin/nxdissite #{params[:name]}"
- notifies :restart, resources(:service => "nginx")
- only_if do ::File.symlink?("#{node[:nginx][:dir]}/sites-enabled/#{params[:name]}") end
- end
- end
-end
diff --git a/test/cookbooks/nginx/metadata.rb b/test/cookbooks/nginx/metadata.rb
deleted file mode 100644
index 881f999..0000000
--- a/test/cookbooks/nginx/metadata.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks at opscode.com"
-license "Apache 2.0"
-description "Installs and configures nginx"
-version "0.99.0"
-
-recipe "nginx", "Installs nginx package and sets up configuration with Debian apache style with sites-enabled/sites-available"
-recipe "nginx::source", "Installs nginx from source and sets up configuration with Debian apache style with sites-enabled/sites-available"
-
-%w{ ubuntu debian centos redhat fedora }.each do |os|
- supports os
-end
-
-%w{ build-essential runit }.each do |cb|
- depends cb
-end
-
-attribute "nginx/dir",
- :display_name => "Nginx Directory",
- :description => "Location of nginx configuration files",
- :default => "/etc/nginx"
-
-attribute "nginx/log_dir",
- :display_name => "Nginx Log Directory",
- :description => "Location for nginx logs",
- :default => "/var/log/nginx"
-
-attribute "nginx/user",
- :display_name => "Nginx User",
- :description => "User nginx will run as",
- :default => "www-data"
-
-attribute "nginx/binary",
- :display_name => "Nginx Binary",
- :description => "Location of the nginx server binary",
- :default => "/usr/sbin/nginx"
-
-attribute "nginx/gzip",
- :display_name => "Nginx Gzip",
- :description => "Whether gzip is enabled",
- :default => "on"
-
-attribute "nginx/gzip_http_version",
- :display_name => "Nginx Gzip HTTP Version",
- :description => "Version of HTTP Gzip",
- :default => "1.0"
-
-attribute "nginx/gzip_comp_level",
- :display_name => "Nginx Gzip Compression Level",
- :description => "Amount of compression to use",
- :default => "2"
-
-attribute "nginx/gzip_proxied",
- :display_name => "Nginx Gzip Proxied",
- :description => "Whether gzip is proxied",
- :default => "any"
-
-attribute "nginx/gzip_types",
- :display_name => "Nginx Gzip Types",
- :description => "Supported MIME-types for gzip",
- :type => "array",
- :default => [ "text/plain", "text/html", "text/css", "application/x-javascript", "text/xml", "application/xml", "application/xml+rss", "text/javascript" ]
-
-attribute "nginx/keepalive",
- :display_name => "Nginx Keepalive",
- :description => "Whether to enable keepalive",
- :default => "on"
-
-attribute "nginx/keepalive_timeout",
- :display_name => "Nginx Keepalive Timeout",
- :default => "65"
-
-attribute "nginx/worker_processes",
- :display_name => "Nginx Worker Processes",
- :description => "Number of worker processes",
- :default => "1"
-
-attribute "nginx/worker_connections",
- :display_name => "Nginx Worker Connections",
- :description => "Number of connections per worker",
- :default => "1024"
-
-attribute "nginx/server_names_hash_bucket_size",
- :display_name => "Nginx Server Names Hash Bucket Size",
- :default => "64"
-
diff --git a/test/cookbooks/nginx/recipes/default.rb b/test/cookbooks/nginx/recipes/default.rb
deleted file mode 100644
index 4c0c3b0..0000000
--- a/test/cookbooks/nginx/recipes/default.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Cookbook Name:: nginx
-# Recipe:: default
-# Author:: AJ Christensen <aj at junglist.gen.nz>
-#
-# Copyright 2008-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.
-#
-
-package "nginx"
-
-directory node[:nginx][:log_dir] do
- mode 0755
- owner node[:nginx][:user]
- action :create
-end
-
-%w{nxensite nxdissite}.each do |nxscript|
- template "/usr/sbin/#{nxscript}" do
- source "#{nxscript}.erb"
- mode 0755
- owner "root"
- group "root"
- end
-end
-
-template "nginx.conf" do
- path "#{node[:nginx][:dir]}/nginx.conf"
- source "nginx.conf.erb"
- owner "root"
- group "root"
- mode 0644
-end
-
-template "#{node[:nginx][:dir]}/sites-available/default" do
- source "default-site.erb"
- owner "root"
- group "root"
- mode 0644
-end
-
-service "nginx" do
- supports :status => true, :restart => true, :reload => true
- action [ :enable, :start ]
-end
diff --git a/test/cookbooks/nginx/recipes/source.rb b/test/cookbooks/nginx/recipes/source.rb
deleted file mode 100644
index 52451bf..0000000
--- a/test/cookbooks/nginx/recipes/source.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Cookbook Name:: nginx
-# Recipe:: source
-#
-# Author:: Adam Jacob (<adam at opscode.com>)
-# Author:: Joshua Timberman (<joshua at 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.
-#
-
-include_recipe "build-essential"
-
-unless platform?("centos","redhat","fedora")
- include_recipe "runit"
-end
-
-packages = value_for_platform(
- ["centos","redhat","fedora"] => {'default' => ['pcre-devel', 'openssl-devel']},
- "default" => ['libpcre3', 'libpcre3-dev', 'libssl-dev']
- )
-
-packages.each do |devpkg|
- package devpkg
-end
-
-nginx_version = node[:nginx][:version]
-
-node.set[:nginx][:install_path] = "/opt/nginx-#{nginx_version}"
-node.set[:nginx][:src_binary] = "#{node[:nginx][:install_path]}/sbin/nginx"
-node.set[:nginx][:daemon_disable] = true
-node.set[:nginx][:configure_flags] = [
- "--prefix=#{node[:nginx][:install_path]}",
- "--conf-path=#{node[:nginx][:dir]}/nginx.conf",
- "--with-http_ssl_module",
- "--with-http_gzip_static_module"
-]
-
-configure_flags = node[:nginx][:configure_flags].join(" ")
-
-remote_file "#{Chef::Config[:file_cache_path]}/nginx-#{nginx_version}.tar.gz" do
- source "http://sysoev.ru/nginx/nginx-#{nginx_version}.tar.gz"
- action :create_if_missing
-end
-
-bash "compile_nginx_source" do
- cwd Chef::Config[:file_cache_path]
- code <<-EOH
- tar zxf nginx-#{nginx_version}.tar.gz
- cd nginx-#{nginx_version} && ./configure #{configure_flags}
- make && make install
- EOH
- creates node[:nginx][:src_binary]
-end
-
-directory node[:nginx][:log_dir] do
- mode 0755
- owner node[:nginx][:user]
- action :create
-end
-
-directory node[:nginx][:dir] do
- owner "root"
- group "root"
- mode "0755"
-end
-
-unless platform?("centos","redhat","fedora")
- runit_service "nginx"
-
- service "nginx" do
- subscribes :restart, resources(:bash => "compile_nginx_source")
- end
-else
- #install init db script
- template "/etc/init.d/nginx" do
- source "nginx.init.erb"
- owner "root"
- group "root"
- mode "0755"
- end
-
- #install sysconfig file (not really needed but standard)
- template "/etc/sysconfig/nginx" do
- source "nginx.sysconfig.erb"
- owner "root"
- group "root"
- mode "0644"
- end
-
- #register service
- service "nginx" do
- supports :status => true, :restart => true, :reload => true
- action :enable
- subscribes :restart, resources(:bash => "compile_nginx_source")
- end
-end
-
-
-%w{ sites-available sites-enabled conf.d }.each do |dir|
- directory "#{node[:nginx][:dir]}/#{dir}" do
- owner "root"
- group "root"
- mode "0755"
- end
-end
-
-%w{nxensite nxdissite}.each do |nxscript|
- template "/usr/sbin/#{nxscript}" do
- source "#{nxscript}.erb"
- mode "0755"
- owner "root"
- group "root"
- end
-end
-
-template "nginx.conf" do
- path "#{node[:nginx][:dir]}/nginx.conf"
- source "nginx.conf.erb"
- owner "root"
- group "root"
- mode "0644"
- notifies :restart, resources(:service => "nginx"), :immediately
-end
-
-cookbook_file "#{node[:nginx][:dir]}/mime.types" do
- source "mime.types"
- owner "root"
- group "root"
- mode "0644"
- notifies :restart, resources(:service => "nginx"), :immediately
-end
diff --git a/test/cookbooks/openldap/attributes/default.rb b/test/cookbooks/openldap/attributes/default.rb
deleted file mode 100644
index ad8d1df..0000000
--- a/test/cookbooks/openldap/attributes/default.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# Cookbook Name:: openldap
-# Attributes:: openldap
-#
-# Copyright 2008-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.
-#
-
-if domain && domain.length > 0
- default[:openldap][:basedn] = "dc=#{domain.split('.').join(",dc=")}"
- default[:openldap][:server] = "ldap.#{domain}"
-end
-
-openldap[:rootpw] = nil
-
-# File and directory locations for openldap.
-case platform
-when "redhat","centos"
- set[:openldap][:dir] = "/etc/openldap"
- set[:openldap][:run_dir] = "/var/run/openldap"
- set[:openldap][:module_dir] = "/usr/lib64/openldap"
-when "debian","ubuntu"
- set[:openldap][:dir] = "/etc/ldap"
- set[:openldap][:run_dir] = "/var/run/slapd"
- set[:openldap][:module_dir] = "/usr/lib/ldap"
-else
- set[:openldap][:dir] = "/etc/ldap"
- set[:openldap][:run_dir] = "/var/run/slapd"
- set[:openldap][:module_dir] = "/usr/lib/ldap"
-end
-
-openldap[:ssl_dir] = "#{openldap[:dir]}/ssl"
-openldap[:cafile] = "#{openldap[:ssl_dir]}/ca.crt"
-
-# Server settings.
-openldap[:slapd_type] = nil
-
-if openldap[:slapd_type] == "slave"
- master = search(:nodes, 'openldap_slapd_type:master')
- default[:openldap][:slapd_master] = master
- default[:openldap][:slapd_replpw] = nil
- default[:openldap][:slapd_rid] = 102
-end
-
-# Auth settings for Apache.
-if openldap[:basedn] && openldap[:server]
- default[:openldap][:auth_type] = "openldap"
- default[:openldap][:auth_binddn] = "ou=people,#{openldap[:basedn]}"
- default[:openldap][:auth_bindpw] = nil
- default[:openldap][:auth_url] = "ldap://#{openldap[:server]}/#{openldap[:auth_binddn]}?uid?sub?(objecctClass=*)"
-end
diff --git a/test/cookbooks/openldap/metadata.rb b/test/cookbooks/openldap/metadata.rb
deleted file mode 100644
index 948b833..0000000
--- a/test/cookbooks/openldap/metadata.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks at opscode.com"
-license "Apache 2.0"
-description "Configures a server to be an OpenLDAP master, replication slave or client for auth"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.9.4"
-recipe "openldap", "Empty, use one of the other recipes"
-recipe "openldap::auth", "Set up openldap for user authentication"
-recipe "openldap::client", "Install openldap client packages"
-recipe "openldap::server", "Set up openldap to be a slapd server"
-
-%w{ ubuntu debian }.each do |os|
- supports os
-end
-
-%w{ openssh nscd }.each do |cb|
- depends cb
-end
-
-attribute "openldap/basedn",
- :display_name => "OpenLDAP BaseDN",
- :description => "BaseDN for the LDAP directory",
- :default => "dc=domain,dc=com"
-
-attribute "openldap/server",
- :display_name => "OpenLDAP Server",
- :description => "LDAP Server, used for URIs",
- :default => "ldap.domain"
-
-attribute "openldap/rootpw",
- :display_name => "OpenLDAP Root Password",
- :description => "Password for 'admin' root user, should be a SHA hash that OpenLDAP supports",
- :default => "nil"
-
-attribute "openldap/dir",
- :display_name => "OpenLDAP Dir",
- :description => "Main configuration directory for OpenLDAP",
- :default => "/etc/ldap"
-
-attribute "openldap/run_dir",
- :display_name => "OpenLDAP Run Directory",
- :description => "Run directory for LDAP server processes",
- :default => "/var/run/slapd"
-
-attribute "openldap/module_dir",
- :display_name => "OpenLDAP Module Directory",
- :description => "Location for OpenLDAP add-on modules",
- :default => "/usr/lib/ldap"
-
-attribute "openldap/ssl_dir",
- :display_name => "OpenLDAP SSL Directory",
- :description => "Location for LDAP SSL certificates",
- :default => "openldap_dir/ssl"
-
-attribute "openldap/cafile",
- :display_name => "OpenLDAP CA File",
- :description => "Location for CA certificate",
- :default => "openldap_dir_ssl/ca.crt"
-
-attribute "openldap/slapd_type",
- :display_name => "OpenLDAP Slapd Type",
- :description => "Whether the server is a master or slave",
- :default => "nil"
-
-attribute "openldap/slapd_master",
- :display_name => "OpenLDP Slapd Master",
- :description => "Search nodes for attribute slapd_type master, for slaves",
- :default => "nil"
-
-attribute "openldap/slapd_replpw",
- :display_name => "OpenLDAP Slapd Replication Password",
- :description => "Password for slaves to replicate from master",
- :default => "nil"
-
-attribute "openldap/slapd_rid",
- :display_name => "OpenLDAP Slapd Replication ID",
- :description => "Slave's ID, must be unique",
- :default => "102"
-
-attribute "openldap/auth_type",
- :display_name => "OpenLDAP Auth Type",
- :description => "Used in Apache configs, AuthBasicProvider",
- :default => "openldap"
-
-attribute "openldap/auth_binddn",
- :display_name => "OpenLDAP Auth BindDN",
- :description => "Used in auth_url and Apache configs, AuthBindDN",
- :default => "ou=people,openldap_basedn"
-
-attribute "openldap/auth_bindpw",
- :display_name => "OpenLDAP Auth Bind Password",
- :description => "Used in Apache configs, AuthBindPassword",
- :default => "nil"
-
-attribute "openldap/auth_url",
- :display_name => "OpenLDAP Auth URL",
- :description => "Used in Apache configs, AuthLDAPURL",
- :default => "ldap://openldap_server/openldap_auth_binddn?uid?sub?(objectClass=*)"
-
diff --git a/test/cookbooks/openldap/recipes/auth.rb b/test/cookbooks/openldap/recipes/auth.rb
deleted file mode 100644
index e46c785..0000000
--- a/test/cookbooks/openldap/recipes/auth.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Cookbook Name:: openldap
-# Recipe:: auth
-#
-# Copyright 2008-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.
-#
-
-include_recipe "openldap::client"
-include_recipe "openssh"
-include_recipe "nscd"
-
-package "libnss-ldap" do
- action :upgrade
-end
-
-package "libpam-ldap" do
- action :upgrade
-end
-
-template "/etc/ldap.conf" do
- source "ldap.conf.erb"
- mode 0644
- owner "root"
- group "root"
-end
-
-template "/etc/ldap/ldap.conf" do
- source "ldap-ldap.conf.erb"
- mode 0644
- owner "root"
- group "root"
-end
-
-cookbook_file "/etc/nsswitch.conf" do
- source "nsswitch.conf"
- mode 0644
- owner "root"
- group "root"
- notifies :restart, resources(:service => "nscd"), :immediately
- notifies :run, resources(:execute => [ "nscd-clear-passwd", "nscd-clear-group" ]), :immediately
-end
-
-%w{ account auth password session }.each do |pam|
- cookbook_file "/etc/pam.d/common-#{pam}" do
- source "common-#{pam}"
- mode 0644
- owner "root"
- group "root"
- notifies :restart, resources(:service => "ssh"), :delayed
- end
-end
-
-template "/etc/security/login_access.conf" do
- source "login_access.conf.erb"
- mode 0644
- owner "root"
- group "root"
-end
diff --git a/test/cookbooks/openldap/recipes/client.rb b/test/cookbooks/openldap/recipes/client.rb
deleted file mode 100644
index 93f009d..0000000
--- a/test/cookbooks/openldap/recipes/client.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Cookbook Name:: openldap
-# Recipe:: client
-#
-# Copyright 2008-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.
-#
-
-package "ldap-utils" do
- action :upgrade
-end
-
-directory node[:openldap][:ssl_dir] do
- mode 0755
- owner "root"
- group "root"
-end
diff --git a/test/cookbooks/openldap/recipes/default.rb b/test/cookbooks/openldap/recipes/default.rb
deleted file mode 100644
index 5d425c9..0000000
--- a/test/cookbooks/openldap/recipes/default.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Cookbook Name:: openldap
-# Recipe:: default
-#
-# Copyright 2008-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.
-#
diff --git a/test/cookbooks/openldap/recipes/server.rb b/test/cookbooks/openldap/recipes/server.rb
deleted file mode 100644
index 7f83090..0000000
--- a/test/cookbooks/openldap/recipes/server.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Cookbook Name:: openldap
-# Recipe:: server
-#
-# Copyright 2008-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.
-#
-include_recipe "openldap::client"
-
-case node[:platform]
-when "ubuntu"
- if (node[:platform_version].to_f >= 10.04)
- package "db4.8-util" do
- action :upgrade
- end
- else
- package "db4.2-util" do
- action :upgrade
- end
- end
- cookbook_file "/var/cache/local/preseeding/slapd.seed" do
- source "slapd.seed"
- mode 0600
- owner "root"
- group "root"
- end
- package "slapd" do
- response_file "slapd.seed"
- action :upgrade
- end
-else
- package "db4.2-util" do
- action :upgrade
- end
- package "slapd" do
- action :upgrade
- end
-end
-
-cookbook_file "#{node[:openldap][:ssl_dir]}/#{node[:openldap][:server]}.pem" do
- source "ssl/#{node[:openldap][:server]}.pem"
- mode 0644
- owner "root"
- group "root"
-end
-
-service "slapd" do
- action [:enable, :start]
-end
-
-if (node[:platform] == "ubuntu") and (node[:platform_version].to_f >= 8.10)
- template "/etc/default/slapd" do
- source "default_slapd.erb"
- owner "root"
- group "root"
- mode 0644
- end
-
- directory "#{node[:openldap][:dir]}/slapd.d" do
- recursive true
- owner "openldap"
- group "openldap"
- action :create
- end
-
- execute "slapd-config-convert" do
- command "slaptest -f #{node[:openldap][:dir]}/slapd.conf -F #{node[:openldap][:dir]}/slapd.d/"
- user "openldap"
- action :nothing
- notifies :start, resources(:service => "slapd"), :immediately
- end
-
- template "#{node[:openldap][:dir]}/slapd.conf" do
- source "slapd.conf.erb"
- mode 0640
- owner "openldap"
- group "openldap"
- notifies :stop, resources(:service => "slapd"), :immediately
- notifies :run, resources(:execute => "slapd-config-convert")
- end
-else
- case node[:platform]
- when "debian","ubuntu"
- template "/etc/default/slapd" do
- source "default_slapd.erb"
- owner "root"
- group "root"
- mode 0644
- end
- end
-
- template "#{node[:openldap][:dir]}/slapd.conf" do
- source "slapd.conf.erb"
- mode 0640
- owner "openldap"
- group "openldap"
- notifies :restart, resources(:service => "slapd")
- end
-end
diff --git a/test/cookbooks/postgresql/attributes/default.rb b/test/cookbooks/postgresql/attributes/default.rb
deleted file mode 100644
index c9a9cb8..0000000
--- a/test/cookbooks/postgresql/attributes/default.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# Cookbook Name:: postgresql
-# Attributes:: postgresql
-#
-# Copyright 2008-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.
-#
-case platform
-when "debian"
-
- if platform_version.to_f == 5.0
- default[:postgresql][:version] = "8.3"
- elsif platform_version =~ /.*sid/
- default[:postgresql][:version] = "8.4"
- end
-
- set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"
-
-when "ubuntu"
-
- if platform_version.to_f <= 9.04
- default[:postgresql][:version] = "8.3"
- else
- default[:postgresql][:version] = "8.4"
- end
-
- set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"
-
-when "fedora"
-
- if platform_version.to_f <= 12
- default[:postgresql][:version] = "8.3"
- else
- default[:postgresql][:version] = "8.4"
- end
-
- set[:postgresql][:dir] = "/var/lib/pgsql/data"
-
-when "redhat","centos"
-
- default[:postgresql][:version] = "8.4"
- set[:postgresql][:dir] = "/var/lib/pgsql/data"
-
-when "suse"
-
- if platform_version.to_f <= 11.1
- default[:postgresql][:version] = "8.3"
- else
- default[:postgresql][:version] = "8.4"
- end
-
- set[:postgresql][:dir] = "/var/lib/pgsql/data"
-
-else
- default[:postgresql][:version] = "8.4"
- set[:postgresql][:dir] = "/etc/postgresql/#{node[:postgresql][:version]}/main"
-end
diff --git a/test/cookbooks/postgresql/metadata.rb b/test/cookbooks/postgresql/metadata.rb
deleted file mode 100644
index 69960eb..0000000
--- a/test/cookbooks/postgresql/metadata.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks at opscode.com"
-license "Apache 2.0"
-description "Installs and configures postgresql for clients or servers"
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.11.1"
-recipe "postgresql", "Empty, use one of the other recipes"
-recipe "postgresql::client", "Installs postgresql client package(s)"
-recipe "postgresql::server", "Installs postgresql server packages, templates"
-recipe "postgresql::redhat", "Installs postgresql server packages, redhat family style"
-recipe "postgresql::server", "Installs postgresql server packages, debian family style"
-
-%w{rhel centos fedora ubuntu debian suse}.each do |os|
- supports os
-end
diff --git a/test/cookbooks/postgresql/recipes/client.rb b/test/cookbooks/postgresql/recipes/client.rb
deleted file mode 100644
index c8f8609..0000000
--- a/test/cookbooks/postgresql/recipes/client.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Cookbook Name:: postgresql
-# Recipe:: client
-#
-# 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.
-#
-
-case node.platform
-when "ubuntu","debian"
- package "postgresql-client"
-when "fedora","suse"
- package "postgresql-devel"
-when "redhat","centos"
- package "postgresql#{node.postgresql.version.split('.').join}-devel"
-end
diff --git a/test/cookbooks/postgresql/recipes/default.rb b/test/cookbooks/postgresql/recipes/default.rb
deleted file mode 100644
index 785b168..0000000
--- a/test/cookbooks/postgresql/recipes/default.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Cookbook Name:: postgresql
-# Recipe:: default
-#
-# 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.
-#
-
-include_recipe "postgresql::client"
diff --git a/test/cookbooks/postgresql/recipes/server.rb b/test/cookbooks/postgresql/recipes/server.rb
deleted file mode 100644
index ede7aa0..0000000
--- a/test/cookbooks/postgresql/recipes/server.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#/postgresql.conf.
-# Cookbook Name:: postgresql
-# Recipe:: server
-#
-# Copyright 2009-2010, 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.
-#
-
-include_recipe "postgresql::client"
-
-case node[:postgresql][:version]
-when "8.3"
- node.default[:postgresql][:ssl] = "off"
-when "8.4"
- node.default[:postgresql][:ssl] = "true"
-end
-
-# Include the right "family" recipe for installing the server
-# since they do things slightly differently.
-case node.platform
-when "redhat", "centos", "fedora", "suse"
- include_recipe "postgresql::server_redhat"
-when "debian", "ubuntu"
- include_recipe "postgresql::server_debian"
-end
diff --git a/test/cookbooks/postgresql/recipes/server_debian.rb b/test/cookbooks/postgresql/recipes/server_debian.rb
deleted file mode 100644
index c1a5826..0000000
--- a/test/cookbooks/postgresql/recipes/server_debian.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#/postgresql.conf.
-# Cookbook Name:: postgresql
-# Recipe:: server
-#
-# Copyright 2009-2010, 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.
-#
-
-include_recipe "postgresql::client"
-
-case node[:postgresql][:version]
-when "8.3"
- node.default[:postgresql][:ssl] = "off"
-when "8.4"
- node.default[:postgresql][:ssl] = "true"
-end
-
-package "postgresql"
-
-service "postgresql" do
- service_name "postgresql-#{node.postgresql.version}"
- supports :restart => true, :status => true, :reload => true
- action :nothing
-end
-
-template "#{node[:postgresql][:dir]}/pg_hba.conf" do
- source "debian.pg_hba.conf.erb"
- owner "postgres"
- group "postgres"
- mode 0600
- notifies :reload, resources(:service => "postgresql")
-end
-
-template "#{node[:postgresql][:dir]}/postgresql.conf" do
- source "debian.postgresql.conf.erb"
- owner "postgres"
- group "postgres"
- mode 0600
- notifies :restart, resources(:service => "postgresql")
-end
diff --git a/test/cookbooks/postgresql/recipes/server_redhat.rb b/test/cookbooks/postgresql/recipes/server_redhat.rb
deleted file mode 100644
index eef5a8b..0000000
--- a/test/cookbooks/postgresql/recipes/server_redhat.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#/postgresql.conf.
-# Cookbook Name:: postgresql
-# Recipe:: server
-#
-# Copyright 2009-2010, 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.
-#
-
-include_recipe "postgresql::client"
-
-# Create a group and user like the package will.
-# Otherwise the templates fail.
-
-group "postgres" do
- # Workaround lack of option for -r and -o...
- group_name "-r -o postgres"
- not_if { Etc.getgrnam("postgres") }
- gid 26
-end
-
-user "postgres" do
- # Workaround lack of option for -M and -n...
- username "-M -n postgres"
- not_if { Etc.getpwnam("postgres") }
- shell "/bin/bash"
- comment "PostgreSQL Server"
- home "/var/lib/pgsql"
- gid "postgres"
- system true
- uid 26
- supports :non_unique => true
-end
-
-package "postgresql" do
- case node.platform
- when "redhat","centos"
- package_name "postgresql#{node.postgresql.version.split('.').join}"
- else
- package_name "postgresql"
- end
-end
-
-case node.platform
-when "redhat","centos"
- package "postgresql#{node.postgresql.version.split('.').join}-server"
-when "fedora","suse"
- package "postgresql-server"
-end
-
-execute "/sbin/service postgresql initdb" do
- not_if { ::FileTest.exist?(File.join(node.postgresql.dir, "PG_VERSION")) }
-end
-
-service "postgresql" do
- supports :restart => true, :status => true, :reload => true
- action [:enable, :start]
-end
-
-template "#{node[:postgresql][:dir]}/pg_hba.conf" do
- source "redhat.pg_hba.conf.erb"
- owner "postgres"
- group "postgres"
- mode 0600
- notifies :reload, resources(:service => "postgresql")
-end
-
-template "#{node[:postgresql][:dir]}/postgresql.conf" do
- source "redhat.postgresql.conf.erb"
- owner "postgres"
- group "postgres"
- mode 0600
- notifies :restart, resources(:service => "postgresql")
-end
diff --git a/test/cookbooks/sqlite/metadata.rb b/test/cookbooks/sqlite/metadata.rb
deleted file mode 100644
index 672c014..0000000
--- a/test/cookbooks/sqlite/metadata.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks at opscode.com"
-license "Apache 2.0"
-description "Installs sqlite"
-version "0.7.1"
-
-recipe "sqlite", "Installs sqlite"
-
-%w{ubuntu debian}.each do |os|
- supports os
-end
diff --git a/test/cookbooks/sqlite/recipes/default.rb b/test/cookbooks/sqlite/recipes/default.rb
deleted file mode 100644
index f2f9daa..0000000
--- a/test/cookbooks/sqlite/recipes/default.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Cookbook Name:: sqlite
-# Recipe:: default
-#
-# 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.
-#
-
-package "sqlite3" do
- action :upgrade
-end
-
-package "sqlite3-doc" do
- action :upgrade
-end
diff --git a/test/cookbooks/vagrant_main/recipes/default.rb b/test/cookbooks/vagrant_main/recipes/default.rb
deleted file mode 100644
index 9c9a8a8..0000000
--- a/test/cookbooks/vagrant_main/recipes/default.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# vagrant_main cookbook
-# This cookbook includes and sets up a server with openldap.
-#
-require_recipe 'apt'
-require_recipe 'openldap::server'
-
-execute[apt-get-update]
-
-# require_recipe 'nginx'
-# include_recipe "openldap::server"
-# require_recipe 'postgresql'
-# require_recipe 'sqlite'
diff --git a/test/moz_cert.rb b/test/moz_cert.rb
index 36384a5..066a96f 100644
--- a/test/moz_cert.rb
+++ b/test/moz_cert.rb
@@ -1,7 +1,6 @@
#!/usr/bin/ruby
require 'rubygems'
-# gem 'ruby-ldap', '~> 0.9.12'
require 'ldap'
require 'optparse'
require 'pp'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-ldap.git
More information about the Pkg-ruby-extras-commits
mailing list