Revert "Drop civisualize, add omnipay"

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

diff --git a/cookbooks/apache/resources/conf.rb b/cookbooks/apache/resources/conf.rb
index 8e70701c85d4b133b7361a1f99025b6886ed6e1b..9f1efb24f284f6b8d4c725b925f1946c3927418b 100644 (file)
--- a/cookbooks/apache/resources/conf.rb
+++ b/cookbooks/apache/resources/conf.rb
@@ -1,8 +1,8 @@
 #
 #

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

 # Resource:: apache_conf
 #
 # Resource:: apache_conf
 #

-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, 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,11 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action [:create, :enable]
 
 default_action [:create, :enable]
 

-property :conf, :kind_of => String, :name_attribute => true
+property :conf, :kind_of => String, :name_property => true

 property :cookbook, :kind_of => String
 property :cookbook, :kind_of => String

-property :template, :kind_of => String, :required => true
+property :template, :kind_of => String, :required => [:create]

 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 property :variables, :kind_of => Hash, :default => {}
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 


@@ -48,7 +50,7 @@ action_class do
       source new_resource.template
       owner "root"
       group "root"
       source new_resource.template
       owner "root"
       group "root"

-      mode 0o644
+      mode "644"

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