Permalink
Browse files

Merge branch 'master' of github.com:mdxp/chef-repo-jenkins

  • Loading branch information...
2 parents b1e914a + 967abdf commit 8b18b76513b85345e5dbe16c7f88b726914904ac Jenkins CI committed May 8, 2012
Showing with 27 additions and 4 deletions.
  1. +1 −1 .chef_jenkins_last_commit
  2. +1 −1 cookbooks/dotdeb/metadata.rb
  3. +1 −1 cookbooks/php-fpm/metadata.rb
  4. +24 −1 environments/dev.json
@@ -1 +1 @@
-4bb464586a9fea6aa7ae92a26076bd86641373f8
+76a233e70beeb744daa6e9697c4453bcde1aee45
@@ -2,7 +2,7 @@
maintainer_email "wik@rentasite.com.ua"
license "Apache 2.0"
description "Dotdeb repositories"
-version "0.1.1"
+version '0.1.2'
recipe "dotdeb", "main Dotdeb repository"
recipe "dotdeb::php53", "php53 Dotdeb repository"
@@ -2,7 +2,7 @@
maintainer_email "wik@rentasite.com.ua"
license "Apache 2.0"
description "Installs and maintain php-fpm sapi"
-version "0.1.0"
+version '0.1.1'
recipe "php-fpm", "Installs php-fpm"
%w{ debian }.each do |os|
View
@@ -1 +1,24 @@
-Check your configuration file and ensure that your private key is readable
+{
+ "name": "dev",
+ "default_attributes": {
+ },
+ "json_class": "Chef::Environment",
+ "description": "",
+ "cookbook_versions": {
+ "jenkins": "= 0.6.4",
+ "runit": "= 0.15.1",
+ "ohai": "= 1.0.3",
+ "iptables": "= 0.10.7",
+ "java": "= 1.5.1",
+ "vim": "= 1.0.3",
+ "nginx": "= 0.101.3",
+ "dotdeb": "= 0.1.2",
+ "php-fpm": "= 0.1.1",
+ "build-essential": "= 1.0.1",
+ "apache2": "= 1.2.12",
+ "bluepill": "= 1.0.5"
+ },
+ "override_attributes": {
+ },
+ "chef_type": "environment"
+}

0 comments on commit 8b18b76

Please sign in to comment.