Skip to content

Commit 8835955

Browse files
authored
Merge pull request #87 from VirtuBox/develop
v3.6.5
2 parents cbea456 + f22979e commit 8835955

File tree

6 files changed

+151
-95
lines changed

6 files changed

+151
-95
lines changed

.github/workflows/blank.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,19 @@ jobs:
88
runs-on: ubuntu-18.04
99

1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v1
1212
- name: Mainline build
1313
run: sudo bash nginx-build.sh
1414
- name: Stable build
1515
run: sudo bash nginx-build.sh --stable
1616
- name: Full build
1717
run: sudo bash nginx-build.sh --full
18+
- name: libressl build
19+
run: sudo bash nginx-build.sh --libressl
20+
- name: pagespeed beta build
21+
run: sudo bash nginx-build.sh --pagespeed-beta
22+
- name: openssl-dev build
23+
run: sudo bash nginx-build.sh --openssl-dev
24+
- name: dynamic build
25+
run: sudo bash nginx-build.sh --dynamic
26+

.travis.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
sudo: required
1+
os: linux
22
dist: bionic
33

4-
language: bash
4+
language: shell
5+
6+
branches:
7+
only:
8+
- master
59

610
cache:
711
apt: true
@@ -27,7 +31,12 @@ addons:
2731
script:
2832
- sudo echo "Travis Banch = $TRAVIS_BRANCH"
2933
- sudo apt-get install -y --force-yes curl wget ccze
30-
- sudo bash nginx-build.sh --travis && sudo bash nginx-build.sh --travis --stable && sudo bash nginx-build.sh --full --travis || sudo bash -c 'tail -n 100 /tmp/nginx-ee.log | ccze -A'
34+
- sudo bash nginx-build.sh --travis || exit 1
35+
- sudo bash nginx-build.sh --travis --stable || exit 1
36+
- sudo bash nginx-build.sh --travis --full || exit 1
37+
- sudo bash nginx-build.sh --travis --pagespeed-beta || exit 1
38+
- sudo bash nginx-build.sh --travis --libressl || exit 1
39+
- sudo bash nginx-build.sh --travis --pagespeed-beta || exit 1
3140
- sudo ls -alh /usr/sbin/nginx
3241
- sudo chown -R travis /usr/local/src
3342
- sudo chmod 755 /usr/local/src

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased] - XX-XX-XX
88

9+
## [3.6.5] - 2019-11-18
10+
11+
### Added
12+
13+
- Dynamic modules configuration
14+
- Added Ubuntu EOAN (19.10) support
15+
916
### Changed
1017

11-
- OpenSSL updated to 1.1.1d
18+
- Bump OpenSSL version to 1.1.1d
1219
- Updated ngx_brotli module
20+
- Bump LibreSSL version to 3.0.2
21+
- Fix issue with ngx_http_redis module download
22+
- Update OpenSSL 3.0.0-dev commit number and patch
1323

1424
### Fixed
1525

README.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h1 align="center">
1+
<h1 align="center">
22
<br>
33
<img src="https://raw.githubusercontent.com/VirtuBox/nginx-ee/master/nginx-ee-logo.png">
44
<br>
@@ -59,7 +59,7 @@ Automated Nginx compilation from sources with additional modules support
5959

6060
## Additional Third-party modules
6161

62-
Nginx current mainline release : **v1.17.4**
62+
Nginx current mainline release : **v1.17.5**
6363
Nginx current stable release : **v1.16.1**
6464

6565
* [ngx_cache_purge](https://github.com/FRiCKLE/ngx_cache_purge)
@@ -100,13 +100,15 @@ Optional modules :
100100

101101
#### Also compatible
102102

103+
* Ubuntu 19.10 (Eoan)
103104
* Ubuntu 19.04 (Disco)
104105
* Ubuntu 18.10 (Cosmic)
105106
* Ubuntu 17.10 ()
106107
* Ubuntu 16.04 LTS (Xenial)
107108
* Debian 9 (Stretch)
108109
* Debian 8 (Jessie)
109-
* Raspbian (Stretch)
110+
* Raspbian 9 (Stretch)
111+
* Raspbian 10 (Buster)
110112

111113
### Applications
112114

@@ -209,15 +211,21 @@ Extras :
209211
## Packages
210212

211213
You are looking for an up-to-date version of Nginx with additional modules but without having to recompile Nginx after new releases ?
212-
Feel free to use the custom Nginx package built for WordOps and available on [Launchpad.net](https://launchpad.net/~wordops/+archive/ubuntu/nginx-wo).
214+
Feel free to use the custom Nginx package built for WordOps and available on [Launchpad.net](https://launchpad.net/~wordops/+archive/ubuntu/nginx-wo) (for Ubuntu) and [OpenSuseBuildService](https://build.opensuse.org/package/show/home:virtubox:WordOps/nginx) (for Debian/Ubuntu/Raspbian).
213215

214-
Add the repository
216+
### Add the repository
217+
218+
#### Launchpad
215219

216220
```bash
217221
sudo add-apt-repository ppa:wordops/nginx-wo -uy
218222
```
219223

220-
Install Nginx
224+
#### OpenSuseBuildService
225+
226+
Install steps available on [Download page](https://software.opensuse.org/download.html?project=home%3Avirtubox%3AWordOps&package=nginx)
227+
228+
### Install Nginx
221229

222230
```bash
223231
sudo apt install nginx-custom nginx-wo -y

docs/index.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Nginx-ee - Automated Nginx compilation from sources with additional modules support
33
layout: default
44
---
@@ -53,7 +53,7 @@ Automated Nginx compilation from sources with additional modules support
5353
</ul>
5454
<hr />
5555
<h2 id="additional-third-party-modules">Additional Third-party modules</h2>
56-
<p>Nginx current mainline release : <strong>v1.17.4</strong>
56+
<p>Nginx current mainline release : <strong>v1.17.5</strong>
5757
Nginx current stable release : <strong>v1.16.1</strong></p>
5858
<ul>
5959
<li><a href="https://github.com/FRiCKLE/ngx_cache_purge">ngx_cache_purge</a></li>
@@ -91,12 +91,14 @@ Nginx current stable release : <strong>v1.16.1</strong></p>
9191
</ul>
9292
<h4 id="also-compatible">Also compatible</h4>
9393
<ul>
94+
<li>Ubuntu 19.10 (Eoan)</li>
9495
<li>Ubuntu 19.04 (Disco)</li>
9596
<li>Ubuntu 18.10 (Cosmic)</li>
9697
<li>Ubuntu 16.04 LTS (Xenial)</li>
9798
<li>Debian 9 (Stretch)</li>
9899
<li>Debian 8 (Jessie)</li>
99-
<li>Raspbian (Stretch)</li>
100+
<li>Raspbian 9 (Stretch)</li>
101+
<li>Raspbian 10 (Buster)</li>
100102
</ul>
101103
<h3 id="applications">Applications</h3>
102104
<h4 id="lemp-stack">LEMP Stack</h4>

0 commit comments

Comments
 (0)