virtubox
/
nginx-ee
mirror of https://github.com/VirtuBox/nginx-ee.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update README and fix few errors in the script

This commit is contained in:
VirtuBox 2019-02-27 03:10:15 +01:00
parent 30037ea9c4
commit a46f3bf1b7
6 changed files with 130 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -10,6 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Improve Nginx setup from scratch
### Fixed
- RTMP variable check
- Nginx package hold with WordOps
## [3.5.2] - 2019-02-18
### Changed

50
README.md
View File

@ -1,10 +1,34 @@
# Nginx-EE
<h1 align="center">
<br>
<img src="https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee-logo.png">
<br>
Nginx-ee
<br>
</h1>
![nginx-ee](https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee.png)
<h4 align="center">
Automated Nginx compilation from sources with additional modules support
</h4>
[![Build Status](https://travis-ci.com/VirtuBox/nginx-ee.svg?branch=master)](https://travis-ci.org/VirtuBox/nginx-ee) [![](https://img.shields.io/github/license/VirtuBox/nginx-ee.svg)](https://github.com/VirtuBox/nginx-ee/blob/master/LICENSE) [![stars](https://img.shields.io/github/stars/VirtuBox/nginx-ee.svg)](https://github.com/VirtuBox/nginx-ee) [![release](https://img.shields.io/github/release/virtubox/nginx-ee.svg?style=flat)](https://github.com/VirtuBox/nginx-ee/releases) ![commits](https://img.shields.io/github/last-commit/virtubox/nginx-ee/master.svg?style=flat)
---
Automated Nginx compilation with additional modules for WordOps, EasyEngine v3, Plesk Onyx or from scratch
<p align="center"><a href="https://travis-ci.com/VirtuBox/nginx-ee"><img src="https://travis-ci.com/VirtuBox/nginx-ee.svg?branch=master" alt="build"></a>
<img src="https://img.shields.io/github/license/VirtuBox/nginx-ee.svg" alt="MIT">
<img src="https://img.shields.io/github/stars/VirtuBox/nginx-ee.svg" alt="Stars">
<img src="https://img.shields.io/github/last-commit/virtubox/nginx-ee/master.svg?style=flat" alt="Commits"></p>
<p align="center">
<a href="#features"> Features<a> •
<a href="#additional-third-party-modules"> Modules</a> •
<a href="#compatibility"> Compatibility</a> •
<a href="#usage"> Usage</a> •
<a href="#wiki"> Wiki</a> •
<a href="#credits"> Credits</a> •
<a href="#license"> License</a> •
</p>
<p align="center"><img src="https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee.png" alt="Nginx-ee"></p>
---
@ -27,7 +51,7 @@ Automated Nginx compilation with additional modules for WordOps, EasyEngine v3,
## Additional Third-party modules
Nginx current mainline release : **v1.15.8**
Nginx current mainline release : **v1.15.9**
Nginx current stable release : **v1.14.2**
* [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge)
@ -78,16 +102,12 @@ Optional modules :
## Usage
<!-- TOC -->
* [Default non-interactive install](#default-non-interactive-install)
* [Interactive install](#interactive-install)
* [Custom installation](#custom-installation)
* [Nginx modules](#nginx-modules)
* [Nginx configurations](#nginx-configurations)
* [Roadmap](#roadmap)
- [Default non-interactive install](#default-non-interactive-install)
- [Interactive install](#interactive-install)
- [Custom installation](#custom-installation)
- [Options available](#options-available)
<!-- /TOC -->
### Default non-interactive install
@ -159,8 +179,10 @@ You can choose Nginx built-in and third-party modules you want to compile with N
* [x] Add support for Plesk servers
* [x] Add Nginx modules choice
* [x] Add support for Debian 9
* [x] Add support for Raspbian
* [ ] Add support for config.inc build configuration
* [ ] Add openssl release choice
* [ ] Add more compilation presets
## Credits

50
docs/README.md
View File

@ -1,10 +1,34 @@
# Nginx-EE
<h1 align="center">
<br>
<img src="https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee-logo.png">
<br>
Nginx-ee
<br>
</h1>
![nginx-ee](https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee.png)
<h4 align="center">
Automated Nginx compilation from sources with additional modules support
</h4>
[![Build Status](https://travis-ci.com/VirtuBox/nginx-ee.svg?branch=master)](https://travis-ci.org/VirtuBox/nginx-ee) [![](https://img.shields.io/github/license/VirtuBox/nginx-ee.svg)](https://github.com/VirtuBox/nginx-ee/blob/master/LICENSE) [![stars](https://img.shields.io/github/stars/VirtuBox/nginx-ee.svg)](https://github.com/VirtuBox/nginx-ee) [![release](https://img.shields.io/github/release/virtubox/nginx-ee.svg?style=flat)](https://github.com/VirtuBox/nginx-ee/releases) ![commits](https://img.shields.io/github/last-commit/virtubox/nginx-ee/master.svg?style=flat)
---
Automated Nginx compilation with additional modules for WordOps, EasyEngine v3, Plesk Onyx or from scratch
<p align="center"><a href="https://travis-ci.com/VirtuBox/nginx-ee"><img src="https://travis-ci.com/VirtuBox/nginx-ee.svg?branch=master" alt="build"></a>
<img src="https://img.shields.io/github/license/VirtuBox/nginx-ee.svg" alt="MIT">
<img src="https://img.shields.io/github/stars/VirtuBox/nginx-ee.svg" alt="Stars">
<img src="https://img.shields.io/github/last-commit/virtubox/nginx-ee/master.svg?style=flat" alt="Commits"></p>
<p align="center">
<a href="#features"> Features<a> •
<a href="#additional-third-party-modules"> Modules</a> •
<a href="#compatibility"> Compatibility</a> •
<a href="#usage"> Usage</a> •
<a href="#wiki"> Wiki</a> •
<a href="#credits"> Credits</a> •
<a href="#license"> License</a> •
</p>
<p align="center"><img src="https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee.png" alt="Nginx-ee"></p>
---
@ -27,7 +51,7 @@ Automated Nginx compilation with additional modules for WordOps, EasyEngine v3,
## Additional Third-party modules
Nginx current mainline release : **v1.15.8**
Nginx current mainline release : **v1.15.9**
Nginx current stable release : **v1.14.2**
* [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge)
@ -78,16 +102,12 @@ Optional modules :
## Usage
<!-- TOC -->
* [Default non-interactive install](#default-non-interactive-install)
* [Interactive install](#interactive-install)
* [Custom installation](#custom-installation)
* [Nginx modules](#nginx-modules)
* [Nginx configurations](#nginx-configurations)
* [Roadmap](#roadmap)
- [Default non-interactive install](#default-non-interactive-install)
- [Interactive install](#interactive-install)
- [Custom installation](#custom-installation)
- [Options available](#options-available)
<!-- /TOC -->
### Default non-interactive install
@ -159,8 +179,10 @@ You can choose Nginx built-in and third-party modules you want to compile with N
* [x] Add support for Plesk servers
* [x] Add Nginx modules choice
* [x] Add support for Debian 9
* [x] Add support for Raspbian
* [ ] Add support for config.inc build configuration
* [ ] Add openssl release choice
* [ ] Add more compilation presets
## Credits

54
nginx-build.sh
View File

@ -7,7 +7,7 @@
# Copyright (c) 2019 VirtuBox <contact@virtubox.net>
# This script is licensed under M.I.T
# -------------------------------------------------------------------------
# Version 3.5.2 - 2019-02-18
# Version 3.5.2 - 2019-02-27
# -------------------------------------------------------------------------
##################################
@ -21,13 +21,13 @@
}
# checking if curl is installed
[ -z "$(command -v curl)" ] && { apt-get -y install curl; } >>/tmp/nginx-ee.log 2>&1
[ -z "$(command -v curl)" ] && { apt-get update; apt-get -y install curl; } >>/tmp/nginx-ee.log 2>&1
# Checking if lsb_release is installed
[ -z "$(command -v lsb_release)" ] && { apt-get -y install lsb-release; } >>/tmp/nginx-ee.log 2>&1
[ -z "$(command -v lsb_release)" ] && { apt-get update; apt-get -y install lsb-release; } >>/tmp/nginx-ee.log 2>&1
# checking if tar is installed
[ -z "$(command -v tar)" ] && { apt-get -y install tar; } >>/tmp/nginx-ee.log 2>&1
[ -z "$(command -v tar)" ] && { apt-get update; apt-get -y install tar; } >>/tmp/nginx-ee.log 2>&1
##################################
# Variables
@ -71,7 +71,7 @@ echo "" >/tmp/nginx-ee.log
WO_VALID="YES"
}
[ ! -x /usr/sbin/nginx ] && {
[ -z "$(command -v nginx)" ] && {
NGINX_FROM_SCRATCH="1"
}
@ -179,25 +179,24 @@ fi
# Set nginx release and HPACK
##################################
if [ -z "$NGINX_RELEASE" ] || [ "$NGINX_RELEASE" = "1" ]; then
NGINX_VER="$NGINX_MAINLINE"
NGX_HPACK="--with-http_v2_hpack_enc"
else
if [ "$NGINX_RELEASE" = "2" ]; then
NGINX_VER="$NGINX_STABLE"
NGX_HPACK=""
else
NGINX_VER="$NGINX_MAINLINE"
NGX_HPACK="--with-http_v2_hpack_enc"
fi
##################################
# Set RTMP module
##################################
if [ -z "$RTMP" ]; then
NGX_RTMP=""
RTMP_VALID="NO"
else
if [ "$RTMP" = "y" ] ; then
NGX_RTMP="--add-module=../nginx-rtmp-module "
RTMP_VALID="YES"
else
NGX_RTMP=""
RTMP_VALID="NO"
fi
##################################
@ -300,7 +299,9 @@ if [ "$NGINX_FROM_SCRATCH" = "1" ]; then
echo -ne ' Setting Up Nginx configurations [..]\r'
# clone custom nginx configuration
git clone https://github.com/VirtuBox/nginx-config.git /etc/nginx >>/tmp/nginx-ee.log 2>&1
[ ! -d /etc/nginx ] && {
git clone https://github.com/VirtuBox/nginx-config.git /etc/nginx
} >>/tmp/nginx-ee.log 2>&1
# create nginx temp directory
mkdir -p /var/lib/nginx/{body,fastcgi,proxy,scgi,uwsgi}
@ -328,7 +329,7 @@ if [ "$NGINX_FROM_SCRATCH" = "1" ]; then
{
# download default nginx page
wget -O /var/www/html/index.nginx-debian.html https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/var/www/html/index.nginx-debian.html
mkdir -p /etc/nginx/sites-enabled
mkdir -p /etc/nginx/sites-enabled
ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/
# download nginx systemd service
[ ! -f /lib/systemd/system/nginx.service ] && {
@ -799,16 +800,15 @@ fi
cd /usr/local/src/nginx || exit 1
echo -ne ' Applying nginx patches [..]\r'
if [ "$NGINX_RELEASE" = "1" ] || [ -z "$NGINX_RELEASE" ]; then
{
if [ "$NGINX_RELEASE" = "2" ]; then
curl -sL https://raw.githubusercontent.com/nginx-modules/ngx_http_tls_dyn_size/master/nginx__dynamic_tls_records_1.13.0%2B.patch | patch -p1 >>/tmp/nginx-ee.log 2>&1
else
{
curl -sL https://raw.githubusercontent.com/nginx-modules/ngx_http_tls_dyn_size/master/nginx__dynamic_tls_records_1.15.5%2B.patch | patch -p1
curl -sL https://raw.githubusercontent.com/centminmod/centminmod/123.09beta01/patches/cloudflare/nginx-1.15.3_http2-hpack.patch | patch -p1
curl -sL https://raw.githubusercontent.com/kn007/patch/master/nginx_auto_using_PRIORITIZE_CHACHA.patch | patch -p1
} >>/tmp/nginx-ee.log 2>&1
else
curl -sL https://raw.githubusercontent.com/nginx-modules/ngx_http_tls_dyn_size/master/nginx__dynamic_tls_records_1.13.0%2B.patch | patch -p1 >>/tmp/nginx-ee.log 2>&1
fi
if [ "$?" -eq 0 ]; then
@ -951,6 +951,7 @@ if [ "$OS_ARCH" = 'x86_64' ]; then
--sbin-path=/usr/sbin/nginx >>/tmp/nginx-ee.log 2>&1
fi
else
./configure \
${NGX_NAXSI} \
${NGINX_BUILD_OPTIONS} \
@ -1055,7 +1056,6 @@ fi
echo -ne ' Performing final steps [..]\r'
# block Nginx package update from APT repository
[ ! -f /etc/apt/preferences.d/nginx-block ] && {
if [ "$NGINX_PLESK" = "1" ]; then
{
# update nginx ciphers_suites
@ -1068,17 +1068,21 @@ echo -ne ' Performing final steps [..]\r'
{
# update nginx ciphers_suites
sed -i "s/ssl_ciphers\ \(\"\|'\)\(.*\)\(\"\|'\)/ssl_ciphers \"$TLS13_CIPHERS\"/" /etc/nginx/nginx.conf
# block sw-nginx package updates from APT repository
# block nginx package updates from APT repository
echo -e 'Package: nginx*\nPin: release *\nPin-Priority: -1' >/etc/apt/preferences.d/nginx-block
apt-mark hold nginx-ee nginx-common nginx-custom
} >>/tmp/nginx-ee.log
else
elif [ "$WO_VALID" = "1" ]; then
{
# update nginx ciphers_suites
sed -i "s/ssl_ciphers\ \(\"\|'\)\(.*\)\(\"\|'\)/ssl_ciphers \"$TLS13_CIPHERS\"/" /etc/nginx/nginx.conf
# block nginx package updates from APT repository
echo -e 'Package: nginx*\nPin: release *\nPin-Priority: -1' >/etc/apt/preferences.d/nginx-block
apt-mark hold nginx-ee nginx-common nginx-custom
} >>/tmp/nginx-ee.log
fi
}
{
# enable nginx service

BIN
nginx-ee-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

44
var/www/html/index.nginx-debian.html
View File

@ -1,32 +1,36 @@
<!DOCTYPE html>
<html>
<head>
<title>Welcome to nginx!</title>
<style>
body {
width: 35em;
margin: 0 auto;
font-family: Tahoma, Verdana, Arial, sans-serif;
}
</style>
<title>Welcome to nginx-ee!</title>
<style>
body {
width: 35em;
margin: 0 auto;
font-family: Tahoma, Verdana, Arial, sans-serif;
}
</style>
</head>
<body>
<h1>Welcome to nginx!</h1>
<p>If you see this page, the nginx web server is successfully installed and
working. Further configuration is required.</p>
<h1>Welcome to nginx-ee!</h1>
<p>If you see this page, the nginx web server is successfully installed and working. Further configuration is required.</p>
<p>For online documentation and support please refer to
<a href="http://nginx.org/">nginx.org</a></p>
<p>For online documentation and support please refer to :
<ul>
<li><a href="http://nginx.org/">nginx.org</a></li>
<li><a href="https://github.com/VirtuBox/nginx-ee/wiki">nginx-ee wiki</a></li>
</ul>
</p>
<p>
Please use the <tt>reportbug</tt> tool to report bugs in the
nginx package with Debian. However, check <a
href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=nginx;repeatmerged=0">existing
<p>
Please use the <tt>reportbug</tt> tool to report bugs in the nginx package with Debian. However, check <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=nginx;repeatmerged=0">existing
bug reports</a> before reporting a new bug.
</p>
</p>
<p><em>Thank you for using nginx.</em></p>
<p><em>Thank you for using nginx-ee.</em></p>
</body>
</html>
</html>