Accumulative changes for `nginc` recipe.

This commit is contained in:
Kazuhiro MUSASHI 2024-05-06 17:09:18 +09:00
parent 6fe04fdaa0
commit f122269855
4 changed files with 24 additions and 19 deletions

View File

@ -3,8 +3,9 @@
# ------------------------------------------- # -------------------------------------------
node.reverse_merge!({ node.reverse_merge!({
'nginx' => { 'nginx' => {
'version' => '1.25.0', 'version' => '1.26.0',
'skip_lego' => 'true', 'skip_lego' => true,
'skip_webadm' => 'true' 'skip_webadm' => false,
'skip_deploy_conf' => true
} }
}) })

View File

@ -78,7 +78,7 @@ directory MODULEDIR do
end end
# Build starts here: # Build starts here:
execute "#{NGINXBUILD} -d working -v #{version} -c configure.sh -zlib -pcre -libressl -libresslversion 3.8.0" do execute "#{NGINXBUILD} -d working -v #{version} -c configure.sh -zlib -pcre -libressl -libresslversion 3.9.1" do
cwd WORKDIR cwd WORKDIR
user USER user USER

View File

@ -35,6 +35,13 @@ end
# Prerequisites for Building nginx: # Prerequisites for Building nginx:
if !node['nginx']['skip_webadm'] if !node['nginx']['skip_webadm']
include_recipe './webadm.rb' include_recipe './webadm.rb'
end
# Build nginx:
include_recipe './build.rb'
# Check whether to deploy the nginx confings:
if !node['nginx']['skip_deploy_conf']
include_recipe '../blog/default.rb' include_recipe '../blog/default.rb'
include_recipe '../everun/default.rb' include_recipe '../everun/default.rb'
end end
@ -44,9 +51,5 @@ if !node['nginx']['skip_lego']
include_recipe './lego.rb' include_recipe './lego.rb'
end end
# Build nginx:
include_recipe './build.rb'
# Setup nginx: # Setup nginx:
include_recipe './setup.rb' include_recipe './setup.rb'

View File

@ -47,6 +47,7 @@ end
end end
# Create `repo` directory: # Create `repo` directory:
if !node['nginx']['skip_deploy_conf']
git '/home/webadm/repo/nginx-config' do git '/home/webadm/repo/nginx-config' do
user 'webadm' user 'webadm'
repository 'https://github.com/kazu634/nginx-config.git' repository 'https://github.com/kazu634/nginx-config.git'
@ -60,4 +61,4 @@ end
service 'consul-template' do service 'consul-template' do
action :restart action :restart
end end
end