Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

add cookbook submodules. #2

Merged
merged 2 commits into from

2 participants

@dweinstein

I added the submodules back in and tested the build. Don't know if you're accepting PRs but thought maybe I'd give it a shot.

@dweinstein dweinstein referenced this pull request
Open

Integration of Chef #1

@rickfarmer rickfarmer merged commit bb6c4bb into from
@rickfarmer
Owner

Thanks for the pull request! Merged it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 25, 2014
  1. @dweinstein

    add cookbook submodules.

    dweinstein authored
  2. @dweinstein
This page is out of date. Refresh to see the latest.
View
15 .gitmodules
@@ -0,0 +1,15 @@
+[submodule "cookbooks/apt"]
+ path = cookbooks/apt
+ url = https://github.com/opscode-cookbooks/apt.git
+[submodule "cookbooks/build-essential"]
+ path = cookbooks/build-essential
+ url = https://github.com/opscode-cookbooks/build-essential.git
+[submodule "cookbooks/git"]
+ path = cookbooks/git
+ url = https://github.com/opscode-cookbooks/git.git
+[submodule "cookbooks/vim"]
+ path = cookbooks/vim
+ url = https://github.com/opscode-cookbooks/vim.git
+[submodule "cookbooks/java"]
+ path = cookbooks/java
+ url = https://github.com/opscode-cookbooks/java.git
View
2  README.md
@@ -68,7 +68,7 @@ _Note: All the software needed is automatically downloaded as it is needed. Sev
1. From the newly created working directory, e.g.
- $ cd /csci65/android-vm
+ $ cd /csci65/android-vm && git submodule init
2. Run the following to start Vagrant and kick-off the process to build an Android VM,
2  cookbooks/apt
@@ -1 +1 @@
-Subproject commit b58c75536300794e5b5ffa8747fc9e6c48a4e5ce
+Subproject commit 8ef28bceaa6a9eded47e640d26df4a6f3a80320c
2  cookbooks/build-essential
@@ -1 +1 @@
-Subproject commit 7f4d351036f10e7b641e1df137390491d6111669
+Subproject commit 9eea6e1486754c0a5e700d767a62bde7d69c3194
2  cookbooks/git
@@ -1 +1 @@
-Subproject commit 575a3ee5f6cafa709033c3ac39484512ad028443
+Subproject commit fe2713e528096e5d22441fe53808c79ea77fd0b3
2  cookbooks/java
@@ -1 +1 @@
-Subproject commit c6ef8a7d938edff1c8ac5c1af24026575d32af8c
+Subproject commit 325835205d353be331cbf00f43fe10e8162cee37
1  cookbooks/vim
@@ -0,0 +1 @@
+Subproject commit 858a24f745d3f7e13daca5ba918861d31401e0bf
View
50 cookbooks/vim/README.md
@@ -1,50 +0,0 @@
-Description
-===========
-
-Installs vim.
-
-Requirements
-============
-
-## Platform:
-
-* Ubuntu/Debian
-* Red Hat/CentOS/Fedora/Scientific
-* ArchLinux
-
-Attributes
-==========
-
-* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.
-
-Usage
-=====
-
-Put `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.
-
-If you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.
-
-Changes
-=======
-
-## v1.0.2:
-
-* Fixes COOK-598 (RHEL platforms support).
-
-License and Author
-==================
-
-Author:: Joshua Timberman <joshua@opscode.com>
-
-Copyright 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
View
20 cookbooks/vim/attributes/default.rb
@@ -1,20 +0,0 @@
-#
-# Cookbook Name:: vim
-# Attributes:: default
-#
-# Copyright 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.
-#
-
-default[:vim][:extra_packages] = []
View
36 cookbooks/vim/metadata.json
@@ -1,36 +0,0 @@
-{
- "name": "vim",
- "description": "Installs vim and optional extra packages.",
- "long_description": "Description\n===========\n\nInstalls vim.\n\nRequirements\n============\n\n## Platform:\n\n* Ubuntu/Debian\n* Red Hat/CentOS/Fedora/Scientific\n* ArchLinux\n\nAttributes\n==========\n\n* `node[:vim][:extra_packages]` - An array of extra packages related to vim to install (like plugins). Empty array by default.\n\nUsage\n=====\n\nPut `recipe[vim]` in a run list, or `include_recipe 'vim'` to ensure that vim is installed on your systems.\n\nIf you would like to install additional vim plugin packages, include their package names in the `node[:vim][:extra_packages]` attribute. Verify that your operating sytem has the package available.\n\nChanges\n=======\n\n## v1.0.2:\n\n* Fixes COOK-598 (RHEL platforms support).\n\nLicense and Author\n==================\n\nAuthor:: Joshua Timberman <joshua@opscode.com>\n\nCopyright 2010, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\n",
- "maintainer": "Opscode, Inc.",
- "maintainer_email": "cookbooks@opscode.com",
- "license": "Apache 2.0",
- "platforms": {
- "debian": ">= 0.0.0",
- "ubuntu": ">= 0.0.0",
- "arch": ">= 0.0.0",
- "redhat": ">= 0.0.0",
- "centos": ">= 0.0.0",
- "fedora": ">= 0.0.0",
- "scientific": ">= 0.0.0"
- },
- "dependencies": {
- },
- "recommendations": {
- },
- "suggestions": {
- },
- "conflicting": {
- },
- "providing": {
- },
- "replacing": {
- },
- "attributes": {
- },
- "groupings": {
- },
- "recipes": {
- },
- "version": "1.0.2"
-}
View
11 cookbooks/vim/metadata.rb
@@ -1,11 +0,0 @@
-maintainer "Opscode, Inc."
-maintainer_email "cookbooks@opscode.com"
-license "Apache 2.0"
-description "Installs vim and optional extra packages."
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.0.2"
-
-%w{debian ubuntu arch redhat centos fedora scientific}.each do |os|
- supports os
-end
-
View
35 cookbooks/vim/recipes/default.rb
@@ -1,35 +0,0 @@
-#
-# Cookbook Name:: vim
-# Recipe:: default
-#
-# Copyright 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.
-#
-
-# There is no vim package on RHEL/CentOS derivatives
-# * vim-minimal gives you /bin/vi
-# * vim-enhanced gives you /usr/bin/vim
-vim_base_pkgs = value_for_platform(
- ["ubuntu", "debian", "arch"] => { "default" => ["vim"] },
- ["redhat", "centos", "fedora", "scientific"] => { "default" => ["vim-minimal","vim-enhanced"] },
- "default" => ["vim"]
-)
-
-vim_base_pkgs.each do |vim_base_pkg|
- package vim_base_pkg
-end
-
-node[:vim][:extra_packages].each do |vimpkg|
- package vimpkg
-end
Something went wrong with that request. Please try again.