Merge pull request #132 from artem-sidorenko/apt-yum-removal

Remove dependenies to apt and yum cookbooks.
dev-sec · Oct 24, 2016 · d7409fc · d7409fc
2 parents ddb8528 + 6e37167
commit d7409fc
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
-  chef_version: 12.5.1
+  chef_version: 12.14.89
   privileged: true # because Docker and SystemD/Upstart
 
 transport:

diff --git a/README.md b/README.md
@@ -29,11 +29,9 @@ It will not:
 
 ## Requirements
 
-* Chef
+* Chef >= 12.14.89
 * Cookbooks:
   * Sander van Zoest sysctl `https://github.com/svanzoest-cookbooks/sysctl`
-  * Chef apt `https://github.com/chef-cookbooks/apt`
-  * Chef yum `https://github.com/chef-cookbooks/yum`
 
 **Note for `sysctl` usage:**
 

diff --git a/metadata.rb b/metadata.rb
@@ -30,8 +30,6 @@
 supports 'oracle', '>= 6.4'
 
 depends 'sysctl', '<= 0.7.5'
-depends 'apt', '~> 3.0.0'
-depends 'yum'
 
 recipe 'os-hardening::default', 'harden the operating system (all recipes)'
 recipe 'os-hardening::limits', 'prevent core dumps'

diff --git a/recipes/apt.rb b/recipes/apt.rb
@@ -18,8 +18,6 @@
 # limitations under the License.
 #
 
-include_recipe 'apt'
-
 # apt-get and aptitude check package signatures by default.
 # TODO: could check apt.conf to make sure this hasn't been disabled.
 

diff --git a/recipes/yum.rb b/recipes/yum.rb
@@ -18,8 +18,6 @@
 # limitations under the License.
 #
 
-include_recipe 'yum'
-
 # NSA chapter: NSA 2.1.2.3.3
 # verify package signatures
 # search /etc/yum.conf gpgcheck=1