diff --git a/README b/README index c938bc2..af5bef2 100644 --- a/README +++ b/README @@ -9,90 +9,11 @@ that all these modules are played well together. The bundled software components are copyrighted by the respective copyright holders. -A quick note to Debian and Ubuntu users: - You're recommended to install the following packages using apt-get before - installing this bundle: +The homepage for this project is http://openresty.org. - apt-get install libreadline-dev libpcre3-dev libssl-dev perl - - If you want to enable LuaJIT, ensure that your system's "ldconfig" - utility is in your PATH environment. You can check out - the path of your "ldconfig" by using the "whereis" command: - - whereis ldconfig - - On Debian systems, it's usually /sbin, and you just need to add - it to your PATH this way: - - PATH=/sbin:$PATH - export PATH - -A quick note to Fedora/RedHat users: - You're recommended to install the following packages using yum before - installing this bundle: - - yum install readline-devel pcre-devel openssl-devel - -A quick note to Mac OS X (Darwin) users: - You're recommended to install prerequisites PCRE using some package - management tool, like Homebrew: - - brew install pcre - - Alternatively you can install PCRE from source all by yourself :) - -To build ngx_openresty, you need a working perl (perl 5.6.0 or better) -in your PATH environment, and then follow the following steps: - -1. download the latest ngx_openresty tarball can be downloaded from - - http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.7.tar.gz - - we will eventually migrate to the openresty.org domain. - -2. and then enter the ngx_openresty-0.8.54.7/ directory, - and type the following command to configure: - - ./configure - - by default, --prefix=/usr/local/openresty is assumed. You can - specify various options, as in - - ./configure --prefix=/opt/openresty \ - --with-luajit \ - --without-http_drizzle_module \ - --with-http_iconv_module \ - --with-http_postgres_module - - try ./configure --help to see more options. - - For Solaris, it's common to install libraries like OpenSSL to /lib, - so when it complaints about OpenSSL and you have indeed - already installed it, specify the --with-ld-opt='-L/lib' option. - - Errors in running the ./configure script can be found in this file: - - build/nginx-0.8.54/objs/autoconf.err - -3. build everything locally - - make - - Note that, "make -jN" may not work at least for FreeBSD's "bsdmake"; use - gmake (i.e., GNU make) instead or avoid using the jobserver feature with - your make. - -4. install ngx_openresty into the target directory that you specified by - the --prefix option in Step 2. - - make install - -Then you can start your server this way: - - /usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root \ - -c /path/to/your/nginx.conf - -assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2. +For the users: + Visit http://openresty.org/#Download to download the latest bundle tarball, and + follow the installation instructions in the page http://openresty.org/#Installation. For bundle maintainers: @@ -106,31 +27,6 @@ For bundle maintainers: at the top of the bundle source tree. -The following packages are bundled in the 0.8.54.7 release: - - LuaJIT-2.0.0-beta8 - array-var-nginx-module-0.02 - auth-request-nginx-module-0.2 - drizzle-nginx-module-0.0.15rc11 - echo-nginx-module-0.36rc4 - encrypted-session-nginx-module-0.01 - form-input-nginx-module-0.07rc4 - headers-more-nginx-module-0.15rc3 - iconv-nginx-module-0.10rc3 - libdrizzle-0.8 - lua-5.1.4 - memc-nginx-module-0.12rc2 - nginx-0.8.54 - ngx_devel_kit-0.2.17 - ngx_lua-0.1.6rc15 - ngx_postgres-0.8 - rds-json-nginx-module-0.11rc2 - redis2-nginx-module-0.07rc3 - set-misc-nginx-module-0.21 - srcache-nginx-module-0.12rc5 - upstream-keepalive-nginx-module-0.3 - xss-nginx-module-0.03rc3 - REPORT BUGS You're very welcome to report issues on GitHub: diff --git a/util/fix-tests b/util/fix-tests index 0b3a13b..70710ee 100755 --- a/util/fix-tests +++ b/util/fix-tests @@ -68,7 +68,7 @@ for my $t_file (@t_files) { close $in; } -print join("\n", map { " $_" } sort @dirs), "\n"; +print join("\n", map { /^LuaJIT/ ? "* ~$_" : "* $_" } sort @dirs), "\n"; sub cd ($) { my $dir = shift; diff --git a/util/ver b/util/ver index ac65f16..9a2dd6d 100755 --- a/util/ver +++ b/util/ver @@ -1,7 +1,7 @@ #!/bin/bash main_ver=0.8.54 -minor_ver=8rc2 +minor_ver=8 version=$main_ver.$minor_ver echo $version