Support fo Ubuntu2404 #26
|
@ -3,8 +3,9 @@
|
|||
# -------------------------------------------
|
||||
node.reverse_merge!({
|
||||
'nginx' => {
|
||||
'version' => '1.25.0',
|
||||
'skip_lego' => 'true',
|
||||
'skip_webadm' => 'true'
|
||||
'version' => '1.26.0',
|
||||
'skip_lego' => true,
|
||||
'skip_webadm' => false,
|
||||
'skip_deploy_conf' => true
|
||||
}
|
||||
})
|
||||
|
|
|
@ -78,7 +78,7 @@ directory MODULEDIR do
|
|||
end
|
||||
|
||||
# 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
|
||||
user USER
|
||||
|
||||
|
|
|
@ -35,6 +35,13 @@ end
|
|||
# Prerequisites for Building nginx:
|
||||
if !node['nginx']['skip_webadm']
|
||||
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 '../everun/default.rb'
|
||||
end
|
||||
|
@ -44,9 +51,5 @@ if !node['nginx']['skip_lego']
|
|||
include_recipe './lego.rb'
|
||||
end
|
||||
|
||||
# Build nginx:
|
||||
include_recipe './build.rb'
|
||||
|
||||
# Setup nginx:
|
||||
include_recipe './setup.rb'
|
||||
|
||||
|
|
|
@ -47,6 +47,7 @@ end
|
|||
end
|
||||
|
||||
# Create `repo` directory:
|
||||
if !node['nginx']['skip_deploy_conf']
|
||||
git '/home/webadm/repo/nginx-config' do
|
||||
user 'webadm'
|
||||
repository 'https://github.com/kazu634/nginx-config.git'
|
||||
|
@ -60,4 +61,4 @@ end
|
|||
service 'consul-template' do
|
||||
action :restart
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue