Convert nginx_site to an LWRP

diff --git a/cookbooks/nginx/definitions/nginx_site.rb b/cookbooks/nginx/definitions/nginx_site.rb
deleted file mode 100644 (file)
index dc63df5..0000000
--- a/cookbooks/nginx/definitions/nginx_site.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Cookbook Name:: nginx
-# Definition:: nginx_site
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-define :nginx_site, :action => [:create], :variables => {} do
-  name = params[:name]
-  directory = params[:directory] || "/var/www/#{name}"
-  site_action = params[:action]
-
-  if site_action.include?(:create)
-    template "/etc/nginx/conf.d/#{name}.conf" do
-      cookbook params[:cookbook]
-      source params[:template]
-      owner "root"
-      group "root"
-      mode 0644
-      variables params[:variables].merge(:name => name, :directory => directory)
-      notifies :restart, "service[nginx]"
-    end
-  elsif site_action.include?(:delete)
-    file "/etc/nginx/conf.d/#{name}.conf" do
-      action :delete
-      notifies :restart, "service[nginx]"
-    end
-  end
-end

diff --git a/cookbooks/nginx/providers/site.rb b/cookbooks/nginx/providers/site.rb
new file mode 100644 (file)
index 0000000..64626c5
--- /dev/null
+++ b/cookbooks/nginx/providers/site.rb
@@ -0,0 +1,49 @@
+#
+# Cookbook Name:: nginx
+# Provider:: nginx_site
+#
+# Copyright 2015, 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+def whyrun_supported?
+  true
+end
+
+use_inline_resources
+
+action :create do
+  template conf_path do
+    cookbook new_resource.cookbook
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode 0644
+    variables new_resource.variables.merge(:name => new_resource.name, :directory => directory)
+  end
+end
+
+action :delete do
+  file conf_path do
+    action :delete
+  end
+end
+
+def conf_path
+  "/etc/nginx/conf.d/#{new_resource.name}.conf"
+end
+
+def directory
+  new_resource.directory || "/var/www/#{new_resource.name}"
+end

diff --git a/cookbooks/nginx/resources/site.rb b/cookbooks/nginx/resources/site.rb
new file mode 100644 (file)
index 0000000..bdea434
--- /dev/null
+++ b/cookbooks/nginx/resources/site.rb
@@ -0,0 +1,31 @@
+#
+# Cookbook Name:: nginx
+# Resource:: nginx_site
+#
+# Copyright 2015, 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :create, :delete
+default_action :create
+
+attribute :name, :kind_of => String, :name_attribute => true
+attribute :directory, :kind_of => String
+attribute :cookbook, :kind_of => String
+attribute :template, :kind_of => String, :required => true
+attribute :variables, :kind_of => Hash, :default => {}
+
+def after_created
+  notifies :restart, "service[nginx]"
+end