diff --git a/nginx.init b/nginx.init index 3082c82..094fc65 100644 --- a/nginx.init +++ b/nginx.init @@ -23,7 +23,7 @@ nginx="/usr/sbin/nginx" prog=$(basename $nginx) sysconfig="/etc/sysconfig/$prog" -lockfile="/var/lock/subsys/$prog" +lockfile="/var/lock/subsys/nginx" pidfile="/var/run/${prog}.pid" NGINX_CONF_FILE="/etc/nginx/nginx.conf" diff --git a/nginx.spec b/nginx.spec index 8da55f2..85e3abd 100644 --- a/nginx.spec +++ b/nginx.spec @@ -9,7 +9,7 @@ Name: nginx Version: 0.8.53 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Robust, small and high performance HTTP and reverse proxy server Group: System Environment/Daemons @@ -163,7 +163,6 @@ fi %{_initrddir}/%{name} %dir %{nginx_confdir} %dir %{nginx_confdir}/conf.d -%dir %{nginx_logdir} %config(noreplace) %{nginx_confdir}/conf.d/*.conf %config(noreplace) %{nginx_confdir}/win-utf %config(noreplace) %{nginx_confdir}/%{name}.conf.default @@ -185,11 +184,18 @@ fi %dir %{perl_vendorarch}/auto/%{name} %{perl_vendorarch}/%{name}.pm %{perl_vendorarch}/auto/%{name}/%{name}.so -%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home} -%attr(-,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp} +%attr(0700,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir} +%attr(0700,%{nginx_user},%{nginx_group}) %dir %{nginx_home} +%attr(0700,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp} %changelog +* Sun Dec 12 2010 Jeremy Hinegardner - 0.8.53-3 +- Change ownership of /var/log/nginx to be 0700 nginx:nginx +- update init script to use killproc -p +- add reopen_logs command to init script +- update init script to use nginx -q option + * Sun Oct 31 2010 Jeremy Hinegardner - 0.8.53-2 - Fix linking of perl module