Revert "Drop civisualize, add omnipay"

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

diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb
index 7f7ecc6bb7a4e799ae7e953acc89bb068ae6387d..5de2bfcaade352b9623842a44031b02e297e1799 100644 (file)
--- a/cookbooks/apache/resources/module.rb
+++ b/cookbooks/apache/resources/module.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: apache
+# Cookbook:: apache

 # Resource:: apache_module
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action [:install, :enable]
 
 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 :package, :kind_of => String
 property :conf, :kind_of => String
 property :variables, :kind_of => Hash, :default => {}


@@ -28,12 +30,12 @@ property :restart_apache, :kind_of => [TrueClass, FalseClass], :default => true
 action :install do
   declare_resource :package, package_name unless installed?
 
 action :install do
   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"
       group "root"
     template available_name("conf") do
       source new_resource.conf
       owner "root"
       group "root"

-      mode 0o644
+      mode "644"

       variables new_resource.variables
     end
   end
       variables new_resource.variables
     end
   end