mirror of
https://abf.rosa.ru/djam/angie.git
synced 2025-02-25 03:42:47 +00:00
Automatic import for version 1.1.18
This commit is contained in:
Rosa
parent
f67ef74945
commit
86b42342dd
7 changed files with 61 additions and 168 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"nginx-1.1.16.tar.gz": 4cfc44cf47284f2ea35b916a49972fbc75d084ac
|
||||
"nginx-1.1.18.tar.gz": 084e38afcf3b0ca2e9982ae0f4c4ffcf028be2d3
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (FreeBSD)
|
||||
|
||||
iQEcBAABAgAGBQJPTixNAAoJEFIKmZOhwFL46U8H/3uvO7lxfiaSeYpak+UEv+MP
|
||||
6yCxfrMdgOBsNa3cfox4NRF0kSAR6wj0frYk6S77zMmSwH33/HjdiDPkPKEjdDfV
|
||||
Ig4kNBQ9OxnSkRFFvKVpKL7kJ8oSU4WQv8E6pLi7IqSpmOUb98tjVuCTbH8lHTKT
|
||||
9qewQVSyDSnw8SAPMvUmYGKke4q7S3U74uwynUTWlopHsU+Y+fH3+OlCVsL0xQCa
|
||||
cnwyGFEgzVj7UcS1mkaZ/YKELCe9TR1yEyZn0NbOjXnQ5A6wl/Wr9f20kbZxX/hg
|
||||
l9cTvoOF3pzpyTthNHzhuN964CEQPQYAfTRmFgi93k0qNd1gGYNiWtaPHn1sI3Y=
|
||||
=F9UR
|
||||
-----END PGP SIGNATURE-----
|
||||
11
nginx-1.1.18.tar.gz.asc
Normal file
11
nginx-1.1.18.tar.gz.asc
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (FreeBSD)
|
||||
|
||||
iQEcBAABAgAGBQJPcxMzAAoJEFIKmZOhwFL4v/kH+wXbIVUGKCQXW45uH2mfU1n8
|
||||
YMfKKF7yOaaqL6GEe+Yr9Ge/tmP35Fl0nTKSZuznigJXEqUkYOJI/kF7m1zXhn/o
|
||||
qf4Kz7E747Cz+cvhzVr8VHpOx0RShZp5ivG9r+pWrAre0+hoz2WHRF4eIi9vyjuS
|
||||
AAXW7ux60JrXhdDAQ9bycBjabq4xuKEER7TEwHtNsqVLjnJCweqkclTaVhlc0R2t
|
||||
ZOTFbSymVnwEEe3RjgQ9wusuyGTgln1Uod0uoiOm+Ww2hfhnBVmpwWfQxl0eyjgw
|
||||
vLStMWgByH31MdVCjtqzqz7oBnbVblvVnb1rWICZvQCRhKsl5QdNEQvzjeSyR20=
|
||||
=wWCe
|
||||
-----END PGP SIGNATURE-----
|
||||
133
nginx.init
133
nginx.init
|
|
@ -1,133 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# nginx - this script starts and stops the nginx daemon
|
||||
#
|
||||
# chkconfig: - 85 15
|
||||
# description: Nginx is an HTTP(S) server, HTTP(S) reverse \
|
||||
# proxy and IMAP/POP3 proxy server
|
||||
# processname: nginx
|
||||
# config: /etc/nginx/nginx.conf
|
||||
# config: /etc/sysconfig/nginx
|
||||
# pidfile: /var/run/nginx/nginx.pid
|
||||
|
||||
# Source function library.
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
# Source networking configuration.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
[ "$NETWORKING" = "no" ] && exit 0
|
||||
|
||||
nginx="/usr/sbin/nginx"
|
||||
prog=$(basename $nginx)
|
||||
|
||||
NGINX_CONF_FILE="/etc/nginx/nginx.conf"
|
||||
|
||||
[ -f /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
|
||||
|
||||
lockfile=/var/lock/subsys/nginx
|
||||
|
||||
start() {
|
||||
[ -x $nginx ] || exit 5
|
||||
[ -f $NGINX_CONF_FILE ] || exit 6
|
||||
echo -n $"Starting $prog: "
|
||||
daemon $nginx -c $NGINX_CONF_FILE
|
||||
retval=$?
|
||||
echo
|
||||
[ $retval -eq 0 ] && touch $lockfile
|
||||
return $retval
|
||||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Stopping $prog: "
|
||||
killproc $prog
|
||||
retval=$?
|
||||
echo
|
||||
[ $retval -eq 0 ] && rm -f $lockfile
|
||||
return $retval
|
||||
}
|
||||
|
||||
restart() {
|
||||
configtest_q || configtest || return 6
|
||||
stop
|
||||
start
|
||||
}
|
||||
|
||||
reload() {
|
||||
configtest_q || configtest || return 6
|
||||
echo -n $"Reloading $prog: "
|
||||
killproc $nginx -HUP
|
||||
echo
|
||||
}
|
||||
|
||||
configtest() {
|
||||
$nginx -t -c $NGINX_CONF_FILE
|
||||
}
|
||||
|
||||
configtest_q() {
|
||||
configtest >/dev/null 2>&1
|
||||
}
|
||||
|
||||
rh_status() {
|
||||
status $prog
|
||||
}
|
||||
|
||||
rh_status_q() {
|
||||
rh_status >/dev/null 2>&1
|
||||
}
|
||||
|
||||
# Upgrade the binary with no downtime.
|
||||
upgrade() {
|
||||
local pidfile="/var/run/${prog}/${prog}.pid"
|
||||
local oldbin_pidfile="${pidfile}.oldbin"
|
||||
|
||||
configtest_q || configtest || return 6
|
||||
echo -n $"Starting new master $prog: "
|
||||
killproc $nginx -USR2
|
||||
retval=$?
|
||||
echo
|
||||
sleep 1
|
||||
if [[ -f ${oldbin_pidfile} && -f ${pidfile} ]]; then
|
||||
echo -n $"Graceful shutdown of old $prog: "
|
||||
killproc -p ${oldbin_pidfile} -QUIT
|
||||
retval=$?
|
||||
echo
|
||||
return 0
|
||||
else
|
||||
echo $"Something bad happened, manual intervention required, maybe restart?"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
rh_status_q && exit 0
|
||||
$1
|
||||
;;
|
||||
stop)
|
||||
rh_status_q || exit 0
|
||||
$1
|
||||
;;
|
||||
restart|configtest)
|
||||
$1
|
||||
;;
|
||||
force-reload|upgrade)
|
||||
rh_status_q || exit 7
|
||||
upgrade
|
||||
;;
|
||||
reload)
|
||||
rh_status_q || exit 7
|
||||
$1
|
||||
;;
|
||||
status|status_q)
|
||||
rh_$1
|
||||
;;
|
||||
condrestart|try-restart)
|
||||
rh_status_q || exit 7
|
||||
restart
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|reload|configtest|status|force-reload|upgrade|restart}"
|
||||
exit 2
|
||||
esac
|
||||
13
nginx.service
Normal file
13
nginx.service
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
[Unit]
|
||||
Description=A high performance web server and reverse proxy server
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/nginx/nginx.pid
|
||||
ExecStartPre=/usr/sbin/nginx -t -c /etc/nginx/nginx.conf
|
||||
ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf
|
||||
ExecReload=/usr/sbin/nginx -c /etc/nginx/nginx.conf -s reload
|
||||
ExecStop=/usr/sbin/nginx -s quit
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
55
nginx.spec
55
nginx.spec
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
Summary: Robust, small and high performance http and reverse proxy server
|
||||
Name: nginx
|
||||
Version: 1.1.16
|
||||
Version: 1.1.18
|
||||
Release: 1
|
||||
Group: System/Servers
|
||||
# BSD License (two clause)
|
||||
|
|
@ -18,28 +18,27 @@ License: BSD
|
|||
URL: http://nginx.net/
|
||||
Source0: http://nginx.org/download/nginx-%{version}.tar.gz
|
||||
Source1: http://nginx.org/download/nginx-%{version}.tar.gz.asc
|
||||
Source2: %{name}.init
|
||||
Source3: %{name}.logrotate
|
||||
Source2: nginx.service
|
||||
Source3: nginx.logrotate
|
||||
Source4: virtual.conf
|
||||
Source5: ssl.conf
|
||||
Source6: %{name}.sysconfig
|
||||
Source100: index.html
|
||||
Source101: poweredby.png
|
||||
Source102: nginx-logo.png
|
||||
Source103: 50x.html
|
||||
Source104: 404.html
|
||||
Requires(post): rpm-helper
|
||||
Requires(preun): rpm-helper
|
||||
Requires(pre): rpm-helper
|
||||
Requires(postun): rpm-helper
|
||||
Requires(pre): apache-conf >= 2.2.0
|
||||
Requires: apache-conf >= 2.2.0
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: gd-devel
|
||||
BuildRequires: GeoIP-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: perl(ExtUtils::Embed)
|
||||
BuildRequires: zlib-devel
|
||||
Requires: pcre
|
||||
Requires: geoip
|
||||
Requires: openssl
|
||||
Provides: webserver
|
||||
|
||||
|
|
@ -65,16 +64,24 @@ proxy server written by Igor Sysoev.
|
|||
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
|
||||
--pid-path=/var/run/%{name}/%{name}.pid \
|
||||
--lock-path=/var/lock/subsys/%{name} \
|
||||
--with-file-aio \
|
||||
--with-ipv6 \
|
||||
--with-http_ssl_module \
|
||||
--with-http_realip_module \
|
||||
--with-http_addition_module \
|
||||
--with-http_xslt_module \
|
||||
--with-http_image_filter_module \
|
||||
--with-http_geoip_module \
|
||||
--with-http_sub_module \
|
||||
--with-http_dav_module \
|
||||
--with-http_flv_module \
|
||||
--with-http_mp4_module \
|
||||
--with-http_gzip_static_module \
|
||||
--with-http_random_index_module \
|
||||
--with-http_secure_link_module \
|
||||
--with-http_degradation_module \
|
||||
--with-http_stub_status_module \
|
||||
--with-http_perl_module \
|
||||
--with-ipv6 \
|
||||
--with-mail \
|
||||
--with-mail_ssl_module \
|
||||
--with-cc-opt="$CFLAGS $(pcre-config --cflags)"
|
||||
|
|
@ -84,6 +91,7 @@ proxy server written by Igor Sysoev.
|
|||
%make OPTIMIZE="-fno-PIE"
|
||||
|
||||
%install
|
||||
|
||||
%makeinstall_std INSTALLDIRS=vendor
|
||||
|
||||
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
|
||||
|
|
@ -93,9 +101,8 @@ find %{buildroot} -type f -exec chmod 0644 {} \;
|
|||
find %{buildroot} -type f -name '*.so' -exec chmod 0755 {} \;
|
||||
chmod 0755 %{buildroot}%{_sbindir}/nginx
|
||||
|
||||
%{__install} -p -D -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
|
||||
%{__install} -p -D -m 0755 %{SOURCE2} %{buildroot}/lib/systemd/system/nginx.service
|
||||
%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
||||
%{__install} -p -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
||||
%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
|
||||
%{__install} -p -m 0644 %{SOURCE4} %{SOURCE5} %{buildroot}%{nginx_confdir}/conf.d
|
||||
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
|
||||
|
|
@ -121,15 +128,21 @@ install -m0644 man/*.8 %{buildroot}%{_mandir}/man8/
|
|||
%_pre_useradd %{nginx_user} %{nginx_home} /bin/false
|
||||
|
||||
%post
|
||||
%_post_service %{nginx_user}
|
||||
if [ -f /var/lock/subsys/%{name} ]; then
|
||||
%{_initrddir}/%{name} restart 1>&2;
|
||||
if [ $1 -eq 1 ]; then
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
%_preun_service %{nginx_user}
|
||||
if [ $1 -eq 0 ]; then
|
||||
/bin/systemctl --no-reload disable nginx.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl stop nginx.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -gt 1 ]; then
|
||||
/bin/systemctl try-restart nginx.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%_postun_userdel %{nginx_user}
|
||||
|
||||
%files
|
||||
|
|
@ -139,7 +152,7 @@ fi
|
|||
%{_sbindir}/%{name}
|
||||
%{_mandir}/man3/%{name}.3pm*
|
||||
%{_mandir}/man8/*
|
||||
%{_initrddir}/%{name}
|
||||
/lib/systemd/system/nginx.service
|
||||
%dir %{nginx_confdir}
|
||||
%dir %{nginx_confdir}/conf.d
|
||||
%config(noreplace) %{nginx_confdir}/conf.d/*.conf
|
||||
|
|
@ -159,7 +172,6 @@ fi
|
|||
%config(noreplace) %{nginx_confdir}/uwsgi_params
|
||||
%config(noreplace) %{nginx_confdir}/uwsgi_params.default
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
||||
%dir %{perl_vendorarch}/auto/%{name}
|
||||
%{perl_vendorarch}/%{name}.pm
|
||||
%{perl_vendorarch}/auto/%{name}/%{name}.so
|
||||
|
|
@ -170,6 +182,11 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 29 2012 Oden Eriksson <oeriksson@mandriva.com> 1.1.18-1
|
||||
+ Revision: 788064
|
||||
- 1.1.18
|
||||
- sync with fedora a bit
|
||||
|
||||
* Sat Mar 03 2012 Lonyai Gergely <aleph@mandriva.org> 1.1.16-1
|
||||
+ Revision: 782041
|
||||
- 1.1.16
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
# Configuration file for the nginx service
|
||||
|
||||
# set this to the location of the nginx configuration file
|
||||
NGINX_CONF_FILE=/etc/nginx/nginx.conf
|
||||
Loading…
Add table
Reference in a new issue