comparison auto/install @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 25255878df91
children bc110f60c0de
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
99 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \ 99 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params' \
100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX' 100 || cp conf/fastcgi_params '\$(DESTDIR)$NGX_CONF_PREFIX'
101 cp conf/fastcgi_params \ 101 cp conf/fastcgi_params \
102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default' 102 '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
103 103
104 test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
105 || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
106 cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
107
104 test -f '\$(DESTDIR)$NGX_CONF_PATH' \ 108 test -f '\$(DESTDIR)$NGX_CONF_PATH' \
105 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' 109 || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
106 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' 110 cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
107 111
108 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \ 112 test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
142 kill -USR2 \`cat $NGX_PID_PATH\` 146 kill -USR2 \`cat $NGX_PID_PATH\`
143 sleep 1 147 sleep 1
144 test -f $NGX_PID_PATH.oldbin 148 test -f $NGX_PID_PATH.oldbin
145 149
146 kill -QUIT \`cat $NGX_PID_PATH.oldbin\` 150 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
147
148 upgrade1:
149 # upgrade 0.1.x to 0.2+
150
151 $NGX_SBIN_PATH -t
152
153 cp $NGX_PID_PATH $NGX_PID_PATH.oldbin
154
155 kill -USR2 \`cat $NGX_PID_PATH\`
156 sleep 1
157 test -f $NGX_PID_PATH.oldbin
158
159 cp $NGX_PID_PATH $NGX_PID_PATH.newbin
160
161 kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
162 END 151 END