Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nginx-txid module. #75

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add nginx-txid module. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions thirdparty/nginx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ getsrc:
cd nviennot-nginx-tcp-keepalive && \
git reset --hard $(NGINX_HTTP_KEEPALIVE) >/dev/null 2>&1 && \
rm -rf .git
cd $(psrctmp)/$(pname)-$(pvers)-zimbra/modules && \
git clone https://github.com/synacor/nginx-module-txid120 >/dev/null 2>&1 && \
cd nginx-module-txid120 && \
rm -rf .git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a git archive might be useful here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we want to make sure we control exactly which version we are pulling in and have tested.

cd $(psrctmp) && tar cfz $(zname)-$(pvers).tar.gz $(pname)-$(pvers)-zimbra
mv $(psrctmp)/$(zname)-$(pvers).tar.gz $(SRC_DIR)
rm -rf $(psrctmp)
Expand Down
3 changes: 2 additions & 1 deletion thirdparty/nginx/zimbra-nginx/rpm/SPECS/nginx.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ CFLAGS="-g -O0"; export CFLAGS; \
--http-fastcgi-temp-path=/opt/zimbra/data/tmp/nginx/fastcgi \
--without-http_scgi_module \
--without-http_uwsgi_module \
--add-module=modules/nviennot-nginx-tcp-keepalive
--add-module=modules/nviennot-nginx-tcp-keepalive \
--add-module=modules/nginx-module-txid120
make

%install
Expand Down