Просмотр исходного кода

lighttpd: reorder modules so that redirect loads before auth

Signed-off-by: W. Michael Petullo <mike@flyn.org>
W. Michael Petullo 10 лет назад
Родитель
Сommit
14aa488309
1 измененных файлов: 35 добавлений и 29 удалений
  1. 35
    29
      net/lighttpd/Makefile

+ 35
- 29
net/lighttpd/Makefile Просмотреть файл

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=lighttpd
11 11
 PKG_VERSION:=1.4.35
12
-PKG_RELEASE:=3
12
+PKG_RELEASE:=4
13 13
 
14 14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15 15
 PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
@@ -149,33 +149,39 @@ define BuildPlugin
149 149
 endef
150 150
 
151 151
 $(eval $(call BuildPackage,lighttpd))
152
-$(eval $(call BuildPlugin,access,Access restrictions,,10))
153
-$(eval $(call BuildPlugin,accesslog,Access logging,,10))
154
-$(eval $(call BuildPlugin,alias,Directory alias,,10))
155
-$(eval $(call BuildPlugin,auth,Authentication,,05))
156
-$(eval $(call BuildPlugin,cgi,CGI,,10))
157
-$(eval $(call BuildPlugin,cml,Cache Meta Language,,10))
158
-$(eval $(call BuildPlugin,compress,Compress output,+PACKAGE_lighttpd-mod-compress:zlib,10))
159
-$(eval $(call BuildPlugin,evasive,Evasive,,10))
160
-$(eval $(call BuildPlugin,evhost,Exnhanced Virtual-Hosting,,10))
161
-$(eval $(call BuildPlugin,expire,Expire,,10))
162
-$(eval $(call BuildPlugin,extforward,Extract client,,10))
163
-$(eval $(call BuildPlugin,fastcgi,FastCGI,,10))
164
-$(eval $(call BuildPlugin,flv_streaming,FLV streaming,,10))
165
-$(eval $(call BuildPlugin,magnet,Magnet,,10))
166
-$(eval $(call BuildPlugin,mysql_vhost,Mysql virtual hosting,+PACKAGE_lighttpd-mod-mysql_vhost:libmysqlclient,10))
167
-$(eval $(call BuildPlugin,proxy,Proxy,,10))
152
+
153
+# First, permit redirect from HTTP to HTTPS.
168 154
 $(eval $(call BuildPlugin,redirect,URL redirection,+PACKAGE_lighttpd-mod-redirect:libpcre,10))
169
-$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre,10))
170
-$(eval $(call BuildPlugin,rrdtool,RRDtool,,10))
171
-$(eval $(call BuildPlugin,scgi,SCGI,,10))
172
-$(eval $(call BuildPlugin,secdownload,Secure and fast download,,10))
173
-$(eval $(call BuildPlugin,setenv,Environment variable setting,,10))
174
-$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,10))
175
-$(eval $(call BuildPlugin,ssi,SSI,+libpcre,10))
176
-$(eval $(call BuildPlugin,status,Server status display,,10))
177
-$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre,10))
178
-$(eval $(call BuildPlugin,userdir,User directory,,10))
179
-$(eval $(call BuildPlugin,usertrack,User tracking,,10))
180
-$(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,10))
155
+
156
+# Next, permit authentication.
157
+$(eval $(call BuildPlugin,auth,Authentication,,20))
158
+
159
+# Finally, everything else.
160
+$(eval $(call BuildPlugin,access,Access restrictions,,30))
161
+$(eval $(call BuildPlugin,accesslog,Access logging,,30))
162
+$(eval $(call BuildPlugin,alias,Directory alias,,30))
163
+$(eval $(call BuildPlugin,cgi,CGI,,30))
164
+$(eval $(call BuildPlugin,cml,Cache Meta Language,,30))
165
+$(eval $(call BuildPlugin,compress,Compress output,+PACKAGE_lighttpd-mod-compress:zlib,30))
166
+$(eval $(call BuildPlugin,evasive,Evasive,,30))
167
+$(eval $(call BuildPlugin,evhost,Exnhanced Virtual-Hosting,,30))
168
+$(eval $(call BuildPlugin,expire,Expire,,30))
169
+$(eval $(call BuildPlugin,extforward,Extract client,,30))
170
+$(eval $(call BuildPlugin,fastcgi,FastCGI,,30))
171
+$(eval $(call BuildPlugin,flv_streaming,FLV streaming,,30))
172
+$(eval $(call BuildPlugin,magnet,Magnet,,30))
173
+$(eval $(call BuildPlugin,mysql_vhost,Mysql virtual hosting,+PACKAGE_lighttpd-mod-mysql_vhost:libmysqlclient,30))
174
+$(eval $(call BuildPlugin,proxy,Proxy,,30))
175
+$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre,30))
176
+$(eval $(call BuildPlugin,rrdtool,RRDtool,,30))
177
+$(eval $(call BuildPlugin,scgi,SCGI,,30))
178
+$(eval $(call BuildPlugin,secdownload,Secure and fast download,,30))
179
+$(eval $(call BuildPlugin,setenv,Environment variable setting,,30))
180
+$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,30))
181
+$(eval $(call BuildPlugin,ssi,SSI,+libpcre,30))
182
+$(eval $(call BuildPlugin,status,Server status display,,30))
183
+$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre,30))
184
+$(eval $(call BuildPlugin,userdir,User directory,,30))
185
+$(eval $(call BuildPlugin,usertrack,User tracking,,30))
186
+$(eval $(call BuildPlugin,webdav,WebDAV,+PACKAGE_lighttpd-mod-webdav:libsqlite3 +PACKAGE_lighttpd-mod-webdav:libuuid +PACKAGE_lighttpd-mod-webdav:libxml2,30))
181 187