priestjim · Jul 5, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 12, 2023
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -140,7 +140,7 @@
 default['openresty']['worker_rlimit_nofile']          = nil
 default['openresty']['multi_accept']                  = false
 
-default['openresty']['try_aio']                       = true
+default['openresty']['try_aio']                       = false
 
 # epoll is available only on Linux kernels >= 2.6
 if node['os'].eql?('linux') && node['kernel']['release'].to_f >= 2.6
@@ -156,6 +156,8 @@
 default['openresty']['large_client_header_buffers']   = '32 32k'
 default['openresty']['types_hash_max_size']           = 2048
 default['openresty']['types_hash_bucket_size']        = 64
+default['openresty']['variables_hash_max_size']       = 1024
+default['openresty']['variables_hash_bucket_size']    = 64
 
 # Open file cache - for metadata operations only
 default['openresty']['open_file_cache'] = {

diff --git a/attributes/luarocks.rb b/attributes/luarocks.rb
@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 
-default['openresty']['luarocks']['version']       = '2.4.2'
-default['openresty']['luarocks']['url']           = "http://luarocks.org/releases/luarocks-#{node['openresty']['luarocks']['version']}.tar.gz"
-default['openresty']['luarocks']['checksum']      = '0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5'
+default['openresty']['luarocks']['version']       = '3.9.2'
+default['openresty']['luarocks']['url']           = "https://luarocks.org/releases/luarocks-#{node['openresty']['luarocks']['version']}.tar.gz"
+default['openresty']['luarocks']['checksum']      = 'bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb'
 default['openresty']['luarocks']['default_rocks'] = Hash.new
diff --git a/providers/site.rb b/providers/site.rb
diff --git a/recipes/apt_package.rb b/recipes/apt_package.rb
@@ -0,0 +1,60 @@
+# Cookbook Name:: openresty
+# Recipe:: apt_package
+#
+
+openresty_dir = '/usr/local/openresty'
+
+node.force_default['openresty']['service']['resource']  = 'service[openresty]'
+node.force_default['openresty']['dir']                  = '/etc/openresty'
+node.force_default['openresty']['log_dir']              = "/var/log/nginx"
+node.force_default['openresty']['cache_dir']            = '/var/cache/nginx'
+node.force_default['openresty']['binary']               = "#{openresty_dir}/nginx/sbin/nginx"
+node.force_default['openresty']['pid']                  = "#{openresty_dir}/nginx/logs/nginx.pid"
+# Needed to compile LuaRocks
+node.force_default['openresty']['source']['prefix']    = openresty_dir
+
+apt_repository 'openresty' do
+  uri          "https://openresty.org/package/#{node['platform']}"
+  distribution node['lsb']['codename']
+  components   ['main']
+  key          'https://openresty.org/package/pubkey.gpg'
+end
+
+# Do not start the service automatically after installing the package.
+# The default config listens on port 80 on every interface
+execute "systemctl mask openresty" do
+  action :nothing
+end
+
+execute "systemctl unmask openresty" do
+  action :nothing
+end
+
+package 'openresty' do
+  notifies :run, "execute[systemctl mask openresty]", :before
+  notifies :run, "execute[systemctl unmask openresty]", :immediately
+end
+
+include_recipe 'openresty::ohai_plugin'
+include_recipe 'openresty::commons_cleanup'
+include_recipe 'openresty::commons_user'
+include_recipe 'openresty::commons_dir'
+include_recipe 'openresty::commons_script'
+include_recipe 'openresty::commons_conf'
+include_recipe 'openresty::luarocks'
+
+file "#{openresty_dir}/nginx/html/index.html" do
+  action :delete
+  backup false
+end
+file "#{openresty_dir}/nginx/html/50x.html" do
+  action :delete
+  backup false
+end
+
+service 'openresty' do
+  supports :status => true, :restart => true, :reload => true
+  if node['openresty']['service']['start_on_boot']
+    action [ :enable, :start ]
+  end
+end
diff --git a/recipes/luarocks.rb b/recipes/luarocks.rb
@@ -21,10 +21,9 @@
 
 # Make sure we build with LUAJIT
 node.override['openresty']['or_modules']['luajit'] = true
-include_recipe 'openresty'
 
 # Install needed packages
-%w{ zip unzip }.each do |pkg|
+%w{ build-essential zip unzip }.each do |pkg|
   package pkg
 end
 

diff --git a/resources/site.rb b/resources/site.rb
@@ -23,8 +23,73 @@
 
 default_action :enable
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :template, :kind_of => String, :default => nil
-attribute :variables, :kind_of => Hash, :default => {}
-attribute :cookbook, :kind_of => String, :default => nil
-attribute :timing, [:delayed, :immediately], :default => :delayed
+property :name, kind_of: String, name_property: true
+property :template, kind_of: String, default: nil
+property :variables, kind_of: Hash, default: {}
+property :cookbook, kind_of: String, default: nil
+property :timing, [:delayed, :immediately], default: :delayed
+property :redirect_http, kind_of: [TrueClass, FalseClass], default: true
+
+action :enable do
+  site_name = (new_resource.name == 'default') ? '000-default' : new_resource.name
+  openresty_dir = node['openresty']['dir']
+
+  if new_resource.template
+    if new_resource.redirect_http
+      template "#{openresty_dir}/sites-available/#{site_name}_http" do
+        source "redirect_http.conf.erb"
+        owner 'root'
+        group 'root'
+        mode 00644
+        variables new_resource.variables
+        cookbook 'openresty'
+        if node['openresty']['service']['start_on_boot']
+          notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+        end
+      end
+
+      link "#{openresty_dir}/sites-enabled/#{site_name}_http" do
+        to "#{openresty_dir}/sites-available/#{site_name}_http"
+        action :create
+        notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+      end
+    end
+
+    template "#{openresty_dir}/sites-available/#{site_name}" do
+      source new_resource.template
+      owner 'root'
+      group 'root'
+      mode 00644
+      variables new_resource.variables
+      cookbook new_resource.cookbook
+      if node['openresty']['service']['start_on_boot']
+        notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+      end
+    end
+  end
+
+  link "#{openresty_dir}/sites-enabled/#{site_name}" do
+    to "#{openresty_dir}/sites-available/#{site_name}"
+    action :create
+    notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+  end
+end
+
+action :disable do
+  site_name = (new_resource.name == 'default') ? '000-default' : new_resource.name
+  openresty_dir = node['openresty']['dir']
+
+  if new_resource.redirect_http
+    link "#{openresty_dir}/sites-enabled/#{site_name}_http" do
+      to "#{openresty_dir}/sites-available/#{site_name}_http"
+      action :delete
+      notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+    end
+  end
+
+  link "#{openresty_dir}/sites-enabled/#{site_name}" do
+    to "#{openresty_dir}/sites-available/#{site_name}"
+    action :delete
+    notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+  end
+end
diff --git a/resources/stream.rb b/resources/stream.rb
@@ -0,0 +1,74 @@
+#
+# Cookbook Name:: openresty
+# Resource:: stream
+#
+# Author:: Kosmos Developers (<mail@kosmos.org>)
+#
+# Copyright 2023, Kosmos Developers
+#
+# 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 :enable, :disable
+
+default_action :enable
+
+property :name, kind_of: String, name_property: true
+property :template, kind_of: String, default: nil
+property :variables, kind_of: Hash, default: {}
+property :cookbook, kind_of: String, default: nil
+property :timing, [:delayed, :immediately], default: :delayed
+
+action :enable do
+  openresty_dir = node['openresty']['dir']
+
+  [ "#{openresty_dir}/streams-enabled",
+    "#{openresty_dir}/streams-available" ].each do |dir|
+    directory dir do
+      owner 'root'
+      group 'root'
+      mode 00644
+    end
+  end
+
+  stream_name = (new_resource.name == 'default') ? '000-default' : new_resource.name
+  if new_resource.template
+    template "#{openresty_dir}/streams-available/#{stream_name}" do
+      source new_resource.template
+      owner 'root'
+      group 'root'
+      mode 00644
+      variables new_resource.variables
+      cookbook new_resource.cookbook
+      if node['openresty']['service']['start_on_boot']
+        notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+      end
+    end
+  end
+
+  link "#{openresty_dir}/streams-enabled/#{stream_name}" do
+    to "#{openresty_dir}/streams-available/#{stream_name}"
+    action :create
+    notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+  end
+end
+
+action :disable do
+  openresty_dir = node['openresty']['dir']
+
+  link "#{openresty_dir}/streams-enabled/#{stream_name}" do
+    to "#{openresty_dir}/streams-available/#{stream_name}"
+    action :delete
+    notifies :reload, node['openresty']['service']['resource'], new_resource.timing
+  end
+end
diff --git a/templates/default/nginx.conf.erb b/templates/default/nginx.conf.erb
@@ -89,6 +89,9 @@ http {
   types_hash_max_size <%= node['openresty']['types_hash_max_size'] %>;
   types_hash_bucket_size <%= node['openresty']['types_hash_bucket_size'] %>;
 
+  variables_hash_max_size <%= node['openresty']['variables_hash_max_size'] %>;
+  variables_hash_bucket_size <%= node['openresty']['variables_hash_bucket_size'] %>;
+
   <% if node['openresty']['lua_package_path'] %>
   lua_package_path <%= node['openresty']['lua_package_path'] %>;
   <% end %>
@@ -103,3 +106,7 @@ http {
   include <%= node['openresty']['dir'] %>/conf.d/*.conf;
   include <%= node['openresty']['dir'] %>/sites-enabled/*;
 }
+
+stream {
+  include <%= node['openresty']['dir'] %>/streams-enabled/*;
+}
diff --git a/templates/default/redirect_http.conf.erb b/templates/default/redirect_http.conf.erb
@@ -0,0 +1,7 @@
+server {
+  listen <%= "#{node['openresty']['listen_ip']}:" if node['openresty']['listen_ip'] %>80;
+  server_name <%= @domain || @server_name %>;
+  location / {
+    return 301 https://$host$request_uri;
+  }
+}