diff --git a/.gitignore b/.gitignore index 6f99455..909a7b0 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ util/blog-rows.sql util/comments.sql util/posts.sql ngx_openresty-* +openresty-* work/ reindex t/*.t_ diff --git a/Makefile b/Makefile index 6b2bfc6..7a20b1e 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ test: all prove -r t try-luajit: all - cd ngx_openresty-`./util/ver` && ./configure --with-luajit + cd openresty-`./util/ver` && ./configure --with-luajit try-lua: all - cd ngx_openresty-`./util/ver` && ./configure && $(MAKE) + cd openresty-`./util/ver` && ./configure && $(MAKE) diff --git a/README.markdown b/README.markdown index 82b3433..a97e34e 100644 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,7 @@ Name ==== -ngx_openresty - Turning Nginx into a Full-Fledged Scriptable Web Platform +OpenResty - Turning Nginx into a Full-Fledged Scriptable Web Platform Table of Contents ================= @@ -17,7 +17,7 @@ Table of Contents Description =========== -ngx_openresty is a full-fledged web application server by bundling the standard nginx core, +OpenResty is a full-fledged web application server by bundling the standard nginx core, lots of 3rd-party nginx modules, as well as most of their external dependencies. This bundle is maintained Yichun Zhang (agentzh). @@ -40,7 +40,7 @@ For Bundle Maintainers The bundle's source is at the following git repository: -https://github.com/openresty/ngx_openresty +https://github.com/openresty/openresty To reproduce the bundle tarball, just do @@ -79,7 +79,7 @@ Report Bugs You're very welcome to report issues on GitHub: -https://github.com/agentzh/ngx_openresty/issues +https://github.com/openresty/openresty/issues [Back to TOC](#table-of-contents) @@ -88,7 +88,7 @@ Copyright & License The bundle itself is licensed under the 2-clause BSD license. -Copyright (c) 2011-2015, Yichun "agentzh" Zhang (章亦春) , CloudFlare Inc. +Copyright (c) 2011-2016, Yichun "agentzh" Zhang (章亦春) , CloudFlare Inc. This module is licensed under the terms of the BSD license. diff --git a/demo/Blog/template/sidebar.tt b/demo/Blog/template/sidebar.tt index 2c99d09..f446a1a 100644 --- a/demo/Blog/template/sidebar.tt +++ b/demo/Blog/template/sidebar.tt @@ -73,7 +73,7 @@ Compiled form (.tar.gz)
  • - + Source code (Git)
    • diff --git a/doc/README-win32.md b/doc/README-win32.md index 7719059..93fcb1e 100644 --- a/doc/README-win32.md +++ b/doc/README-win32.md @@ -150,10 +150,10 @@ make install where the dependency library source tarballs for OpenSSL, Zlib, and PCRE are downloaded from their official sites, respectively. -We automate these commands in a dedicated shell script named [build-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/build-win32.sh). +We automate these commands in a dedicated shell script named [build-win32.sh](https://github.com/openresty/openresty/blob/master/util/build-win32.sh). Furthermore, we automate the packaging process of the resulting binaries and supporting files -with this [package-win32.sh](https://github.com/openresty/ngx_openresty/blob/master/util/package-win32.sh) +with this [package-win32.sh](https://github.com/openresty/openresty/blob/master/util/package-win32.sh) script. Usually you can just download and use the binary distribution of OpenResty without diff --git a/specs/ngx_openresty.spec b/specs/openresty.spec similarity index 82% rename from specs/ngx_openresty.spec rename to specs/openresty.spec index 20d9f2b..f4af972 100644 --- a/specs/ngx_openresty.spec +++ b/specs/openresty.spec @@ -4,7 +4,7 @@ %define dir_name openresty -Name: ngx_openresty +Name: openresty Version: 1.0.5.1 Release: 5 @@ -14,7 +14,7 @@ Group: Productivity/Networking/Web/Servers License: BSD URL: http://www.openresty.org/ -Source0: ngx_openresty-%{version}rc%{release}.tar.gz +Source0: openresty-%{version}rc%{release}.tar.gz BuildRoot: %{build_root} @@ -23,11 +23,11 @@ BuildRequires: gcc >= 3.0, openssl-devel, pcre-devel, readline-devel Requires: openssl, pcre, readline %description -OpenResty (aka. ngx_openresty) is a full-fledged web application server by bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well as most of their external dependencie +OpenResty is a full-fledged web application server by bundling the standard Nginx core, lots of 3rd-party Nginx modules, as well as most of their external dependencie %prep -#%setup -q -n ngx_openresty-%{version} -%setup -q -n ngx_openresty-%{version}rc%{release} +#%setup -q -n openresty-%{version} +%setup -q -n openresty-%{version}rc%{release} %build #--with-pg_config=opt/pg90/bin/pg_config \ diff --git a/t/Config.pm b/t/Config.pm index 841f26a..b1d744c 100644 --- a/t/Config.pm +++ b/t/Config.pm @@ -23,7 +23,7 @@ sub run_tests { my $ver = `bash util/ver`; chomp $ver; - cd "ngx_openresty-$ver"; + cd "openresty-$ver"; $DistRoot = cwd(); $BuildRoot = File::Spec->rel2abs("./build"); diff --git a/util/dist-check b/util/dist-check index 8f3cedc..72dd37b 100755 --- a/util/dist-check +++ b/util/dist-check @@ -15,7 +15,7 @@ getopts("lf:", \%opts) or die "Usage: $0 [-f] [-l] \n"; my $jobs = shift || 4; my $cwd = cwd(); -if ($cwd !~ /ngx_openresty-(\d+(?:\.\d+)+(?:rc\d+(?:\.\d+)?)?)$/) { +if ($cwd !~ /openresty-(\d+(?:\.\d+)+(?:rc\d+(?:\.\d+)?)?)$/) { die "Bad current working directory: $cwd\n"; } diff --git a/util/fix-tests b/util/fix-tests index 9db314c..d5ed04b 100755 --- a/util/fix-tests +++ b/util/fix-tests @@ -8,7 +8,7 @@ sub cd ($); my $ver = `bash util/ver`; chomp $ver; -cd "ngx_openresty-$ver/bundle"; +cd "openresty-$ver/bundle"; opendir(my $dh, '.') or die "cannot opendir .: $!"; @@ -45,7 +45,7 @@ for my $t_file (@t_files) { warn "\n- $orig"; warn "+ $_"; - } elsif (s{ngx_openresty-\d+\.\d+\.\d+\.\d+(?:rc\d+)?}{ngx_openresty-$ver} && $orig ne $_) { + } elsif (s{openresty-\d+\.\d+\.\d+\.\d+(?:rc\d+)?}{openresty-$ver} && $orig ne $_) { $changed++; warn "\n- $orig"; diff --git a/util/mirror-tarballs b/util/mirror-tarballs index c13f99a..0889703 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -5,11 +5,11 @@ root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..` info_txt=`perl -e 'print "\033[33m[INFO]\033[0m"'` -echo -n "ngx_openresty " +echo -n "openresty " . ./util/ver echo -name=ngx_openresty-$version +name=openresty-$version work=$root/work if [ -z $debug ]; then