Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed template for rails virtual host, use /etc/sliceconfig/install…
…/interactive/nginx_config.rb insted

Updated nginx: added stub-status module on /nginx_status location, added auth module
  • Loading branch information
Timur Vafin committed Aug 18, 2008
1 parent 77b4d44 commit 8a23309
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 99 deletions.
Binary file modified RPMS/x86_64/nginx-0.6.32-3.x86_64.rpm
Binary file not shown.
5 changes: 5 additions & 0 deletions SOURCES/nginx.conf
Expand Up @@ -54,6 +54,11 @@ http {

# pass from backend information about server
server_names_hash_bucket_size 128;

## server status
##
include /etc/nginx/status.conf;


## virtual hosts
##
Expand Down
95 changes: 0 additions & 95 deletions SOURCES/rails.example

This file was deleted.

8 changes: 8 additions & 0 deletions SOURCES/status.conf
@@ -0,0 +1,8 @@
server {
location /nginx_status {
stub_status on;
access_log off;
allow 127.0.0.1;
deny all;
}
}
Binary file modified SRPMS/nginx-0.6.32-3.src.rpm
Binary file not shown.
8 changes: 4 additions & 4 deletions nginx.spec
Expand Up @@ -39,7 +39,7 @@ Source103: 50x.html
Source104: 404.html
Source105: nginx.conf
Source106: bots.conf
Source107: rails.example
Source107: status.conf

# removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
Expand Down Expand Up @@ -94,11 +94,11 @@ export DESTDIR=%{buildroot}
--lock-path=%{_localstatedir}/lock/subsys/%{name} \
--with-http_ssl_module \
--with-http_gzip_static_module \
--with-http_stub_status_module \
--without-select_module \
--without-poll_module \
--without-http_charset_module \
--without-http_userid_module \
--without-http_access_module \
--without-http_auth_basic_module \
--without-http_autoindex_module \
--without-http_geo_module \
Expand Down Expand Up @@ -133,7 +133,7 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/vhosts
%{__install} -p -m 0644 %{SOURCE105} %{buildroot}%{nginx_confdir}
%{__install} -p -m 0644 %{SOURCE106} %{buildroot}%{nginx_confdir}
%{__install} -p -m 0644 %{SOURCE107} %{buildroot}%{nginx_confdir}/vhosts
%{__install} -p -m 0644 %{SOURCE107} %{buildroot}%{nginx_confdir}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
Expand Down Expand Up @@ -184,7 +184,7 @@ fi
%config(noreplace) %{nginx_confdir}/mime.types.default
%config(noreplace) %{nginx_confdir}/nginx.conf.default

%config(noreplace) %{nginx_confdir}/vhosts/rails.example
%config(noreplace) %{nginx_confdir}/status.conf
%config(noreplace) %{nginx_confdir}/koi-win
%config(noreplace) %{nginx_confdir}/koi-utf
%config(noreplace) %{nginx_confdir}/%{name}.conf
Expand Down

0 comments on commit 8a23309

Please sign in to comment.