Merge branch 'enable-nginx-stream' of kazu634/itamae into master

This commit is contained in:
Kazuhiro MUSASHI 2019-10-27 16:09:25 +09:00 committed by Gitea
commit 2088c670ea
3 changed files with 7 additions and 3 deletions

View File

@ -87,3 +87,7 @@ http {
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*; include /etc/nginx/sites-enabled/*;
} }
stream {
include /etc/nginx/stream-enabled/*;
}

View File

@ -8,4 +8,4 @@
--http-uwsgi-temp-path=/var/lib/nginx/uwsgi --with-debug --with-pcre-jit --with-ipv6 --with-http_ssl_module \ --http-uwsgi-temp-path=/var/lib/nginx/uwsgi --with-debug --with-pcre-jit --with-ipv6 --with-http_ssl_module \
--with-http_v2_module --with-http_stub_status_module --with-http_realip_module --with-http_auth_request_module \ --with-http_v2_module --with-http_stub_status_module --with-http_realip_module --with-http_auth_request_module \
--with-http_addition_module --with-http_geoip_module --with-http_gunzip_module --with-http_gzip_static_module \ --with-http_addition_module --with-http_geoip_module --with-http_gunzip_module --with-http_gzip_static_module \
--with-http_sub_module --with-http_sub_module --with-stream --with-stream_ssl_module

View File

@ -7,7 +7,7 @@
end end
end end
%w( sites-available sites-enabled ).each do |d| %w( sites-available sites-enabled stream-available stream-enabled).each do |d|
directory "/etc/nginx/#{d}" do directory "/etc/nginx/#{d}" do
owner 'root' owner 'root'
group 'root' group 'root'
@ -20,7 +20,7 @@ remote_file '/etc/nginx/nginx.conf' do
owner 'root' owner 'root'
group 'root' group 'root'
mode '644' mode '644'
notifies :reload, 'service[nginx]' notifies :reload, 'service[nginx]'
end end