Remove attempt to force geodns rebuilds with --assume-new

[chef.git] / cookbooks / apache / resources / module.rb

diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 7947071e7fe20d4715e19adbdf6d833d40c4d13e..52cde2f8547272f71c03b338b128ffd03ccda2a5 100644 (file)
--- a/cookbooks/apache/resources/module.rb
+++ b/cookbooks/apache/resources/module.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: apache
+# Cookbook:: apache
 # Resource:: apache_module
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # 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
+# https://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,
@@ -19,16 +19,16 @@
 
 default_action [:install, :enable]
 
-property :module, :kind_of => String, :name_attribute => true
+property :module, :kind_of => String, :name_property => true
 property :package, :kind_of => String
 property :conf, :kind_of => String
 property :variables, :kind_of => Hash, :default => {}
 property :restart_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :install do
-  package package_name unless installed?
+  declare_resource :package, package_name unless installed?
 
-  if new_resource.conf # ~FC023
+  if new_resource.conf
     template available_name("conf") do
       source new_resource.conf
       owner "root"