diff options
Diffstat (limited to 'meta/recipes-extended/lighttpd/lighttpd')
3 files changed, 25 insertions, 74 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch deleted file mode 100644 index f17bdce2c0..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 26 Aug 2016 18:20:32 +0300 | ||
4 | Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script. | ||
5 | |||
6 | RP 2014/5/22 | ||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 16 ++++++++++++---- | ||
11 | 1 file changed, 12 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 5383cec..c29a902 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -651,10 +651,18 @@ AC_ARG_WITH([pcre], | ||
18 | ) | ||
19 | AC_MSG_RESULT([$WITH_PCRE]) | ||
20 | |||
21 | -if test "$WITH_PCRE" != no; then | ||
22 | - if test "$WITH_PCRE" != yes; then | ||
23 | - PCRE_LIB="-L$WITH_PCRE/lib -lpcre" | ||
24 | - CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include" | ||
25 | +if test "$WITH_PCRE" != "no"; then | ||
26 | + PKG_CHECK_MODULES(PCREPKG, [libpcre], [ | ||
27 | + PCRE_LIB=${PCREPKG_LIBS} | ||
28 | + CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}" | ||
29 | + ], [ | ||
30 | + AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre]) | ||
31 | + ]) | ||
32 | + | ||
33 | + if test x"$PCRE_LIB" != x; then | ||
34 | + AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre]) | ||
35 | + AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h]) | ||
36 | + AC_SUBST(PCRE_LIB) | ||
37 | else | ||
38 | AC_PATH_PROG([PCRECONFIG], [pcre-config]) | ||
39 | if test -n "$PCRECONFIG"; then | ||
40 | -- | ||
41 | 2.15.0 | ||
42 | |||
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd b/meta/recipes-extended/lighttpd/lighttpd/lighttpd index 82fbaa523b..f369dce42c 100644 --- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd +++ b/meta/recipes-extended/lighttpd/lighttpd/lighttpd | |||
@@ -6,9 +6,14 @@ NAME=lighttpd | |||
6 | DESC="Lighttpd Web Server" | 6 | DESC="Lighttpd Web Server" |
7 | OPTS="-f /etc/lighttpd/lighttpd.conf" | 7 | OPTS="-f /etc/lighttpd/lighttpd.conf" |
8 | 8 | ||
9 | configtest() { | ||
10 | "$DAEMON" $OPTS -tt || exit 1 | ||
11 | } | ||
12 | |||
9 | case "$1" in | 13 | case "$1" in |
10 | start) | 14 | start) |
11 | echo -n "Starting $DESC: " | 15 | echo -n "Starting $DESC: " |
16 | configtest | ||
12 | start-stop-daemon --start -x "$DAEMON" -- $OPTS | 17 | start-stop-daemon --start -x "$DAEMON" -- $OPTS |
13 | echo "$NAME." | 18 | echo "$NAME." |
14 | ;; | 19 | ;; |
@@ -17,16 +22,26 @@ case "$1" in | |||
17 | start-stop-daemon --stop -x "$DAEMON" | 22 | start-stop-daemon --stop -x "$DAEMON" |
18 | echo "$NAME." | 23 | echo "$NAME." |
19 | ;; | 24 | ;; |
20 | restart|force-reload) | 25 | restart) |
21 | echo -n "Restarting $DESC: " | 26 | echo -n "Restarting $DESC: " |
27 | configtest | ||
22 | start-stop-daemon --stop -x "$DAEMON" | 28 | start-stop-daemon --stop -x "$DAEMON" |
23 | sleep 1 | 29 | sleep 1 |
24 | start-stop-daemon --start -x "$DAEMON" -- $OPTS | 30 | start-stop-daemon --start -x "$DAEMON" -- $OPTS |
25 | echo "$NAME." | 31 | echo "$NAME." |
26 | ;; | 32 | ;; |
33 | reload|force-reload) | ||
34 | echo -n "Reloading $DESC: " | ||
35 | configtest | ||
36 | killall -USR1 "${DAEMON##*/}" | ||
37 | echo "$NAME." | ||
38 | ;; | ||
39 | configtest) | ||
40 | configtest | ||
41 | ;; | ||
27 | *) | 42 | *) |
28 | N=/etc/init.d/$NAME | 43 | N=/etc/init.d/$NAME |
29 | echo "Usage: $N {start|stop|restart|force-reload}" >&2 | 44 | echo "Usage: $N {start|stop|restart|reload|force-reload|configtest}" >&2 |
30 | exit 1 | 45 | exit 1 |
31 | ;; | 46 | ;; |
32 | esac | 47 | esac |
diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf b/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf index 6e8402d242..47a6c93349 100644 --- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf +++ b/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf | |||
@@ -16,8 +16,6 @@ server.modules = ( | |||
16 | # "mod_redirect", | 16 | # "mod_redirect", |
17 | # "mod_alias", | 17 | # "mod_alias", |
18 | "mod_access", | 18 | "mod_access", |
19 | # "mod_cml", | ||
20 | # "mod_trigger_b4_dl", | ||
21 | # "mod_auth", | 19 | # "mod_auth", |
22 | # "mod_status", | 20 | # "mod_status", |
23 | # "mod_setenv", | 21 | # "mod_setenv", |
@@ -27,11 +25,9 @@ server.modules = ( | |||
27 | # "mod_evhost", | 25 | # "mod_evhost", |
28 | # "mod_userdir", | 26 | # "mod_userdir", |
29 | # "mod_cgi", | 27 | # "mod_cgi", |
30 | # "mod_compress", | ||
31 | # "mod_ssi", | 28 | # "mod_ssi", |
32 | # "mod_usertrack", | ||
33 | # "mod_expire", | 29 | # "mod_expire", |
34 | # "mod_secdownload", | 30 | # "mod_deflate", |
35 | # "mod_rrdtool", | 31 | # "mod_rrdtool", |
36 | # "mod_webdav", | 32 | # "mod_webdav", |
37 | "mod_accesslog" ) | 33 | "mod_accesslog" ) |
@@ -47,9 +43,6 @@ server.errorlog = "/www/logs/lighttpd.error.log" | |||
47 | index-file.names = ( "index.php", "index.html", | 43 | index-file.names = ( "index.php", "index.html", |
48 | "index.htm", "default.htm" ) | 44 | "index.htm", "default.htm" ) |
49 | 45 | ||
50 | ## set the event-handler (read the performance section in the manual) | ||
51 | # server.event-handler = "freebsd-kqueue" # needed on OS X | ||
52 | |||
53 | # mimetype mapping | 46 | # mimetype mapping |
54 | mimetype.assign = ( | 47 | mimetype.assign = ( |
55 | ".pdf" => "application/pdf", | 48 | ".pdf" => "application/pdf", |
@@ -115,7 +108,6 @@ mimetype.assign = ( | |||
115 | 108 | ||
116 | #### accesslog module | 109 | #### accesslog module |
117 | accesslog.filename = "/www/logs/access.log" | 110 | accesslog.filename = "/www/logs/access.log" |
118 | debug.log-request-handling = "enable" | ||
119 | 111 | ||
120 | 112 | ||
121 | 113 | ||
@@ -127,10 +119,6 @@ debug.log-request-handling = "enable" | |||
127 | # of the document-root | 119 | # of the document-root |
128 | url.access-deny = ( "~", ".inc" ) | 120 | url.access-deny = ( "~", ".inc" ) |
129 | 121 | ||
130 | $HTTP["url"] =~ "\.pdf$" { | ||
131 | server.range-requests = "disable" | ||
132 | } | ||
133 | |||
134 | ## | 122 | ## |
135 | # which extensions should not be handle via static-file transfer | 123 | # which extensions should not be handle via static-file transfer |
136 | # | 124 | # |
@@ -177,6 +165,7 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) | |||
177 | #dir-listing.activate = "enable" | 165 | #dir-listing.activate = "enable" |
178 | 166 | ||
179 | ## enable debugging | 167 | ## enable debugging |
168 | #debug.log-request-header-on-error = "enable" | ||
180 | #debug.log-request-header = "enable" | 169 | #debug.log-request-header = "enable" |
181 | #debug.log-response-header = "enable" | 170 | #debug.log-response-header = "enable" |
182 | #debug.log-request-handling = "enable" | 171 | #debug.log-request-handling = "enable" |
@@ -194,8 +183,9 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) | |||
194 | #server.groupname = "wwwrun" | 183 | #server.groupname = "wwwrun" |
195 | 184 | ||
196 | #### compress module | 185 | #### compress module |
197 | #compress.cache-dir = "/tmp/lighttpd/cache/compress/" | 186 | #deflate.cache-dir = "/tmp/lighttpd/cache/compress/" |
198 | #compress.filetype = ("text/plain", "text/html") | 187 | #deflate.mimetypes = ("text/plain", "text/html") |
188 | #deflate.allowed-encodings = ("gzip") | ||
199 | 189 | ||
200 | #### proxy module | 190 | #### proxy module |
201 | ## read proxy.txt for more info | 191 | ## read proxy.txt for more info |
@@ -227,7 +217,8 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) | |||
227 | 217 | ||
228 | #### SSL engine | 218 | #### SSL engine |
229 | #ssl.engine = "enable" | 219 | #ssl.engine = "enable" |
230 | #ssl.pemfile = "server.pem" | 220 | #ssl.pemfile = "/path/to/fullchain.pem" |
221 | #ssl.privkey = "/path/to/privkey.pem" | ||
231 | 222 | ||
232 | #### status module | 223 | #### status module |
233 | #status.status-url = "/server-status" | 224 | #status.status-url = "/server-status" |
@@ -291,19 +282,6 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) | |||
291 | #setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) | 282 | #setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) |
292 | #setenv.add-response-header = ( "X-Secret-Message" => "42" ) | 283 | #setenv.add-response-header = ( "X-Secret-Message" => "42" ) |
293 | 284 | ||
294 | ## for mod_trigger_b4_dl | ||
295 | # trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db" | ||
296 | # trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" ) | ||
297 | # trigger-before-download.trigger-url = "^/trigger/" | ||
298 | # trigger-before-download.download-url = "^/download/" | ||
299 | # trigger-before-download.deny-url = "http://127.0.0.1/index.html" | ||
300 | # trigger-before-download.trigger-timeout = 10 | ||
301 | |||
302 | ## for mod_cml | ||
303 | ## don't forget to add index.cml to server.indexfiles | ||
304 | # cml.extension = ".cml" | ||
305 | # cml.memcache-hosts = ( "127.0.0.1:11211" ) | ||
306 | |||
307 | #### variable usage: | 285 | #### variable usage: |
308 | ## variable name without "." is auto prefixed by "var." and becomes "var.bar" | 286 | ## variable name without "." is auto prefixed by "var." and becomes "var.bar" |
309 | #bar = 1 | 287 | #bar = 1 |
@@ -328,4 +306,4 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) | |||
328 | #var.a=1 | 306 | #var.a=1 |
329 | 307 | ||
330 | # include other config file fragments from lighttpd.d subdir | 308 | # include other config file fragments from lighttpd.d subdir |
331 | include_shell "find /etc/lighttpd.d -maxdepth 1 -name '*.conf' -exec cat {} \;" | 309 | include "/etc/lighttpd.d/*.conf" |