Run smokeping on prometheus servers

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

diff --git a/cookbooks/apache/resources/site.rb b/cookbooks/apache/resources/site.rb
index 8aa9c78a1debe9d3d0f384dfa80dab2cfbf534f1..598f841ff86e131abea1546c3370e38b56577342 100644 (file)
--- a/cookbooks/apache/resources/site.rb
+++ b/cookbooks/apache/resources/site.rb
@@ -1,14 +1,14 @@
 #
 #

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

 # Resource:: apache_site
 #
 # Resource:: apache_site
 #

-# 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,12 +17,14 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

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

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

 property :directory, :kind_of => String
 property :cookbook, :kind_of => String
 property :directory, :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
 


@@ -32,7 +34,7 @@ action :create 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.merge(:name => new_resource.site, :directory => site_directory)
   end
 end
     variables new_resource.variables.merge(:name => new_resource.site, :directory => site_directory)
   end
 end