Compare commits

...
Sign in to create a new pull request.

1014 commits

Author SHA1 Message Date
wrapper
84b0362183 allow vod and pckg to compile together 2025-07-16 10:47:23 +07:00
wrapper
ce21ceb30b forgot memc 2025-07-15 15:22:39 +07:00
wrapper
b1188d6377 dyn rec 2025-07-15 15:17:17 +07:00
wrapper
bf4e347d84 sid 2 2025-07-15 15:11:13 +07:00
wrapper
67b2e7933c sid init 2025-07-15 15:05:37 +07:00
Jan Mojžíš
653827e5a8
release nginx 1.26.3-3, upload to unstable 2025-05-15 15:32:06 +02:00
Thomas Ward
bfbdc5aef2 Move ConditionFileIsExecutable to proper section 2025-02-24 20:42:35 +00:00
Thomas Ward
b3e6c7ec5b Merge branch 'debbug1098477-fix' into 'main'
Fix DebBug #1098477, salsa issue nginx-team/nginx:#23

See merge request nginx-team/nginx!90
2025-02-23 18:17:04 +00:00
Thomas Ward
54cc798970 Fix DebBug #1098477, salsa issue nginx-team/nginx:#23 2025-02-23 18:17:04 +00:00
Jan Mojžíš
6c57927b8d
d/control: add libnginx-mod-http-lua dependency for nginx-extras package
for riscv64 platform
2025-02-12 20:15:46 +01:00
Jan Mojžíš
3ef9946d9d
d/changelog: fix whitespace in 1.26.3-2 record 2025-02-12 20:15:17 +01:00
Jérémy Lal
c789199d37
Release to unstable 2025-02-07 12:53:15 +01:00
Jérémy Lal
58f592a8ab
Release 2025-02-05 19:08:06 +01:00
Jérémy Lal
c5cca14382
Bump ABI 2025-02-05 19:07:54 +01:00
Jérémy Lal
191713f275 Update upstream source from tag 'upstream/1.26.3'
Update to upstream version '1.26.3'
with Debian dir ad8840312e
2025-02-05 19:03:37 +01:00
Jérémy Lal
215777eecb
Release to experimental 2025-02-02 21:09:05 +01:00
Jan Mojžíš
2939b5f242
d/changelog: remove duplicit lines 2025-02-02 19:41:56 +01:00
Jan Mojžíš
92496d21cf
rm d/p/nginx-1.26.1.patch 2025-02-02 19:41:30 +01:00
Jan Mojžíš
d2631d1b03
rm d/p/CVE-2024-7347.patch 2025-02-02 19:41:03 +01:00
Jérémy Lal
9fb3b99b3d
Bump abi 2025-02-02 11:40:36 +01:00
Jérémy Lal
215a9620ef
Version 1.26.2 2025-02-02 11:33:47 +01:00
Jérémy Lal
1518af2753
Refresh patches 2025-02-02 11:24:45 +01:00
Jérémy Lal
2fe36c4448
Drop upstream patches 2025-02-02 11:24:35 +01:00
Jérémy Lal
2fb9d97244 Update upstream source from tag 'upstream/1.26.2'
Update to upstream version '1.26.2'
with Debian dir d8ae618778
2025-02-02 11:23:50 +01:00
Jérémy Lal
71f2059cf8
Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public key 2025-02-02 11:23:15 +01:00
Jan Mojžíš
f1e2f6cbb9
d/copyright: bump my copyright year 2025-01-28 17:54:27 +01:00
Jan Mojžíš
65bcb0d8dd
d/{control,copyright}: update my email to "janmojzis@debian.org" 2025-01-28 17:54:18 +01:00
Jan Mojžíš
9670e707d6
d/gbp.conf: add upstream-signatures = on 2025-01-28 17:54:08 +01:00
Jan Mojžíš
f180e25eb4
d/u/signing-key.asc add Sergey Kandaurov <s.kandaurov@f5.com> public key 2025-01-28 17:53:58 +01:00
Thomas Ward
df67526348 Actual release 2024-09-30 11:39:49 -04:00
Thomas Ward
0722a5648d Resolve dependency loop (debbugs #1082373) 2024-09-20 21:37:33 -04:00
Jan Mojžíš
9cd731914a
release nginx 1.26.0-2, upload to unstable 2024-08-19 18:46:47 +02:00
Jan Mojžíš
6e88f6d858
d/changelog fix whitespace 2024-08-19 10:59:44 +02:00
Jan Mojžíš
6bb737822f Merge branch 'wip-1.26.0-2' into 'main'
wip-1.26.0-2

See merge request nginx-team/nginx!85
2024-08-19 08:39:56 +00:00
Jan Mojžíš
a079a02186
d/changelog close bug for CVE-2024-7347 2024-08-18 21:07:25 +02:00
Jan Mojžíš
7137628c08
d/libnginx-mod.abisubstvars updated comment when ABI needs to be changed 2024-08-18 09:04:03 +02:00
Jan Mojžíš
80408ba19f Merge branch 'CVE-2024-7347' into 'wip-1.26.0-2'
d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix

See merge request nginx-team/nginx!84
2024-08-18 06:34:06 +00:00
Jan Mojžíš
b3d7b0f3ed
d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix 2024-08-18 08:15:33 +02:00
Jan Mojžíš
1b2c31e354 Merge branch 'patch-1.26.1' into 'wip-1.26.0-2'
d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1

See merge request nginx-team/nginx!81
2024-08-18 06:05:39 +00:00
Jan Mojžíš
45c7770c5e
d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 2024-06-17 18:46:59 +02:00
Thomas Ward
363e53be5d Update nginx.conf: whitespace matching 2024-06-17 16:25:34 +00:00
Thomas Ward
07bdbe9491 Merge branch 'modern-security-practices' into 'wip-1.26.0-2'
Update nginx.conf defaults for modern security

See merge request nginx-team/nginx!80
2024-06-17 16:24:24 +00:00
Thomas Ward
1b77cc4256 Merge branch 'wip-1.26.0-2' into 'modern-security-practices' 2024-06-17 16:22:46 +00:00
Thomas Ward
2a1513acc8 Debian changelog entry 2024-06-17 11:53:50 -04:00
Thomas Ward
6ef563d4f4 Update comments 2024-06-17 11:52:46 -04:00
Thomas Ward
3e7838a6b2 Update nginx.conf defaults
- Match current security practices for SSL protocols and SSL Prefer Server Ciphers
- Hide NGINX version in responses, modern security practice
2024-06-17 15:43:12 +00:00
Jan Mojžíš
9ede767588
d/control: bump Standards-Version: 4.7.0, no changes 2024-05-07 19:12:52 +02:00
Jan Mojžíš
5651e6f455
d/rules: enable QUIC and HTTP/3 module 2024-05-07 19:12:06 +02:00
Jan Mojžíš
6ccf66d20e
release nginx 1.26.0-1, upload to unstable 2024-05-05 18:49:07 +02:00
Jan Mojžíš
2d4405e08a
d/gbp.conf: add sign-tags = True, [pull] track-missing = True,
[import-orig] merge-mode = replace
2024-05-01 12:18:01 +02:00
Jan Mojžíš
899ebe0261 Merge branch 'wip-1.26.0' into 'main'
New upstream version 1.26.0

See merge request nginx-team/nginx!79
2024-05-01 09:41:38 +00:00
Jan Mojžíš
880afec3d7
d/changelog fix whitespace 2024-05-01 06:48:05 +02:00
Jan Mojžíš
f5ed2727e5
debian/upstream/signing-key.asc remove extra signatures 2024-05-01 06:47:41 +02:00
Jan Mojžíš
2148a071bf
d/libnginx-mod.abisubstvars: remove third-party modules version constraints 2024-05-01 06:29:23 +02:00
Jan Mojžíš
5c050148b6
d/changelog update 2024-05-01 05:36:21 +02:00
Jan Mojžíš
9b80dfac5a
d/conf/nginx.conf: add worker_cpu_affinity auto 2024-05-01 05:33:34 +02:00
Jan Mojžíš
b023f3fbf6
d/copyright update 2024-04-30 22:04:10 +02:00
Jan Mojžíš
7dc4f2ecb7
d/copyright: bump my copyright year 2024-04-30 19:04:28 +02:00
Jan Mojžíš
3fb6af3d34
d/copyright: updated copyright related to new upstream version 2024-04-30 19:03:47 +02:00
Jan Mojžíš
a6a3352563
d/changelog update 2024-04-30 18:42:05 +02:00
Jan Mojžíš
dad830baa6 Merge branch 'add-xsl-xslt-mimetype' into 'wip-1.26.0'
Add xsl xslt mimetype to nginx mime.types

See merge request nginx-team/nginx!78
2024-04-30 16:38:40 +00:00
Jan Mojžíš
4c1fc35cb6
d/changelog update 2024-04-30 18:35:43 +02:00
Jan Mojžíš
e06e0da2ab Merge branch 'main' into 'wip-1.26.0'
Add QUIC UFW app

See merge request nginx-team/nginx!73
2024-04-30 16:32:16 +00:00
Jan Mojžíš
0f09f394ed
d/p/CVE-2023-44487.patch remove, fixed in upstream 2024-04-30 17:53:35 +02:00
Jan Mojžíš
443e5c11eb
nginx ABI release: nginx-abi-1.26.0-1 2024-04-30 17:44:10 +02:00
Jan Mojžíš
dd2f4866aa
d/changelog new version 1.26.0-1 2024-04-30 17:42:53 +02:00
Jan Mojžíš
a6bc03f8fb Update upstream source from tag 'upstream/1.26.0'
Update to upstream version '1.26.0'
with Debian dir 2750282929
2024-04-30 17:42:09 +02:00
Jan Mojžíš
488a716b96
d/u/signing-key.asc add Roman Arutyunyan’s PGP public key 2024-04-30 17:41:25 +02:00
K Widholm
0b33ebb4a3 Update file mime.types 2023-10-27 02:15:04 +00:00
K Widholm
fbe69d2fe0 Update file mime.types 2023-10-27 02:06:46 +00:00
Jan Mojžíš
ea0383bdb1
release nginx 1.24.0-2, upload to unstable 2023-10-11 01:18:04 +02:00
Jan Mojžíš
14846e923d
d/changelog update CVE-2023-44487 description 2023-10-11 01:14:14 +02:00
Jan Mojžíš
5953afe398
Revert "release nginx 1.24.0-2, upload to unstable"
This reverts commit 192281805a.
2023-10-11 01:13:28 +02:00
Jan Mojžíš
192281805a
release nginx 1.24.0-2, upload to unstable 2023-10-11 00:39:21 +02:00
Jan Mojžíš
9515e05cd0
d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies 2023-10-10 23:54:50 +02:00
Jan Mojžíš
0c9954b9d7 Merge branch 'dhsequence-detect-stream' into 'main'
dh-sequence-nginx: automatic libnginx-mod-stream dependencies

See merge request nginx-team/nginx!74
2023-10-10 21:50:39 +00:00
Jan Mojžíš
81aeb5321d dh-sequence-nginx: automatic libnginx-mod-stream dependencies 2023-10-10 21:50:39 +00:00
Jan Mojžíš
b1313a97a6 Merge branch 'transition-dependency' into 'main'
d/control nginx-dev add dependency on ${nginx:abi}

See merge request nginx-team/nginx!75
2023-10-10 21:01:05 +00:00
Jan Mojžíš
6f007a8184 Merge branch 'main' into 'transition-dependency'
# Conflicts:
#   debian/changelog
2023-10-10 20:46:05 +00:00
Jan Mojžíš
53a637ae66 Merge branch 'CVE-2023-44487' into 'main'
CVE-2023-44487 fix

See merge request nginx-team/nginx!76
2023-10-10 20:22:50 +00:00
Jan Mojžíš
60b5a28e2d CVE-2023-44487 fix 2023-10-10 20:22:50 +00:00
Jan Mojžíš
f3ce71ad91
d/control add nginx-dev dependency on ${nginx:abi} 2023-10-10 16:25:14 +02:00
Marcus Bointon
1c1713f747 Add QUIC UFW app 2023-09-25 12:41:08 +00:00
Jan Mojžíš
dbecf37340
d/po/sv.po added Swedish debconf translation 2023-08-30 15:52:01 +02:00
Jan Mojžíš
f72db03173
d/po/sv.po added Swedish debconf translation 2023-08-30 15:50:18 +02:00
Jan Mojžíš
1af9890890 Merge branch 'mimetypes' into 'main'
d/conf/mime.types add video/ogg, video/x-matroska

See merge request nginx-team/nginx!71
2023-07-17 05:11:55 +00:00
Jan Mojžíš
1669ce81fa
d/conf/mime.types add video/ogg, video/x-matroska 2023-07-17 06:25:37 +02:00
Jan Mojžíš
d99a0ddc0b
d/conf/mime.types copy mime.types from upstream nginx,
no big changes, just reformat the text
2023-07-17 06:25:07 +02:00
Jan Mojžíš
8c4549c82a Merge branch 'rmdhstripoverride' into 'main'
d/rules remove override_dh_strip

See merge request nginx-team/nginx!69
2023-07-17 03:51:47 +00:00
Jan Mojžíš
7b0bfbb9f3
d/rules removed override_dh_strip 2023-07-17 05:24:19 +02:00
Jan Mojžíš
ed6370703d Merge branch 'rodebconf' into 'main'
d/po/ro.po add Romanian debconf translation

See merge request nginx-team/nginx!68
2023-07-15 20:19:27 +00:00
Jan Mojžíš
9d8220a199
d/po/ro.po add Romanian debconf translation 2023-07-15 21:24:09 +02:00
Jan Mojžíš
82149d89bf Merge branch 'fixdhstrip' into 'main'
* d/rules fixed debug-symbol-migration-possibly-complete lintian warning

See merge request nginx-team/nginx!67
2023-07-15 19:08:49 +00:00
Jan Mojžíš
b8d9144432
* d/rules fixed debug-symbol-migration-possibly-complete lintian warning 2023-07-15 20:24:35 +02:00
Jan Mojžíš
c40dd6a74f Merge branch 'fixdeps' into 'main'
d/control add dependency nginx-common to nginx

See merge request nginx-team/nginx!66
2023-07-15 14:55:46 +00:00
Jan Mojžíš
3f8de1c086
d/control fixed binNMU safe dependency declaration nginx to nginx-common 2023-07-15 08:26:10 +02:00
Jan Mojžíš
2d48a8c8ec
d/control add dependency nginx-common to nginx 2023-06-30 16:40:37 +02:00
Jan Mojžíš
54146b604b
release nginx 1.24.0-1, upload to unstable 2023-06-27 23:19:52 +02:00
Jan Mojžíš
d6229b0698
d/changelog fix whitespace 2023-06-26 15:20:12 +02:00
Jan Mojžíš
b4078d94d4
d/libnginx-mod.abisubstvars update version constraints of the 3rd party modules 2023-06-26 15:19:52 +02:00
Jan Mojžíš
bb973756e2
d/copyright: updated copyright 2023-04-25 22:40:28 +02:00
Jan Mojžíš
9fe5d1ba93
d/p/bug-{1024605,973861}.patch removed, fixed in upstream 2023-04-25 22:39:28 +02:00
Jan Mojžíš
7478c72e84
nginx ABI release: nginx-abi-1.24.0-1 2023-04-25 22:38:33 +02:00
Jan Mojžíš
557d688577
d/changelog New version 1.24.0-1 2023-04-25 22:37:22 +02:00
Jan Mojžíš
ba3751d77a Update upstream source from tag 'upstream/1.24.0'
Update to upstream version '1.24.0'
with Debian dir 60ea7399bd
2023-04-25 22:36:34 +02:00
Jan Mojžíš
3fdf9b9553
release nginx 1.22.1-9, upload to unstable 2023-03-14 16:19:37 +01:00
Jan Mojžíš
8cce84b858 Merge branch 'breaks-replaces' into 'main'
d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)

See merge request nginx-team/nginx!64
2023-03-14 12:14:53 +00:00
Jan Mojžíš
9a5dedf461
d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8) 2023-03-14 12:53:14 +01:00
Jan Mojžíš
c8b4d1401b
release nginx 1.22.1-8, upload to unstable 2023-03-14 06:53:39 +01:00
Thomas Ward
b4368782e6 Merge branch 'rollback-nginx-common' into 'main'
Revert "move common files from nginx-common to nginx"

See merge request nginx-team/nginx!63
2023-03-13 20:30:56 +00:00
Jan Mojžíš
c1f58a85e1
Revert "move common files from nginx-common to nginx"
This reverts commit 473f36a7d1.
2023-03-13 18:54:13 +01:00
Jan Mojžíš
bd50f6ef76
d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version 2023-03-08 21:48:08 +01:00
Jan Mojžíš
57e87d08df
d/changelog: fix nginx-full dependencies 2023-03-08 21:44:28 +01:00
Jan Mojžíš
5864a7b5b0 Merge branch 'fixdeps' into 'main'
d/control fix nginx-full dependencies

See merge request nginx-team/nginx!62
2023-03-08 20:43:30 +00:00
Jan Mojžíš
f215469ef5
d/control fix nginx-full dependencies 2023-02-13 20:18:20 +01:00
Jan Mojžíš
834bbcee5b
release nginx 1.22.1-7, upload to unstable 2023-02-13 13:04:39 +01:00
Jan Mojžíš
bfcd400270
d/copyright: updated to be compatible with 'cme update dpkg-copyright' 2023-02-12 15:59:12 +01:00
Jan Mojžíš
bb65ab50f4
d/libnginx-mod.abisubstvars update lua version to 1:0.10.23~rc2-2 2023-02-12 15:20:52 +01:00
Jan Mojžíš
d298d6b51b
d/gbb.conf: switched to debian branch main (debian-branch = main) 2023-02-10 18:07:33 +01:00
Jan Mojžíš
ed087b074e
d/p/bug-973861: add, lingering close for connections with pipelined requests 2023-02-10 17:34:26 +01:00
Jan Mojžíš
c7f0bac49b
d/changelog update 2023-02-10 17:33:09 +01:00
Jérémy Lal
3a3786f1d4
Switch to pcre2. 2023-02-10 17:32:41 +01:00
Jan Mojžíš
309c257646
nginx: provide nginx-abi-<VERSION> 2023-02-10 17:29:30 +01:00
Jan Mojžíš
cd33a3034d
release nginx 1.22.1-6, upload to unstable 2023-02-08 17:23:54 +01:00
Jan Mojžíš
40664a0df5
d/control: bump Standards-Version: 4.6.2, no changes 2023-02-08 11:43:05 +01:00
Jan Mojžíš
4ce2e9f8f5
d/changelog update 2023-02-08 11:42:55 +01:00
Jan Mojžíš
0a2666b12c
fixes
- d/control: remove unnecesary 'Suggests'
- d/control: remove Provides: nginx for nginx package
- debian/apport/source_nginx.py: nginx-common -> nginx
2023-02-08 11:10:14 +01:00
Jan Mojžíš
473f36a7d1
move common files from nginx-common to nginx 2023-02-08 11:08:32 +01:00
Jan Mojžíš
5f65c2c182
move binaries to nginx package instead nginx-bin 2023-02-08 11:08:21 +01:00
Jan Mojžíš
b6e0209bf2 Merge branch 'noquilt' into 'master'
B-D: remove quilt, no longer needed

See merge request nginx-team/nginx!58
2023-01-23 07:15:59 +00:00
Jan Mojžíš
820fb1eaab
revert warnings d/nginx-{light,core,extras,full}.postinst 2023-01-23 08:13:48 +01:00
Jérémy Lal
f7740951fb
Remove very old README.Debian 2023-01-22 13:16:21 +01:00
Jérémy Lal
7ceb830e66
B-D: remove quilt, no longer needed 2023-01-22 13:09:10 +01:00
Jan Mojžíš
b0a64680b5
d/control: remove dependency on obsolete package lsb-base 2023-01-21 16:30:49 +01:00
Jan Mojžíš
980bcea7f6
d/po/it.po: add 2023-01-13 17:31:47 +01:00
Jan Mojžíš
d720b646a5
d/copyright fix GPL2 2023-01-12 18:50:32 +01:00
Jan Mojžíš
1088db1699
d/control: fix dependencies for safe binNMU 2023-01-12 18:22:37 +01:00
Jan Mojžíš
9373935883
d/control fix nginx-common dependency 2023-01-12 18:17:16 +01:00
Jan Mojžíš
6bab81e56d
d/changelog fix whitespace 2023-01-12 18:05:11 +01:00
Jan Mojžíš
94f4fc97bb
d/copyright: add missing copyright for debian/help/examples/nginx_modsite 2023-01-12 17:53:39 +01:00
Jan Mojžíš
8fefc3d77b
d/copyright: add missing GPL-2+ copyright for debian/debhelper/dh_nginx 2023-01-12 17:51:19 +01:00
Jan Mojžíš
a71d85a87f
d/copyright: add missing copyright for debian/apport/* 2023-01-12 17:42:09 +01:00
Jan Mojžíš
9cb0e1d9ee
d/copyright: update debian/* copyright 2023-01-12 17:40:55 +01:00
Jan Mojžíš
16ee97c874 Merge branch 'onlycoreflavour' into 'master'
add nginx-bin package and replace core/light/extras by a dependency package

See merge request nginx-team/nginx!53
2023-01-12 16:23:25 +00:00
Jan Mojžíš
7e238bfad9 add nginx-bin package and replace core/light/extras by a dependency package
and fix dependencies for safe binNMU
2023-01-12 16:23:24 +00:00
Jan Mojžíš
c412740e4e
release nginx 1.22.1-5, upload to unstable 2022-12-20 10:36:40 +01:00
Jan Mojžíš
32e7cc8921
d/control: update nginx-common dependency,
fixes lintian warning maybe-not-arch-all-binnmuable
2022-12-20 08:56:12 +01:00
Jan Mojžíš
e907e5063e Merge branch 'autopkgtestupdate' into 'master'
d/tests: all *-simple and *-deps tests update

See merge request nginx-team/nginx!56
2022-12-20 07:46:50 +00:00
Jan Mojžíš
e5c631271d
d/control bump libnginx-mod-nchan version (>= 1:1.3.5+dfsg-3~) 2022-12-20 08:19:48 +01:00
Jan Mojžíš
ef3bb53436
d/tests: all *-simple and *-deps tests updated to check if nginx works
after installation/reload/restart for all flavours
2022-12-19 18:05:38 +01:00
Jan Mojžíš
ec0569d08d Merge branch 'readme' into 'master'
Rename and Update README.source

See merge request nginx-team/nginx!54
2022-12-19 06:25:57 +00:00
Jérémy Lal
280d76fff3
README.source: update 2022-12-18 19:33:21 +01:00
Jérémy Lal
f313b00cf3 README.Packaging -> README.source 2022-12-18 19:29:11 +01:00
Jan Mojžíš
50a7f05bb5
d/changelog update 2022-12-15 16:57:52 +01:00
Jan Mojžíš
de8448d5bc Merge branch 'errorlog' into 'master'
Set global error_log to /var/log/error.log

See merge request nginx-team/nginx!51
2022-12-15 15:52:39 +00:00
Jan Mojžíš
2fe562a265 Merge branch 'nginx_test_path' into 'master'
Use absolute path for nginx tests

See merge request nginx-team/nginx!49
2022-12-15 15:47:08 +00:00
Jan Mojžíš
59d6bf43ae Merge branch 'ssl_cb_yield' into 'master'
SSL_CTX_set_cert_cb() callback yielding patch update

See merge request nginx-team/nginx!50
2022-12-15 15:46:42 +00:00
Jérémy Lal
bfb15ce426
Set global error_log to /var/log/error.log
Now that error_log default value is stderr, it is possible
to override that config using nginx -g 'error_log stderr;'
2022-12-15 15:00:22 +01:00
Jérémy Lal
df50b02828
Use absolute path for nginx tests 2022-12-15 12:12:36 +01:00
Jérémy Lal
edf2683169
SSL_CTX_set_cert_cb() callback yielding patch update 2022-12-15 12:12:04 +01:00
Jérémy Lal
9090d6f143
Refresh patches 2022-12-15 12:11:45 +01:00
Jan Mojžíš
804090a0ff
d/changelog update 2022-12-13 06:07:58 +01:00
Jan Mojžíš
881aa23e4b Merge branch 'dh-ndk' into 'master'
dh nginx: auto-detect build-dependency on ndk-dev

See merge request nginx-team/nginx!42
2022-12-13 05:05:55 +00:00
Jérémy Lal
8e50af0215
nginx_mod: detect libnginx-mod-http-ndk-dev 2022-12-12 18:12:57 +01:00
Jérémy Lal
dbb13b38d7
Format tabs in nginx_mod.pm 2022-12-12 18:12:57 +01:00
Jan Mojžíš
8273ea9b0e
d/changelog update 2022-12-12 17:58:43 +01:00
Jan Mojžíš
9d9704050f Merge branch 'stderr' into 'master'
Default error-log-path is stderr (Closes: #1025858)

See merge request nginx-team/nginx!44
2022-12-12 16:51:38 +00:00
Jan Mojžíš
2572ddf3ff Merge branch 'patch-enable-stream-realip' into 'master'
Enable stream_realip_module

See merge request nginx-team/nginx!45
2022-12-12 16:45:06 +00:00
Jan Mojžíš
519c5d005b Merge branch 'pr-disable-pcre2' into 'master'
Explicitly disable pcre2

See merge request nginx-team/nginx!47
2022-12-12 15:37:43 +00:00
Jan Mojžíš
21195469f2 Merge branch 'pr-remove-dep' into 'master'
Remove unnecessary dependencies after removing 3rd party modules

See merge request nginx-team/nginx!46
2022-12-12 15:35:43 +00:00
Miao Wang
096c566945 Explicitly disable pcre2
Our intention is to to build nginx with pcre3. However, nginx by default
prefers pcre2. As a result, when libpcre2-dev is installed, nginx will
be built with pcre2, which is not intended.

Furthermore, users of nginx-dev will also meet test failures when they
try to compile module related to pcre because of this. To reproduce,
simply:

```
apt-get install nginx-dev devscripts libpcre2-dev
apt-get source libnginx-mod-http-subs-filter
cd libnginx-mod-http-subs-filter-*/ && debuild -us -uc
```
2022-12-12 15:23:32 +08:00
Miao Wang
4eef3437c0 Remove unnecessary dependencies after removing 3rd party modules 2022-12-12 13:45:29 +08:00
Jan Mojžíš
b975df6df9
d/changelog update 2022-12-11 16:30:30 +01:00
Miao Wang
4a172ade6f Enable stream_realip_module 2022-12-11 14:24:55 +00:00
Jérémy Lal
7d7692e5fd Default error-log-path is stderr (Closes: #1025858) 2022-12-11 14:00:47 +01:00
Jan Mojžíš
46f12a0dc9 Merge branch 'modulesrm' into 'master'
remove 3th party modules

See merge request nginx-team/nginx!43
2022-12-10 09:16:22 +00:00
Jan Mojžíš
10a2613f37
remove 3th party modules 2022-12-10 05:26:48 +01:00
Jan Mojžíš
34bfbac550
release nginx 1.22.1-4, upload to unstable 2022-12-08 14:23:55 +01:00
Jan Mojžíš
4fa2618502
remove modules ndk,nchan,rtmp 2022-12-08 13:40:52 +01:00
Jan Mojžíš
075c5d85db
d/control fix whitespace 2022-12-08 13:03:18 +01:00
Jan Mojžíš
11ca3f5693
remove modules ndk,nchan,rtmp 2022-12-08 12:56:39 +01:00
Jan Mojžíš
ccd8b06890
d/t/*-module-deps: update:
- add tests for new ext. module libnginx-mod-http-set-misc
- add tests for new ext. module libnginx-mod-http-brotli-filter
- add tests for new ext. module libnginx-mod-http-brotli-static
- add tests for new ext. module libnginx-mod-http-memc
- add tests for new ext. module libnginx-mod-http-srcache-filter
2022-12-08 12:53:49 +01:00
Jan Mojžíš
2e0b1943b0
d/t/*-module-deps: add curl timeout 300 seconds + nginx restart 2022-12-08 12:48:36 +01:00
Jan Mojžíš
616ee02725
release nginx 1.22.1-3, upload to unstable 2022-12-05 18:25:29 +01:00
Jan Mojžíš
58657d6178
d/p/bug-1024605.patch Forwarded: not-needed 2022-12-04 20:17:30 +01:00
Jan Mojžíš
6c68d264f3
d/rules: enable NDK upstream list module NDK_UPSTREAM_LIST 2022-12-03 08:28:23 +01:00
Jan Mojžíš
f868709a45
d/control: added Multi-Arch: foreign for package nginx-dev 2022-12-02 00:31:15 +01:00
Jan Mojžíš
6b40792634
release nginx 1.22.1-2, upload to unstable 2022-11-30 17:40:35 +01:00
Jérémy Lal
65aa43c3d5
Update changelog 2022-11-30 17:36:47 +01:00
Jérémy Lal
ad7d6fcf98
Uploaders for a team needs only one name 2022-11-29 20:27:42 +01:00
Jan Mojžíš
b99e3ad524
Remove constraints unnecessary since buster (oldstable)
* nginx-dev: Drop versioned constraint on dpkg-dev in Depends.

Changes-By: deb-scrub-obsolete
2022-11-29 13:17:04 +01:00
Jérémy Lal
393320b207
Update changelog 2022-11-29 13:12:19 +01:00
Jérémy Lal
cb417c7e2c
nginx-dev provides dh-sequence-nginx 2022-11-29 13:11:06 +01:00
Jérémy Lal
6d3c163fd3
Add buildsystem nginx_mod to dh-sequence nginx 2022-11-29 13:11:02 +01:00
Jan Mojžíš
f6fb6fb8d9 Merge branch '3thpartydeps' into 'master'
d/control update implicit dependencies of third-party modules

See merge request nginx-team/nginx!38
2022-11-26 17:04:44 +00:00
Jan Mojžíš
70c390852c
d/control update implicit dependencies of third-party modules 2022-11-26 16:03:37 +01:00
Jan Mojžíš
fa37bc17ab
d/p/bug-1024605.patch add, bugfix 1024605
fixes problem when a subrequest has SSI
enabled but its main request does not, the SSI module may crash the worker
due to NULL-pointer dereference. The patch is backported from the upstream
2022-11-26 15:49:52 +01:00
Jan Mojžíš
c2ce778dcb
d/tests/ssi-module-test add 2022-11-26 14:52:56 +01:00
Jan Mojžíš
a056949f1b
d/changelog fix whitespace 2022-11-26 13:37:19 +01:00
Jan Mojžíš
dce642e642
d/changelog: d/nginx-*.postinst: Use invoke-rc.d
instead of pidof and ad-hoc tests
2022-11-26 11:19:43 +01:00
Jan Mojžíš
273e508834 Merge branch 'maintscripts-no-pidof' into 'master'
d/nginx-*.postinst: Use invoke-rc.d instead of pidof and ad-hoc tests

See merge request nginx-team/nginx!36
2022-11-26 10:15:19 +00:00
Jan Mojžíš
c3f0a00120
d/control fix spelling-error-in-description
Subsitution -> Substitution
2022-11-11 06:16:39 +01:00
Jan Mojžíš
4243cedb55
release nginx 1.22.1-1, upload to unstable 2022-11-10 18:23:04 +01:00
Jan Mojžíš
1755a81da7 Merge branch 'lintian-fixes' into 'master'
Fix day-of-week for changelog entry 0.5.11-1

See merge request nginx-team/nginx!37
2022-10-28 13:26:52 +00:00
Jan Mojžíš
c2f4bc019b
d/changelog update changelog text 2022-10-28 15:13:30 +02:00
Debian Janitor
974e91ad9d Fix day-of-week for changelog entry 0.5.11-1.
Changes-By: lintian-brush
Fixes: lintian: debian-changelog-has-wrong-day-of-week
See-also: https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html
2022-10-28 08:39:19 +00:00
Jan Mojžíš
304ba44d13
d/control fix implicit version libnginx-mod-http-lua
>=1:0.10.22-3~
2022-10-28 10:14:30 +02:00
Jan Mojžíš
cc9cec6999
d/changelog fix whitespace 2022-10-28 09:59:47 +02:00
Jan Mojžíš
a8134e4741
Add libnginx-mod-http-lua powerpc architecture 2022-10-27 16:35:14 +02:00
Jan Mojžíš
8ac7c1efb5
d/changelog added exact version of dependency libnginx-mod-http-lua 2022-10-26 17:27:15 +02:00
Jan Mojžíš
372da465bf
d/changelog New upstream version 1.22.1 2022-10-25 19:18:20 +02:00
Jan Mojžíš
fe71c4981f Update upstream source from tag 'upstream/1.22.1'
Update to upstream version '1.22.1'
with Debian dir 2862ab776b
2022-10-25 18:29:15 +02:00
Michael Biebl
6cad8ef578 Import Debian changes 1.22.0-3.1
nginx (1.22.0-3.1) unstable; urgency=medium
.
  * Non-maintainer upload.
  * No source change upload to rebuild with debhelper 13.10.
2022-10-25 18:20:24 +02:00
Gioele Barabucci
d9b4c476c1 d/nginx-*.postinst: Use invoke-rc.d instead of pidof and ad-hoc tests
Checking if nginx is running using and a mixture of file tests and
`pidof` is fragile. Debian policy 9.3.3 states that `invoke-rc.d` should
be used instead to perform these checks.

In addition, the use of `pidof` creates an implicit depency on
`sysvinit-utils`. `sysvinit-utils` is currently essential, but that
may change in the future.

Patch originally contributed by @ah: https://paste.debian.net/1254794/
2022-09-25 22:03:56 +02:00
Jan Mojžíš
9867fd4940
release nginx 1.22.0-3, upload to unstable 2022-08-17 18:39:38 +02:00
Jan Mojžíš
212327ed57
http-lua: remove 2022-08-17 06:54:21 +02:00
Jan Mojžíš
caf389149a
d/p/nginx-ssl_cert_cb_yield.patch add 2022-08-17 06:54:11 +02:00
Jan Mojžíš
a316cb99e4
d/changelog: fix typo in bug number 61261 -> 861261 2022-08-17 06:53:59 +02:00
Jérémy Lal
08de4d4bc7
Release to unstable 2022-08-07 16:15:09 +02:00
Jan Mojžíš
36887b5cd8 Merge branch 'exp' into 'master'
exp

See merge request nginx-team/nginx!35
2022-08-04 02:45:25 +00:00
Jan Mojžíš
13a5fc3501
d/gitlab-ci.yml removed
in GL switched to salsa-ci team recipes/debian.yml@salsa-ci-team/pipeline
2022-07-23 13:05:28 +02:00
Jan Mojžíš
c9a408aa6f
d/apport/source_nginx.py: Add apport hooks
for additional bug information gathering,
the script is backported from Ubuntu
2022-07-23 13:03:31 +02:00
Jan Mojžíš
861f1be869
d/p/nginx-fix-pidfile.patch backport from Ubuntu 2022-07-23 10:49:48 +02:00
Jan Mojžíš
43b9a879c9
Remove constraints unnecessary since buster
* Build-Depends: Drop versioned constraint on dpkg-dev.
* nginx-common: Drop versioned constraint on lsb-base in Depends.
* nginx-core: Drop versioned constraint on nginx in Breaks.
* nginx-full: Drop versioned constraint on nginx in Breaks.
* nginx-light: Drop versioned constraint on nginx in Breaks.
* nginx-extras: Drop versioned constraint on nginx in Breaks.
* libnginx-mod-http-perl: Drop versioned constraint on nginx-extras in Replaces.
* Remove 5 maintscript entries from 1 files.
2022-07-23 10:48:06 +02:00
Jan Mojžíš
142c95ade0
add libnginx-mod-http-ndk-dev to nginx to build ngx-lua 2022-07-23 10:47:23 +02:00
Jan Mojžíš
0e2eaec4b2
d/gitlab-ci.yml removed
in GL switched to salsa-ci team recipes/debian.yml@salsa-ci-team/pipeline
2022-07-23 10:40:40 +02:00
Jan Mojžíš
0d813834ef
http-subs-filter add PCRE2 support 2022-07-11 20:34:21 +02:00
Jan Mojžíš
461acc4f51
d/nginx-common.nginx.service: remove systemd 'After' dependency syslog.target,
is obsolete
2022-07-10 20:13:30 +02:00
Jan Mojžíš
e9e5491b5e Merge branch 'master' into 'master'
systemd service update, forward patch

See merge request nginx-team/nginx!31
2022-07-10 17:13:44 +00:00
Jan Mojžíš
ff7cd7012d
d/t/reboot: added, tests if nginx works after reboot 2022-07-10 18:32:08 +02:00
Jan Mojžíš
88d4d1577a
d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch forwarded to upstream 2022-07-10 09:19:52 +02:00
Jan Mojžíš
ccd6718920
d/nginx-common.nginx.service update 2022-07-10 09:15:53 +02:00
Thomas Ward
035ed7f34a Unstable upload 2022-07-09 20:14:24 -04:00
Jan Mojžíš
1a3b001414
d/changelog close #985133 bug 2022-06-26 16:41:06 +02:00
Jan Mojžíš
42508c8556
create var/www/html in nginx-common.postinst 2022-06-26 16:21:08 +02:00
Jan Mojžíš
172eb7b12a
d/changelog close #1013807 bug 2022-06-26 16:16:58 +02:00
Jan Mojžíš
7df2636a9d
d/changelog fix whitespace 2022-06-26 16:16:08 +02:00
Jan Mojžíš
bf9c433dbb
d/control: bump Standards-Version to 4.6.1, no changes 2022-06-26 14:35:33 +02:00
Thomas Ward
83ca2994f8
Copyright file needed updated (caught by Bage, who emailed a patch to teward) 2022-06-26 14:34:19 +02:00
Jan Mojžíš
b1ee4a4291 Merge branch 'pr-nginx-dev-unstable' into 'master'
Adding nginx-dev package for tools for building out-of-tree modules

See merge request nginx-team/nginx!30
2022-06-26 12:28:14 +00:00
Miao Wang
9f1044b940 changelog: update changelog 2022-06-26 15:26:40 +08:00
Jan Mojžíš
ed5bc15213 Remove 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch 2022-06-26 15:25:21 +08:00
Miao Wang
509adba304 dh_nginx: support auto generating module config files
This patch adds support of auto generating module config files for
modules in the naming pattern of libnginx-mod-* but with missing
<module_name>.nginx file. The module load file and its loading priority
is inferred from the package name in this case.

Using this feature, the repeated files d/libnginx-mod-*.nginx and
d/libnginx-mod.conf/ can be removed, and the packaging for out-of-tree
modules can be simplified.
2022-06-26 15:20:43 +08:00
Miao Wang
15c55ec59b dh_nginx: move to debian/debhelper
Move dh_nginx script to debian/debhelper so that all debhelper scripts
are located together.
2022-06-26 15:20:30 +08:00
Miao Wang
2784d3f935 nginx-dev: fix nginx version subtracting in dh_nginx 2022-06-26 15:20:21 +08:00
Miao Wang
87b5e38f6d nginx-dev: simplify dependencies
nginx-dev depends on ${S:Build-Depends} before this commit, to include
all the build-depdencies of nginx source packages. However, this also
includes build dependency for those in-tree 3rd party modules, which are
unnecessary. This commit removes them and explicitly list those packages
needed to build a general module. The architecture of nginx-dev can thus
be changed to all instead of any.

When all 3rd party modules are removed, the dependency can be changed
back to ${S:Build-Depends} to make the config less redundant.
2022-06-26 15:20:09 +08:00
Miao Wang
d4b9d6a1da Adding nginx-dev package for tools for building out-of-tree modules
Nginx does not officially provide a mechanism to build out-of-tree modules,
however, this can be achieved by using all the headers and the configure
scripts in the auto/ directory. As a result, a nginx-dev package can thus be
developed for build out-of-tree modules.

The detailed steps to build an out-of-tree module in the headers-only nginx
source tree is:

1. Execute the configure script of nginx, with the same configure arguments
(excluding the reference to other dynamic modules, but including the reference
to depending modules as a built-in module). To prevent the configure scripts
modifying the nginx ource tree, we can 1. point the build dir to a directory
elsewhere, to generate all the build time files outside; 2. slightly patch the
configure scripts to prevent generating a makefile directly in the source tree,
which simply includes the generated makefile at the build dir.

2. Execute make at the source tree, but providing the generated makefile in the
build dir. The command is `make -C /path/to/nginx/source -f
/path/to/build_dir/Makefile modules`

To make sure the compiled module is compatible with the nginx binary and the
nginx binaries with the same upstream version, the key points are:

- Module signature: A module signature containing the (upstream) version number
and encoding the necessary configuration flags is put in each module as well as
the nginx binary itself. When loading a module, nginx will compare the signature
on the module with its own. As long as the configure flags, especially those
encoded in the signature, and the version of the nginx source used to build the
module are the same as thoes used to build the nginx binary, the moudle can pass
the signature check. As a result, the module can depend on the exact nginx
upstream version, ignoring the debian revison.
- ABI compatibility: We should maintain nginx precisely, to prevent making any
ABI changes between different debian revisions.
- Build check: When building the module, we can perform a simple module loading
check via `nginx -t`. This test serves as a "smoking test", to ensure we are
actually building loadable modules.

Summing all the above up and adding the necessary automation scripts for module
packaging, the nginx-dev package can be composed, including the following parts:

- The headers and configure scripts: generated and filtered out from the source
tree. The scripts are slightly patched to prevent generating a makefile directly
in the source tree, as stated above;
- The recorded configure options: all the modules built should include these
options when configured;
- dh_nginx script and its man page: modified from the original dh_nginx script,
adding a "--in-nginx-tree" option. When specified, the behavior remains the same
as the original version (so the option is added in the rule building the
in-package modules). When not specified, the dependency added into misc:Depends
will be the exact upstream nginx version, ignoring the debian revision. E.g.
nginx-common >= 1.20.2, << 1.20.2.1~
- a debhelper sequence plugin which can be enabled by module packages with `dh
--with=nginx`, inserting `dh_nginx` after `dh_install`
- a build system plugin which can bu enabled by module packages with `dh
--buildsystem=nginx_mod`, automating the module building process using the steps
mentioned before.
- autoscript templates used by dh_nginx are also installed without modification.

Currently. the architecture of nginx-dev is any because nginx has arch related
dependencies, which is brought in by http-lua module. After it is
removed from the nginx source tree, the architecture can be changed to
all since no binary is included in this package.
2022-06-26 15:19:47 +08:00
Thomas Ward
333875401c Return ppc64el to liblua, luajit2 still broken on ppc64el. 2022-06-25 17:31:16 -04:00
Thomas Ward
4b7212e745 Enable luajit for s390x 2022-06-08 16:15:40 -04:00
Thomas Ward
20eb8ab414 ppc64el FTBFS fixed in luajit, nginx: no action needed 2022-06-08 15:22:49 -04:00
Thomas Ward
a8ebc4ba0c Update d/copyright for murmurhash license being public-domain 2022-05-26 23:15:02 -04:00
Jan Mojžíš
c3f9fc730b
d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c 2022-05-25 17:45:49 +02:00
Jan Mojžíš
5eec971e27
d/copyright:
- bump nginx copyright years
- added copyright for src/stream/ngx_stream_set_module.c
2022-05-25 17:13:14 +02:00
Jan Mojžíš
a013b18ff6
d/changelog fix whitespaces 2022-05-25 11:19:06 +02:00
Jan Mojžíš
7224e5e7ca
d/control: removed ppc64el from list of luajit platforms. 2022-05-25 11:04:30 +02:00
Jan Mojžíš
c394d8d999
d/p/CVE-2021-3618.patch removed, fix is included in new upstream release 2022-05-25 07:19:41 +02:00
Thomas Ward
5900bc832a Changelog update 2022-05-24 14:24:29 -04:00
Thomas Ward
24d9bd0290 Update changelog 2022-05-24 14:20:28 -04:00
Thomas Ward
f406308220 Update upstream source from tag 'upstream/1.22.0'
Update to upstream version '1.22.0'
with Debian dir 6d3cebb4f0
2022-05-24 14:19:09 -04:00
Thomas Ward
493d6c7b86 Update signing keys - new upstream signing key(s) observed. 2022-05-24 14:18:52 -04:00
Thomas Ward
9b87224f4f Bug 1010798 - fixes woff2 typo 2022-05-10 12:08:52 -04:00
Thomas Ward
9a6a526958 1.20.2-2 release 2022-05-09 11:55:56 -04:00
Thomas Ward
aaaac9a28f Merge branch 'master' into 'master'
d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch update

See merge request nginx-team/nginx!24
2022-05-09 15:17:21 +00:00
Jan Mojžíš
78d84c5752
d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch update
fixes build on hurd-i386
2022-05-05 06:53:13 +02:00
Thomas Ward
2c5ea38623 Oops forgot to add the patch 2022-05-04 20:18:41 -04:00
Thomas Ward
4514c0f658 Add changelong for CVE patch inclusion 2022-05-04 16:06:32 -04:00
Thomas Ward
ad330f7cb1 Unpop all patches to keep tree clean 2022-05-04 15:35:34 -04:00
Thomas Ward
9c33aafeff Add CVE-2021-3618 patches and mitigations 2022-05-04 15:35:09 -04:00
Thomas Ward
747ca190d0 Update packaging - this was done by Ondrej, let's make it live 2022-05-04 10:56:19 -04:00
Ondřej Nový
45005f76d4 Add Jan Mojžíš <jan.mojzis@gmail.com> as uploader 2022-05-04 15:46:42 +02:00
Ondřej Nový
9c7d79dce0 Add Thomas Ward <teward@ubuntu.com> as uploader 2022-05-04 15:46:35 +02:00
Thomas Ward
1fcb59adce 1.20.2-1 release 2022-04-21 11:20:04 -04:00
Thomas Ward
48b9b6e3ea Missed part of mime.types updates 2022-04-19 12:27:49 -04:00
Thomas Ward
8735246ec0 Update d/conf/mime.types again using 1.21.x upstream 2022-04-19 12:27:09 -04:00
Thomas Ward
9bc813d5a2 Remove self from uploaders per other DDs 2022-04-19 10:37:35 -04:00
Thomas Ward
528e57d73d Update d/conf/mime.types 2022-04-19 10:26:55 -04:00
Thomas Ward
9cb8bb9efc Fix some branch uncleanliness that happened in local branch which made it to Salsa 2022-04-19 10:07:47 -04:00
Thomas Ward
c85dfc1d2b New 1.20.2 version, drop unneeded patch 2022-04-19 09:58:16 -04:00
Thomas Ward
697ed23dad Update upstream source from tag 'upstream/1.20.2'
Update to upstream version '1.20.2'
with Debian dir 2f42cbbd64
2022-04-19 09:50:31 -04:00
Thomas Ward
2a278d9a55 Release of 1.18.0-9 2022-04-14 16:46:45 -04:00
Thomas Ward
7e21f77a90 Update uploaders as Thomas Ward is now a maintainer in Salsa 2022-04-12 12:54:09 -04:00
Thomas Ward
98c979b948 Merge branch 'master' into 'master'
Update watch file syntax for proper version matching/reporting

See merge request nginx-team/nginx!17
2022-04-11 21:22:20 +00:00
Thomas Ward
c3be1137f3 Update watch file syntax for proper version matching/reporting 2022-04-07 15:35:33 -04:00
Thomas Ward
2308f65897 Merge branch 'master' into 'master'
Downgrade http-lua, fix homepage

See merge request nginx-team/nginx!16
2022-04-07 19:15:38 +00:00
Jan Mojžíš
ced892ac0d
d/control: Add mips64el,ppc64,kfreebsd-amd64 to list of luajit platforms. 2022-04-05 19:56:40 +02:00
Jan Mojžíš
b58e677848
d/control: fix Homepage nginx.net -> nginx.org 2022-04-05 19:25:57 +02:00
Jan Mojžíš
054b32430f
http-lus: Backport segfault bugfix 2022-04-05 19:20:29 +02:00
Jan Mojžíš
6a0621d227
http-lua: Downgrade to v0.10.13 2022-04-05 19:10:56 +02:00
Ondřej Nový
31e3a6a61b d/changelog: Fix typo 2022-03-15 14:30:13 +01:00
Ondřej Nový
bc5f19ef77 releasing package nginx version 1.18.0-8 2022-03-15 13:23:10 +01:00
Ondřej Nový
4f1a2c590c releasing package nginx version 1.18.0-7 2022-03-15 11:50:23 +01:00
Ondřej Nový
4ea741ae27 d/copyright: Bump my copyright year 2022-03-15 11:44:33 +01:00
Ondřej Nový
bd32060ee7 Bump standards version to 4.6.1 (no changes) 2022-03-15 11:39:40 +01:00
Ondřej Nový
a13d46c865 d/nginx-common.nginx.service: Fix service shutdown desctiption to mention SIGQUIT instead of SIGSTOP (LP: #1919965) (Thanks Athos Ribeiro) 2022-03-15 11:37:01 +01:00
Ondřej Nový
a9e81f1e3e Merge branch 'ondrej/more-luajit-platforms' into 'master'
Add arm64 and ppc64el to list of luajit platforms

See merge request nginx-team/nginx!10
2022-03-15 10:34:10 +00:00
Ondřej Nový
4499fb4947 d/watch: Bump version to 4 2022-03-15 11:29:20 +01:00
Ondřej Nový
976d4826bb nchan: Drop GCC 10 patch, applied upstream 2022-03-15 11:13:34 +01:00
Ondřej Nový
7bc0cfe077 http-lua: Rebase patch 2022-03-15 11:13:17 +01:00
Ondřej Nový
70f87643c9 http-lua: Upgrade to 0.10.15 2022-03-15 11:03:47 +01:00
Ondřej Nový
a63400c839 rtmp: Upgrade to 1.2.2 2022-03-15 11:01:40 +01:00
Ondřej Nový
16da4dccd2 http-fancyindex: Upgrade to 0.5.2 2022-03-15 11:01:34 +01:00
Ondřej Nový
e5cbfb9f4b nchan: Upgrade to 1.2.15 2022-03-15 11:01:27 +01:00
Ondřej Nový
0b739c803e http-echo: Upgrade to 0.62 2022-03-15 11:01:16 +01:00
Ondřej Nový
ecdfceccf1 http-auth-pam: Upgrade to 1.5.3 2022-03-15 11:01:10 +01:00
Ondřej Surý
da49114fdc Add arm64 and ppc64el to list of luajit platforms 2021-03-06 09:51:03 +01:00
Ondřej Nový
28cea613e4 d/p/CVE-2019-20372.patch: Drop, applied upstream. 2020-08-21 14:14:23 +02:00
Ondřej Nový
d5edfb4e7a releasing package nginx version 1.18.0-6 2020-08-19 15:27:14 +02:00
Ondřej Nový
371e61084f Fix GCC-10 compatibility (Closes: #957605). 2020-08-19 15:19:52 +02:00
Ondřej Nový
0c7efeffcd releasing package nginx version 1.18.0-5 2020-07-14 10:08:21 +02:00
Ondřej Nový
aa1f93ee24 Prevented request smuggling in LUA CVE-2020-11724 Closes: #964950 2020-07-14 09:53:45 +02:00
Ondřej Nový
bfdc885afc releasing package nginx version 1.18.0-4 2020-07-03 09:34:57 +02:00
Ondřej Nový
7df3da6863 Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: 963860).
* Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: 963860).
* libnginx-mod-* recommends nginx now.
2020-06-30 18:35:05 +02:00
Ondřej Nový
d08f16833f d/copyright: Bump year of http-auth-pam 2020-06-24 15:21:16 +02:00
Ondřej Nový
704b0f0e37 http-auth-pam: Upgrade to 1.5.2 (Closes: #963567) 2020-06-24 15:20:34 +02:00
Ondřej Nový
b760bb04de Update ngx_http_auth_pam_module upstream URL 2020-06-24 15:19:02 +02:00
Ondřej Nový
f039c694b2 releasing package nginx version 1.18.0-3 2020-06-11 15:15:05 +02:00
Ondřej Nový
fd2d73b10f Source-only upload to allow migration. 2020-06-11 15:14:52 +02:00
Ondřej Nový
886b03658e releasing package nginx version 1.18.0-2 2020-06-05 18:28:56 +02:00
Ondřej Nový
cc65b80eb0 Check if port 80 is free before starting during install 2020-06-05 09:55:45 +02:00
Ondřej Nový
d9b51eb2ed d/copyright: Add Thomas Ward from Ubuntu 2020-06-05 09:39:38 +02:00
Ondřej Nový
6930b5ac14 Add stream-geoip and stream-geoip2 modules 2020-06-05 09:33:44 +02:00
Ondřej Nový
8dfca737ef libnginx-mod-* now depends on nginx-<any flavour> 2020-06-04 22:33:47 +02:00
Ondřej Nový
6982ab38dd Introduce nginx-core and make it new default for "nginx"
Version of nginx identical to that of nginx-full, but without
any third-party modules, and only modules in the original nginx
code base.
2020-06-04 22:33:03 +02:00
Ondřej Nový
b39ced7d98 d/copyright: Fix wrong filename 2020-06-04 22:23:09 +02:00
Ondřej Nový
a681a84cf0 d/control: Add GeoIP2 into description 2020-06-04 20:43:40 +02:00
Ondřej Nový
a2ddfe2d0e d/ngx-conf: Convert to Python 3 2020-06-04 20:35:46 +02:00
Ondřej Nový
3edca8428c Build dynamic modules only in extras flavour 2020-06-04 20:23:32 +02:00
Ondřej Nový
478b737722 d/conf/nginx.conf: Remove trailing whitespaces 2020-06-04 11:37:49 +02:00
Ondřej Nový
9fbad86c59 d/conf/nginx.conf: Remove keepalive_timeout 65 and use default value 75s. 2020-06-04 11:37:11 +02:00
Ondřej Nový
1459087c8f d/conf/nginx.conf: Remove tcp_nodelay on, which is same as default 2020-06-04 11:36:23 +02:00
Ondřej Nový
e3540f5188 d/copyright: Update for release 2020-06-04 10:58:53 +02:00
Ondřej Surý
4851b6ec88 http-geoip2: Add ngx_http_geoip2_module 3.3
Co-authored-by: Ondřej Nový <onovy@debian.org>
2020-06-04 09:57:31 +02:00
Ondřej Nový
c6872b4f53 d/conf/nginx.conf: Enable TLSv1.3 2020-06-04 09:41:10 +02:00
Ondřej Nový
134d203c26 d/conf/sites-available/default: Update PHP path for PHP 7.4 2020-06-04 09:38:07 +02:00
Ondřej Nový
693c482e5c releasing package nginx version 1.18.0-1 2020-05-29 19:08:53 +02:00
Ondřej Nový
8838bdc5f1 Add myself as uploader 2020-05-29 19:00:50 +02:00
Ondřej Nový
ead863a42c d/copyright: Add myself for Debian part 2020-05-29 19:00:17 +02:00
Ondřej Nový
dd794d9830 Enable CI 2020-05-29 07:59:08 +02:00
Ondřej Nový
5e6d8fe10a http-fancyindex: Upgrade to 0.4.4 2020-05-28 22:50:24 +02:00
Ondřej Nový
bc6e1b3c08 nchan: Upgrade to 1.2.7 2020-05-28 22:48:18 +02:00
Ondřej Nový
6ac8972bb0 Convert d/ngxmod to Python 3 (Closes: #953025) 2020-05-28 22:38:58 +02:00
Ondřej Nový
3c7832e4c7 New upstream version. 2020-05-28 22:11:02 +02:00
Ondřej Nový
f1ae99061b d/patches/CVE-2019-20372.patch: Rebase 2020-05-28 22:04:34 +02:00
Ondřej Nový
13ba480abc Update upstream source from tag 'upstream/1.18.0'
Update to upstream version '1.18.0'
with Debian dir 0330ecd199
2020-05-28 22:03:13 +02:00
Ondřej Nový
f33d2ab408 d/watch: Change to 1.18.x 2020-05-28 22:02:54 +02:00
Ondřej Nový
b575cfe355 nchan: Upgrade to 1.2.7 2020-05-28 21:27:55 +02:00
Ondřej Nový
403f780a46 Bump standards version to 4.5.0 2020-05-28 21:15:12 +02:00
Ondřej Nový
d089e10044 Use package.maintscript instead of dpkg-maintscript-helper 2020-05-28 21:13:15 +02:00
Ondřej Nový
52a04bd90d Bump debhelper compat level to 13 2020-05-28 20:54:39 +02:00
Ondřej Nový
7f0bb450a9 d/rules/dh_installinit: Replace --no-restart-on-upgrade with --no-stop-on-upgrade 2020-05-28 20:49:21 +02:00
Ondřej Nový
12e9c91f45 Set Rules-Requires-Root: no 2020-05-28 20:41:04 +02:00
Ondřej Nový
2b4e972bd3 Replace dh_systemd_enable with dh_installsystemd 2020-05-28 20:36:23 +02:00
Ondřej Nový
3ef09c0f69 Use debhelper-compat instead of debian/compat 2020-05-28 20:32:12 +02:00
Ondřej Nový
b58e974712 Merge branch 'with-compat' into 'master'
Enable --with-compat configure option (Closes: #897926)

See merge request nginx-team/nginx!6
2020-05-28 17:59:06 +00:00
Ondřej Nový
e5f8119f92 Add REMOTE_USER fastcgi param 2020-05-28 19:56:08 +02:00
Mohamed Akram
55ef39e8e1 Enable --with-compat configure option
Closes: #897926
2020-05-11 23:00:59 +04:00
Christos Trochalakis
f6841c97e2 Release 1.16.1-3 2020-01-11 09:37:17 +02:00
Christos Trochalakis
06b6f5670e Handle CVE-2019-20372, error page request smuggling
Nginx before 1.17.7, with certain error_page configurations, allows HTTP
request smuggling, as demonstrated by the ability of an attacker to read
unauthorized web pages in environments where NGINX is being fronted by a
load balancer.
2020-01-11 09:21:48 +02:00
Christos Trochalakis
c9fc21913a Release 1.16.1-2 2019-10-12 18:02:46 +03:00
Christos Trochalakis
bfd112b793 http-lua: Downgrade to 0.10.13
This a temporary fix for the FTBFS on arches where liblua5.1-0-dev is
used instead of libluajit-5.1-dev.

The regression was introduce in 0.10.14, see:

7286812116

This reverts commit 132704ab76.

Closes: 941917
2019-10-12 17:32:32 +03:00
Christos Trochalakis
07d0cb5b71 Release 1.16.1-1 2019-09-12 10:06:38 +03:00
Christos Trochalakis
132704ab76 http-lua: Upgrade to 0.10.15 2019-09-12 10:05:31 +03:00
Christos Trochalakis
85ba845433 http-ndk: Upgrade to 0.3.1 2019-09-12 10:05:31 +03:00
Christos Trochalakis
b2a3e22c47 Drop debian CVE patches already included in 1.16.1 2019-09-12 10:05:31 +03:00
Christos Trochalakis
2a8a5799e7 Update upstream source from tag 'upstream/1.16.1'
Update to upstream version '1.16.1'
with Debian dir 1f2d7a316f
2019-09-08 10:36:18 +03:00
Christos Trochalakis
deba07f09f Follow stable 1.16 releases 2019-09-08 10:33:34 +03:00
Christos Trochalakis
71e4915c0f Release 1.14.2-3 2019-08-19 11:35:14 +03:00
Christos Trochalakis
d2bacdb1cf Handle CVE-2019-9511 CVE-2019-9513 CVE-2019-9516
Several security issues were identified in nginx HTTP/2
implementation, which might cause excessive memory consumption
and CPU usage (CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).

The issues affect nginx compiled with the ngx_http_v2_module (not
compiled by default) if the "http2" option of the "listen" directive
is used in a configuration file.

The issues affect nginx 1.9.5 - 1.17.2.
The issues are fixed in nginx 1.17.3, 1.16.1.

Thanks to Jonathan Looney from Netflix for discovering these issues.
2019-08-19 11:33:14 +03:00
Christos Trochalakis
214580d479 Add missing changelog entries
Those were forgotten during the upload, but let's add them
for completeness.
2018-12-27 14:44:09 +02:00
Christos Trochalakis
62a54a8ba6 Release 1.14.2-2 2018-12-27 13:09:44 +02:00
Christos Trochalakis
52307bcf97 Bump Standards-Version, no changes needed 2018-12-27 13:09:44 +02:00
Christos Trochalakis
76804da3f8 Use a minimal export of the upstream signing key
Exported with:
  $ gpg --finger 0x520A9993A1C052F8
  pub   rsa2048/0x520A9993A1C052F8 2011-11-27 [SC]
        Key fingerprint = B0F4 2533 73F8 F6F5 10D4  2178 520A 9993 A1C0 52F8
  uid                   [ unknown] Maxim Dounin <mdounin@mdounin.ru>
  sub   rsa2048/0x57A82F1DD345AB09 2011-11-27 [E]
  $ gpg --export --export-options export-minimal  --armor '0x520A9993A1C052F8'
2018-12-27 13:09:44 +02:00
Christos Trochalakis
ff8b896b2b http-dav-ext: Upgrade to 3.0.0
Closes: #851651
2018-12-27 12:46:53 +02:00
Christos Trochalakis
04c8606039 Merge 'origin/master' 2018-12-13 11:56:58 +02:00
Christos Trochalakis
969f3934b1 Release 1.14.2-1 2018-12-13 10:05:52 +02:00
Kartik Mistry
1f43924c71 Added Turkish translation (Closes: #915728) 2018-12-06 20:03:49 +05:30
Christos Trochalakis
3f36d553d4 Update upstream source from tag 'upstream/1.14.2'
Update to upstream version '1.14.2'
with Debian dir b1e2850d27
2018-12-04 17:22:47 +02:00
Christos Trochalakis
0b00911581 Adjust fastcgi_split_path_info snippet to handle the /example.php/ case
We switched to regexp suggest in Nginx docs found at
https://www.nginx.com/resources/wiki/start/topics/examples/phpfcgi/

Closes: #911398
2018-11-23 17:29:41 +02:00
Christos Trochalakis
df764921f3 Merge branch '913250' into 'master'
Reference PHP 7.3 (Closes: 913250)

See merge request nginx-team/nginx!2
2018-11-23 15:29:01 +00:00
Olaf van der Spek
fd3bbc2f43 Reference PHP 7.3 (Closes: 913250) 2018-11-23 13:34:13 +01:00
Christos Trochalakis
5f4d461c67 Release 1.14.1-1 2018-11-07 07:18:38 +02:00
Christos Trochalakis
4ce7282be9 Update upstream source from tag 'upstream/1.14.1'
Update to upstream version '1.14.1'
with Debian dir 484b71e227
2018-11-07 07:15:42 +02:00
Kartik Mistry
5d21039949 Fixed trailing whitespaces from changelog and removed unused lintian override 2018-09-06 16:22:26 +05:30
Christos Trochalakis
87dc3692ff Release 1.14.0-1 2018-08-31 15:28:27 +03:00
Christos Trochalakis
6d142fab1b Merge ru translations
Thanks: Lev Lamberov
Closes: #883104
2018-08-31 15:21:56 +03:00
Christos Trochalakis
e36dee7443 Order nginx after nss-lookup.target to synchronize host/network name lookups
See systemd.special(7)

Closes: #900790
2018-08-31 15:17:17 +03:00
Christos Trochalakis
bc3cf7aac7 http-fancyindex: Upgrade to 0.4.3 2018-08-31 15:15:27 +03:00
Christos Trochalakis
52cc96d9b8 http-lua: Drop our OpenSSL patch, OpenSSL 1.1 is now supported upstream 2018-08-31 15:13:46 +03:00
Christos Trochalakis
75d123cd1b http-lua: Upgrade to 0.10.13 2018-08-31 15:13:46 +03:00
Kartik Mistry
4918bc1382 Use https in copyright 2018-08-30 16:23:20 +05:30
Kartik Mistry
58f11854b6 Duplicate B-D removal and https in Homepage 2018-08-30 13:43:10 +05:30
Christos Trochalakis
7207dbf3b4 Update mailing list address to alioth-lists.d.n 2018-06-02 21:26:04 +03:00
Christos Trochalakis
94e64517a4 Update upstream source from tag 'upstream/1.14.0'
Update to upstream version '1.14.0'
with Debian dir 2a34c3654d
2018-04-23 10:53:47 +03:00
Christos Trochalakis
0091e68c20 Follow stable 1.14 series 2018-04-23 10:53:03 +03:00
Christos Trochalakis
46c038d54e Release 1.13.12-1 2018-04-11 08:19:50 +03:00
Christos Trochalakis
3ae03ddcfe Update upstream source from tag 'upstream/1.13.12'
Update to upstream version '1.13.12'
with Debian dir 2e1c135610
2018-04-11 08:18:08 +03:00
Christos Trochalakis
9120a3de9b Release 1.13.11-1 2018-04-10 15:13:22 +03:00
Christos Trochalakis
6e014f97a7 Bump Standards-Version, no changes neeeded 2018-04-10 15:13:10 +03:00
Christos Trochalakis
bb56376490 Update upstream source from tag 'upstream/1.13.11'
Update to upstream version '1.13.11'
with Debian dir 274650840d
2018-04-09 08:40:26 +03:00
Christos Trochalakis
1746e53baa Release 1.13.10-1 2018-03-21 16:16:42 +02:00
Christos Trochalakis
fdf581d046 Update upstream source from tag 'upstream/1.13.10'
Update to upstream version '1.13.10'
with Debian dir dc4405fea6
2018-03-21 16:14:40 +02:00
Christos Trochalakis
bcf5fd16c3 Release 1.13.9-1 2018-02-21 11:25:00 +02:00
Christos Trochalakis
510d68a971 Upstream version 1.13.9
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEf2SPbCEjyY+zKcgrETYmAKdH7NkFAlqMU5sACgkQETYmAKdH
 7NnrthAAq2lEeV33YOA1ZXF2A+XQPSG6yNqsd3H0aDSzPNONP0xN+zw8Wv0Y3i/J
 mW9cKMzL575dMOPJvZlhe8LVcv9vwaVB16ya5A4Zl+udg+vzou7f6m/3k6dDNJKq
 ja6cnLLawsdCrhiAuc7y/miObGboDTk4ri5ZC6UM+ZfNF3a4ce93+m2plKtxbPEe
 mFVElZUnVP6nZkxGw5mrm8Gz6059GjV98lS2+1j1I8tfbLoYJuCcX5naMOyYRr7S
 WOxlcTB5PX7MTX8Lyp8K6xo5b2C67yEgJ+KQ1mpJ1TEy03/Q/23biYAa8b2PIoOW
 7OCc8KMECu9vBzAZbL5JSP7ydoowKlsfD2nfHKhsWjR1EUT1UV9jNgVKVbwVFy+h
 ge9Lom3/UYNatQDSMjppUco9sMt53UQHD8/X4iqhTHMThFO7199JFVrT7KShK3AG
 cVZDdpsqwSYChr+1H2oL60TB99yRQsDNHAU48P2V8ePT2HxOUzHDAkCBLpssstab
 RQWZYe/UdvYMY/8LfQgS9EB0sTLiigCmrNeEEhoQcL3M57Fg/skhgeOt/Ew2yE4m
 vh/3yeAt4k5rVrk9GSXDD1hdCw4V0SdC0CFufwXrTG2E1b+Ml2ZPTtuUD/nMhwCr
 rLZ4zbYUS7RfpiG7FIgtavFDq4lpDoDVTuC7efV/PAiywwjr0Lg=
 =VXrU
 -----END PGP SIGNATURE-----

Update upstream source from tag 'upstream/1.13.8'

Update to upstream version '1.13.8'
with Debian dir d550454802
2018-02-21 11:24:45 +02:00
Christos Trochalakis
d26992910e Bump Standards-Version to 4.1.3, no changes needed 2018-02-21 11:24:18 +02:00
Christos Trochalakis
5b9f0b4827 Move packaging repository to salsa.debian.org 2018-02-21 10:39:13 +02:00
Michael Lustfield
7404f8bd77 Remove non-uploading users. 2018-02-02 20:44:42 -06:00
Christos Trochalakis
1b9fa09ac5 Release 1.13.8-1 2017-12-27 09:25:06 +02:00
Christos Trochalakis
c94e9b6bfd Update upstream source from tag 'upstream/1.13.8'
Update to upstream version '1.13.8'
with Debian dir d550454802
2017-12-27 09:21:36 +02:00
Christos Trochalakis
6f5e080ac8 Release 1.13.7-1 2017-12-14 11:12:46 +02:00
Christos Trochalakis
6648d2471a Drop the 'v' part of module versions
It just complicates things, let's try to drop it and just
use a Debian compatible version.

Gbp-Dch: Ignore
2017-12-14 11:03:38 +02:00
Christos Trochalakis
f81b4fb99a nchan: drop hiredis source code
We already build against Debian's libhiredis-dev, so there
is no need to ship its source.

Gbp-Dch: ignore
2017-12-14 11:03:38 +02:00
Christos Trochalakis
69c4661396 rtmp: Upgrade to 1.2.1
Closes: #880718
2017-12-14 11:03:38 +02:00
Christos Trochalakis
ee4b10edd7 http-fancyindex: Upgrade to 0.4.2 2017-12-14 11:03:38 +02:00
Christos Trochalakis
72b4f71671 http-dav-ext: Upgrade to 0.1.0
Closes: #878611
2017-12-14 11:03:38 +02:00
Christos Trochalakis
5fb0700fb2 http-lua: Upgrade to 0.10.11
Rebase openssl-1.1.0 patch
2017-12-14 11:03:38 +02:00
Christos Trochalakis
8acbe3fbc4 http-echo: Upgrade to 0.61
Drop build-nginx-1.11.11 patch now included upstream
2017-12-14 11:03:38 +02:00
Christos Trochalakis
33799993fc http-headers-more-filter: Upgrade to 0.33 2017-12-14 11:03:38 +02:00
Christos Trochalakis
7f899937ab Bits & pieces for ngxmod
o Drop d/m/uupdate in favor of ngxmod uupdate subcommand.
    While at it, take advantage of the canonical module
    names and drop the last argument.
  o Move unpacking & commit to uupdate subcommand, that
    way we don't to have to communicate the upstream version
    with ngxmod uscan.
  o Move around a few things, and switch to argparse.
2017-12-14 11:03:38 +02:00
Mpampis Kostas
794cca0ebf Automate modules watch & upgrade process
This patch introduces the debian/ngxmod script and some helper
files which can be used to automate the modules watch & upgrade process.

The only subcommand for now is `uscan` and can be called as:
  $ debian/ngxmod uscan

The uscan subcommand runs uscan for each nginx module listed in
the newly deb822 formatted debian/modules/control using the watchfiles
in debian/modules/watch.

If a new version is available, it will ask you if you want to upgrade.
If you agree, it will download the tarball, place it in the nginx
source's parent directory and upgrade the module's source.

After the upgrade, it will remove the files listed in the
Files-Excluded module field and finally it will commit the changes.

Closes: #869499
2017-12-14 11:01:32 +02:00
Christos Trochalakis
08d6a8fe7a debian/watch: switch to HTTPS for the upstream check
Fixes lintian `source: debian-watch-uses-insecure-uri` info.
2017-12-14 11:01:31 +02:00
Christos Trochalakis
9f10b31488 Bump Standards-Version, no changes needed 2017-12-13 11:39:58 +02:00
Christos Trochalakis
b7b97c6c79 Update upstream source from tag 'upstream/1.13.7'
Update to upstream version '1.13.7'
with Debian dir 32024b8250
2017-11-22 16:31:45 +02:00
Christos Trochalakis
08248c9d96 Release 1.13.6-2 2017-10-13 13:05:52 +03:00
Christos Trochalakis
10af9c3bef rtmp: Ship docs & examples
Closes: #878368
2017-10-13 13:05:46 +03:00
Christos Trochalakis
f056335a38 Release 1.13.6-1 2017-10-12 10:44:13 +03:00
Christos Trochalakis
bf0c6fce6e Drop dh-systemd dependency since we depend on debhelper >= 10
Fixes build-depends-on-obsolete-package in lintian.
2017-10-12 10:37:22 +03:00
Christos Trochalakis
0305fe8ea3 Bump Standards-Version, no changes needed 2017-10-12 10:37:22 +03:00
Christos Trochalakis
515a80bc0a mod: Normalize module locations
Use the package name to infer module location. This
will make it easier to script our maintaining tasks.
2017-10-12 10:37:22 +03:00
Christos Trochalakis
e71a3e89c7 Update upstream source from tag 'upstream/1.13.6'
Update to upstream version '1.13.6'
with Debian dir d7757fa61a
2017-10-11 10:33:51 +03:00
Christos Trochalakis
cacbf319db Release 1.13.5-1 2017-09-06 10:33:35 +03:00
Christos Trochalakis
1c5a8493ca Adjust rm_conffile to the new version
Gbp-Dch: Ignore
2017-09-06 10:09:50 +03:00
Christos Trochalakis
2b0dc70024 Update upstream source from tag 'upstream/1.13.5'
Update to upstream version '1.13.5'
with Debian dir 609fe7b629
2017-09-06 10:06:41 +03:00
Christos Trochalakis
3582062c0e Remove upstart configuration file
Close: #874319
2017-09-05 10:40:24 +03:00
Christos Trochalakis
3ebf96c773 doc: Improve example WordPress configuration
Closes: #863343
Thanks: Larry Holish
2017-08-29 13:06:25 +03:00
Christos Trochalakis
ee4f08f8b4 Release 1.13.4-1 2017-08-29 11:08:29 +03:00
Christos Trochalakis
9ad7cddbce Bump Standards to 4.1.0
o Switch all packages to Priority optional, extra is considered
   deprecated and should be treated as equivalent to optional.

   nginx-light & extras now inherit optional from the source package.
2017-08-29 11:05:37 +03:00
Christos Trochalakis
22aae23648 Drop Upstart configuration
Upstart was removed in Debian stretch
2017-08-29 11:05:37 +03:00
Christos Trochalakis
2005e7e35d Explicitly disable autoreconf (debhelper 10)
Since debhelper 10 systemd & autoreconf are enabled by default, we need
systemd and not autoconf so we reverse the logic.

While at it, drop not needed autotools dependency.
2017-08-29 11:05:37 +03:00
Christos Trochalakis
e60711fcc7 tests: Fix race between reload and curl's http request
Restart nginx to make sure it uses the new configuration.
2017-08-29 11:05:37 +03:00
Christos Trochalakis
7614ff61a9 lua: Drop patch to build against nginx 1.11.11, now included upstream 2017-08-29 11:05:37 +03:00
Christos Trochalakis
70cb0befe7 Update OpenSSL 1.1 patch for v0.10.10 2017-08-28 15:52:36 +03:00
Christos Trochalakis
75a3ff5eaa Update nginx-lua to v0.10.10
Fixes an issue with LuaJIT v2.1, luaL_getn() is no longer available.
2017-08-28 15:52:36 +03:00
Christos Trochalakis
2a34dcb90f Discover LuaJIT 2.1 (FTBFS)
Closes: #873319
2017-08-28 15:52:36 +03:00
Christos Trochalakis
ef8a520c38 Add a simple lua autopkgtest 2017-08-28 15:52:36 +03:00
Christos Trochalakis
a17bcc8bee Updated version 1.13.4 from 'upstream/1.13.4'
with Debian dir 61a5e4fd4e
2017-08-09 09:05:31 +03:00
Christos Trochalakis
95f7f656da Release 1.13.3-1 2017-07-12 11:44:48 +03:00
Christos Trochalakis
4ec25acef1 Updated version 1.13.3 from 'upstream/1.13.3'
with Debian dir 77588cf436
2017-07-12 08:12:29 +03:00
Christos Trochalakis
ab3dccab6a Drop gzip_disable "msie6" directive.
IE6 is really deprecated nowdays. Also, this only affected earlier IE6
versions that was later patched to fix this issue.

Closes: #867024
2017-07-07 13:01:25 +03:00
Christos Trochalakis
5ccd94c7e9 Release 1.13.2-1 2017-07-04 14:46:29 +03:00
Christos Trochalakis
f4979c7c96 Switch the copyright-format URL to https
Complements the debian-policy bump to 4.0.0 (22fe275)

Gbp-Dch: Ignore
2017-07-04 14:46:22 +03:00
Christos Trochalakis
d546f527ee Fix nginx-cache-purge segfaults
The module copies verbatim the ngx_http_proxy_loc_conf_t struct, but the
`method` member has changed since Nginx 1.11.6.

Closes: #866750
2017-07-03 13:45:48 +03:00
Nicolas Dandrimont
1dc67ccb2a Introduce libnginx-mod-rtmp third party module
We choose not to include rtmp in nginx-extras for now.

Minor changes by Chistos Trochalakis

Closes: #843777
2017-07-03 13:45:23 +03:00
Christos Trochalakis
22fe275a65 Bump Standards to to 4.0.0 2017-06-29 10:42:50 +03:00
Christos Trochalakis
499c942816 Merge pt translations
Thanks: Rui Branco
Closes: #858741
2017-06-29 10:42:50 +03:00
Christos Trochalakis
accf9ea733 Merge es translations
Thanks: Jonathan Bustillos
Closes: #855610
2017-06-29 10:42:50 +03:00
Christos Trochalakis
57a32c6bb8 Merge ca translations
Thanks: Alytidae
Closes: #865996
2017-06-29 10:42:46 +03:00
Christos Trochalakis
c7803ecc60 Updated version 1.13.2 from 'upstream/1.13.2'
with Debian dir f17adbdfe2
2017-06-28 11:05:52 +03:00
Christos Trochalakis
1084313b41 Release 1.13.1-2 2017-06-20 14:17:25 +03:00
Christos Trochalakis
05b6bb9e3b Release 1.13.1-1 2017-05-31 11:42:21 +03:00
Christos Trochalakis
ad6afaad13 Updated version 1.13.1 from 'upstream/1.13.1'
with Debian dir 26c0a4cf1a
2017-05-31 11:40:56 +03:00
Christos Trochalakis
6687faf49f Release 1.13.0-1 2017-05-10 11:40:52 +03:00
Christos Trochalakis
2e8c50ec9d New upstream version 2017-05-05 13:12:10 +03:00
Christos Trochalakis
9086149414 Merge branch 'upstream' (1.13.0) 2017-05-05 13:11:56 +03:00
Christos Trochalakis
0c4e8a2f2b Follow nginx mainline (1.13.x)
Now that stretch is about to be released, we can directly target 1.13
that will be released in about a year as 1.14.
2017-05-05 13:00:00 +03:00
Christos Trochalakis
22970aea4d Release 1.12.0-1 2017-05-05 11:58:13 +03:00
Christos Trochalakis
7d61d72df8 Adapt gbp.conf for the master branch
Dbp-Dch: Ignore
2017-05-05 11:57:32 +03:00
Christos Trochalakis
6bd87a78b4 Prepare 1.12.0-1 2017-05-02 10:01:29 +03:00
Christos Trochalakis
d21bb9f252 Switch to debhelper 10
No changes needed.
2017-05-02 10:00:39 +03:00
Christos Trochalakis
f4299b95f4 Enable SSL Preread builtin module on nginx-full & nginx-extras
Closes: #854214
2017-05-02 10:00:36 +03:00
Christos Trochalakis
774ecad972 Patch nginx-echo to build against nginx 1.11.11 2017-05-02 10:00:36 +03:00
Christos Trochalakis
0421dc9335 Patch nginx-lua to build against nginx 1.11.11 2017-05-02 10:00:36 +03:00
Christos Trochalakis
36c7658ba2 Patch nginx-upstream-fair to build against nginx >1.11.6 2017-05-02 10:00:33 +03:00
Christos Trochalakis
e1c2b349a0 Drop curve list patch, is is included upstream 2017-05-02 10:00:30 +03:00
Christos Trochalakis
16f4fb2b88 Drop perl build flags patch, it is now handled upstream 2017-05-02 10:00:28 +03:00
Christos Trochalakis
c3a656b1a6 Drop --with-ipv6 flag, IPv6 support is enabled automatically 2017-05-02 10:00:25 +03:00
Christos Trochalakis
96fee62e28 Updated version 1.12.0 from 'upstream/1.12.0'
with Debian dir 59e0433c03
2017-05-02 09:55:54 +03:00
Christos Trochalakis
4a6feaae54 Follow stable 1.12 releases
This is a temporary state to help Ubuntu follow the 1.12 release cycle.
Debian will skip 1.12 and jump straight to 1.13 (future 1.14) for buster.
2017-05-02 09:51:58 +03:00
Christos Trochalakis
752aa1cbf7 Merge branch 'stretch' into master 2017-04-25 11:04:01 +03:00
Christos Trochalakis
a418797080 Reuse the same build flags for the perl module
Using the same flags broke the build since -shared was not positioned
after pie/pic flags. Changing the perl LDDFLAGS patch and moving
Config{lddflags} to the end solved that issue.

As a general note, the injected -fPIC in debian/rules is not needed
since dpkg 1.18.13. We inject -fPIC so that it overrides previous -PIE
flag, but the latest dpkg automatically strips pie flags when building
shared libraries (man dpkg-buildflags).

We temporary keep the -fPIC injection for wheezy/jessie backports and
downstream Ubuntu builds.
2017-04-25 10:40:55 +03:00
Christos Trochalakis
84d1abef83 Reenable ipv6, was accidentally dropped in the last commit
Dbp-Dch: Ignore
2017-04-25 10:25:48 +03:00
Christos Trochalakis
0868325b3a Release 1.10.3-1 2017-02-15 11:01:39 +02:00
Christos Trochalakis
d92573efb6 Move Vcs repo under pkg-nginx 2017-02-15 10:00:10 +02:00
Christos Trochalakis
e1f1837732 Merge tag 'upstream/1.10.3' into stretch
Upstream version 1.10.3
2017-02-15 09:59:56 +02:00
Michael Lustfield
f4307ddb14 Configure build flags to work with other arches and downstreams. 2017-02-12 00:11:20 -06:00
Christos Trochalakis
df46fe3e59 Release 1.10.2-4 2017-01-22 12:50:54 +02:00
Christos Trochalakis
db5edb9e3c Enable modules after a remove -> install cycle
Previously a module that was removed (not purged) and then reinstalled
did not enable itself causing some confusion. Now, we maintain state by
moving the module symlink to .removed on package removal.

If the package is reinstalled the link is restored, if purged the link
is completely dropped.
2017-01-22 12:50:54 +02:00
Christos Trochalakis
12b7091e96 Switch module reloading logic to dpkg triggers
Fixes issues during upgrades from non dynamic nginx versions (jessie).

When multiple modules are installed together for the first time,
nginx reload might fail because, at that time, the configuration
might reference directives provided by module packages that are
not yet configured.

There are also other cases where the instant reload might break,
using triggers seems like the correct way to proceed.
2017-01-22 12:50:54 +02:00
Christos Trochalakis
a9504afcbe Move module patches to debian/modules/patches
Everything under debian/patches has a special meaning in various tools
like gbp-pq.
2017-01-22 12:50:54 +02:00
Christos Trochalakis
cabaec36db d/control: Rename LUA to Lua
Fixes lintian capitalization-error-in-description-synopsis.

Gbp-Dch: Ignore
2017-01-21 22:57:23 +02:00
Christos Trochalakis
72cbf89d57 Drop lua reference from libnginx-mod-http-ndk description
Gbp-Dch: Ignore
2017-01-21 22:57:23 +02:00
Christos Trochalakis
6672c479d6 Add a NEWS entry regarding dynamic modules 2017-01-21 22:41:52 +02:00
Christos Trochalakis
110e1a49c2 Add some tests for X25519 EC
Gbp-Dch: Ignore
2017-01-11 15:16:32 +02:00
Christos Trochalakis
23e4b6d076 Backport curve list support from 1.11.x mainline
As a side-effect we move away from EC_KEY* OpenSSL API
in favor of `SSL_CTX_set1_curves_list()` which supports
X25519.

Also, the default curve changed from prime256v1, to the
OpenSSL defaults (currently X25519).

See also:
https://mta.openssl.org/pipermail/openssl-dev/2016-October/008582.html

Closes: #846085
2017-01-11 15:16:32 +02:00
Christos Trochalakis
1d0e6f6d38 Merge da translation
Thanks: Joe Dalton
Closes: #850857
2017-01-11 11:46:22 +02:00
Christos Trochalakis
ead0bdc4f3 Merge pt_BR translation
Thanks: Adriano Rafael Gomes
Closes: #846522
2017-01-11 11:46:22 +02:00
Christos Trochalakis
4dacd5cfa0 Merge nl translation
Thanks: Frans Spiesschaert
Closes: #845693
2017-01-11 11:46:21 +02:00
Christos Trochalakis
58a0ed368a Merge fr translation
Thanks: Julien Patriarca
Closes: #844712
2017-01-11 11:46:21 +02:00
Christos Trochalakis
006a1d393f Merge de translation
Thanks: Chris Leick
Closes: #843770
2017-01-11 11:46:00 +02:00
Christos Trochalakis
34f973d82f Release 1.10.2-3 2016-12-24 12:12:51 +02:00
Christos Trochalakis
c9d02dd9d6 mod: Upgrade development kit to 0.3.0 2016-12-24 12:09:17 +02:00
Christos Trochalakis
e5ea352290 mod: Upgrade headers-mode to 0.32 2016-12-24 12:09:17 +02:00
Christos Trochalakis
e8f81d1ad0 mod: Check if nginx binary exists before reloading
Since the modules don't depend on nginx binary packages
yet, there are some edge cases that /run/nginx.pid is not empty
and /usr/sbin/nginx doesn't exist.
2016-12-24 12:09:14 +02:00
Christos Trochalakis
add52334d1 Reactivate PIE
Thanks: Markus Waldeck for the suggestion
2016-12-24 12:09:12 +02:00
Christos Trochalakis
07702e95f9 Update nginx-lua OpenSSL 1.1.0 patch 2016-12-24 12:09:10 +02:00
Christos Trochalakis
6cbf84df65 mod: Upgrade nginx-lua to 0.10.7 2016-12-24 12:08:34 +02:00
Christos Trochalakis
5140bc7eae mod: Upgrade nchan to 1.0.8
Closes: #844473
2016-12-24 12:08:32 +02:00
Christos Trochalakis
a27ccda836 Fix lintian error 'possible-missing-colon-in-closes'
Gbp-Dch: Ignore
2016-12-19 17:03:57 +02:00
Michael Lustfield
4deb3d7f52 Correcting location of default php-fpm socket. 2016-12-03 07:58:19 +00:00
Christos Trochalakis
bf78540e31 debian/rules: Correctly clean patched modules
Closes: #844506
Thanks: Sven-Haegar Koch for the initial patch.
2016-12-01 09:29:47 +02:00
Christos Trochalakis
e7164cf7ac Change my email 2016-11-21 16:21:24 +02:00
Christos Trochalakis
7c03e6673b Adjust experimental flow
We now dummy merge (-s ours) upstream into upstream-1.11 instead
of force pushing a clean branch on every release.

That way we can easier track the branch's history.
2016-11-18 17:26:38 +02:00
Christos Trochalakis
6c9b75da5f Release 1.10.2-2 2016-11-12 09:18:26 +02:00
Christos Trochalakis
424f50a53b Fix FTBFS for OpenSSL 1.1.0 2016-11-03 16:50:33 +02:00
Christos Trochalakis
0ec83a636e lua: Apply OpenSSL 1.1.0 FTBFS
https://github.com/openresty/lua-nginx-module/pull/761
2016-11-03 15:16:57 +02:00
Christos Trochalakis
2a4f371793 upstream-fair: Apply OpenSSL 1.1.0 FTBFS
https://github.com/gnosek/nginx-upstream-fair/pull/22
2016-11-03 15:07:10 +02:00
Christos Trochalakis
340b30f10c Rethink module patches logic
Collect all patches under debian/patches/modules so they can be
easily tracked and apply them before configure.
2016-11-03 14:57:35 +02:00
Christos Trochalakis
62276a745b mod: Convert dav-ext to dynamic module
Patch by Florian Kinder
2016-11-03 14:57:35 +02:00
Michael Lustfield
4cf05a14a9 Removing php major version number from comment 2016-10-29 20:48:02 +00:00
Christos Trochalakis
7f827f420a Release 1.10.2-1 2016-10-29 08:45:31 +03:00
Christos Trochalakis
333595dc83 CVE-2016-1247: Secure log file handling
Backporting patches from 1.6.2-5+deb8u{3,4} and adjusting
the compare-versions check to 1.10.2-1~.
2016-10-28 09:45:29 +03:00
Christos Trochalakis
37b847285a Revert "Adding support for packaged application configurations."
This reverts commit 5d09382c82.

We will include it in a later release (-2) and perhaps adjust
the paths involved.
2016-10-28 09:31:11 +03:00
Christos Trochalakis
1e6e4c88cf Drop unused lintian overrides (spelling-error-in-binary) 2016-10-20 10:00:17 +03:00
Christos Trochalakis
6a025de47d New upstream release 2016-10-20 09:49:53 +03:00
Christos Trochalakis
e7c46faef5 Merge tag 'upstream/1.10.2'
Upstream version 1.10.2
2016-10-20 09:48:28 +03:00
Christos Trochalakis
8bf94db95d Follow the 1.10.x stable branch 2016-10-20 09:47:41 +03:00
Michael Lustfield
5d09382c82 Adding support for packaged application configurations. 2016-10-19 06:56:25 +00:00
Michael Lustfield
8c5b5c4f67 More documentation updates. 2016-10-19 06:49:34 +00:00
Michael Lustfield
7bfa979832 Updated PHP sample configuration block. #841230 2016-10-19 04:36:34 +00:00
Christos Trochalakis
d045f9b328 Strict version depend on lsb-base version >= 3.0-6
Fixes lintian error init.d-script-needs-depends-on-lsb-base
that strict checks the version.
2016-10-11 10:01:36 +03:00
Christos Trochalakis
5692397ea1 debian/control: Reference nginx-extras in nginx meta-package 2016-10-04 19:52:52 +03:00
Christos Trochalakis
255d6d4e4a Release 1.10.1-3 2016-09-15 15:21:11 +03:00
Christos Trochalakis
725adf41f2 Switch Maintainer to the Debian Nginx Maintainers list
Keep all active maintainers as Uploaders.
2016-09-14 10:52:23 +03:00
Christos Trochalakis
b624187e45 Fix lsb-base deps
o nginx-doc doesn't need lsb-base.
 o relax nginx-common dependency, any recent version should work.
2016-09-14 10:50:07 +03:00
Christos Trochalakis
0570da941e Remove relic Breaks/Replaces used for squeeze upgrades 2016-09-14 10:49:11 +03:00
Christos Trochalakis
8b6e35fe35 Drop nginx-*-dbg packages
Switch to autogenerated -dbgsym packages.
2016-09-14 10:48:31 +03:00
Christos Trochalakis
3f6df9e706 Release 1.10.1-2 2016-09-06 11:08:05 +03:00
Christos Trochalakis
22afcae671 Merge branch 'dyn2' 2016-09-06 11:06:11 +03:00
Christos Trochalakis
3953784152 wrap-and-sort 2016-09-06 11:05:26 +03:00
Christos Trochalakis
14e6282c9b Update d/changelog 2016-09-06 11:05:26 +03:00
Christos Trochalakis
3381e6e548 mod: Convert substitution module to dynamic 2016-09-06 11:05:26 +03:00
Christos Trochalakis
577178cdff mod: Convert upload progress module to dynamic 2016-09-06 11:05:24 +03:00
Christos Trochalakis
4dd8c07889 Upgrade upload-progress module to v0.9.2 2016-09-06 11:05:00 +03:00
Christos Trochalakis
cf3d323bd5 mod: Convert fancyindex to a dynamic module 2016-09-06 11:05:00 +03:00
Christos Trochalakis
d6c9309b3b Upgrade fancyindex to v0.4.1 2016-09-06 11:05:00 +03:00
Christos Trochalakis
acf0e3123d Enable SCGI & uWSGI module for nginx-light
Other proxy modules like FastCGI & Proxy were already enabled, but the
true reason for this change is that libnginx-http-cache-purge depends on
those modules being enable.

It makes things much easier if all our modules are installable along
with all possible nginx binaries. After all, this is transient until
we move to a single nginx-binary package that ships /usr/bin/nginx.
2016-09-06 11:05:00 +03:00
Christos Trochalakis
ffa01fb473 mod: Convert http-cache to a dynamic module 2016-09-06 11:05:00 +03:00
Christos Trochalakis
f2b7f2cbcc mod: Convert headers-more to a dynamic module 2016-09-06 11:04:55 +03:00
Christos Trochalakis
543f230b18 Upgrade headers-more to v0.31 2016-09-06 11:03:34 +03:00
Christos Trochalakis
d0712299ce mod: Convert upstream-fair to dynamic module 2016-09-06 11:03:09 +03:00
Christos Trochalakis
155f1a5b11 mod: Convert http-echo to a dynamic module 2016-09-06 11:03:07 +03:00
Christos Trochalakis
60e563b366 Upgrade nginx-echo to v0.60 2016-08-31 16:20:06 +03:00
Christos Trochalakis
580a98d123 Wrap tests/control 2016-08-31 16:20:06 +03:00
Christos Trochalakis
18532f376a mod: Convert nchan to a dynamic module 2016-08-31 16:20:06 +03:00
Christos Trochalakis
b04fb6c678 Replace http-push module with nchan v1.0.2 by the same author 2016-08-31 16:20:00 +03:00
Christos Trochalakis
6cdcbed1f9 mod: Upgrade nginx-lua to v0.10.6 2016-08-26 13:15:54 +03:00
Christos Trochalakis
c06d35b103 Enable slice module on all flavors 2016-08-26 12:40:48 +03:00
Christos Trochalakis
561cc60519 Add pointers to track modules not yet ready for migration 2016-08-01 10:38:39 +03:00
Christos Trochalakis
0f2905a7e0 mod: Upgrade nginx-lua to v0.10.5 2016-07-29 16:31:20 +03:00
Christos Trochalakis
1445c1403c *.postinst: Make sure we restart nginx if on-the-fly upgrade fails
Complements Mike's 1b3fa883.
2016-07-29 16:19:07 +03:00
Michael Lustfield
1b3fa883bb Make nginx-*.postinst use invoke-rc.d. 2016-07-16 19:14:08 -07:00
Michael Lustfield
a4f9f837e7 Implemented patch in bug 826061. 2016-07-16 17:30:40 -07:00
Christos Trochalakis
15695dee6e Re-enable experimental flow for 1.11.x 2016-07-07 11:27:53 +03:00
Christos Trochalakis
60cdfb2069 Only build against liblua5.1-0-dev when libluajit is not available 2016-06-07 10:53:40 +03:00
Christos Trochalakis
52025f4a8e Release 1.10.1-1 2016-05-31 22:33:27 +03:00
Christos Trochalakis
c065c08b05 Upstream version 1.10.1
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJXTd4FAAoJEBE2JgCnR+zZLdoQANtAapbxiXgp1gn+OAHv5Hwf
 auoegRz8ldypbBLjNwZPud5jzCLyiRVNYfK53nca4cU+4bJpFQIRi1IZuvHwoWTX
 2OUZnd1ooPVyE28N8bGQ8G/+wJsuIcRtsF45odNy26auohiIqqMasECm5GvyU4IV
 KTa8CY+nBxRLF+enRNyxSHAj1RW10H55NTYtHeRGJfIxCYo711DBVshEfBSCyP2X
 O8HDPdSVykUblIGARcjnmBUGbgUaVM/aGY7vc3egCRkwG+dF/DY5BQ5W3yWcYA6f
 3bGudFRqVRkG3PiC3ok/dHeSJV5HbCCCESk/TMJXpUs0K1Pmzx+nJ32q93y3pZo6
 mEKKChjl56xUKDht8efWNWUFOEqpSow4EsYo6X87u61xEtEy4CJ1LlsRs4h6Tvlm
 2WNod5hZZoXi8ldKVDhvS8tMcaJD70ZrKq6szxQ4s4Z8obHSwpEs3OMU4hCnQnDH
 Ub/ADqLppn7n13PqjSyNgGHOmT37K1BMtFUMaiIv92Oc76zsU0DAScve9XkF63Fl
 FVJNmoGSaTt3uux2G+qtPKsgpZ8CwOoONM01PfA39R7VuZPGKYfPO0l6OJ1jQ8y2
 +TyQ62hQe8qv9hkMJFA6vCwFTSWlXbhVg9OKSxDz0idskf0Mve2G31H3dWvFBByz
 G57ugsRFOzJbDAh7xJLx
 =RM4o
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.10.1'

Upstream version 1.10.1
2016-05-31 22:00:54 +03:00
Christos Trochalakis
a1e2085dd7 Correctly add changelog entry to 1.10.0-2 2016-05-31 22:00:26 +03:00
Christos Trochalakis
7ffd2fc6a9 Generate dbgsym packages only if dh_strip supports it
Makes backporting easier.
2016-05-31 16:09:41 +03:00
Christos Trochalakis
00cd95bfc1 Release 1.10.0-1 2016-04-29 10:31:53 +03:00
Christos Trochalakis
6706bbedf8 New upstream release 2016-04-29 10:31:44 +03:00
Christos Trochalakis
cc24767c99 Upstream version 1.10.0
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJXIw2aAAoJEBE2JgCnR+zZTowP/1bN39MTbUJxpXk6Ys1O7uT6
 xG1Rv/g8zcgNFndo8Kzd87KslGzgiFU5wAEcrbBAGdsgME/1hSITVU919Vv1o31r
 czWOojyURqOdztCp3b6UcJbMs/NOUIbKNzQzRyn69Wg2wijjM1wsuAAcQ4a0304V
 U2ZilDTxJ/rsXNojMbzv/W9M5pTeu24Bf/yHkcbSHC0WY3DSRWQ635LZzHQ8wXys
 xnJyZYVinxdFSBr7KoPMt8CqyLduxTZKJ7+TpWigJEOD8zaNm6aau1SAc15YLqx4
 DhXe9HvzY+VA6/uX9/as2b81Mf78iny38GeCZwV5kModMoAvcb6FagrDZQDpZCar
 75HpdF4uZHhuk8pa1F067I7ECquuhIrwQS10k6oW89Z8R73PUXg2mfESQnEGhYOm
 mKYCLkpFqjHcDpWflL8ueTfKP0uIK8jEeE7H83gazD7EsCZzbSh2NmB+7DsPdTvH
 tEos7Qa2DVpyFqh8btbs9/3b/GaU1/nO5lgaaVm6z4W4hRc7h4uxLxdwM25Jt3U1
 cWBVNx+bobFHOH4m5aC09xEoHdPYRRvevQeB9kkJc7lSE+Qg+6uKnoX36CxC4xQQ
 J9v/UEJq1NqDkVUI4e2vB/aKLz2U+volohjk+OMUJZt9Qp6S6qkB3xOeds/4R9s6
 Bi9AbCd6XcFFwequEJuv
 =Zz3v
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.10.0'

Upstream version 1.10.0

# gpg: Signature made Fri 29 Apr 2016 10:30:34 AM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2016-04-29 10:30:40 +03:00
Christos Trochalakis
a66bea579b Release 1.9.14-2 2016-04-28 10:01:23 +03:00
Christos Trochalakis
c46cc7556b libnginx-mod-http-perl: Override wrong-section-according-to-package-name warning 2016-04-28 10:01:23 +03:00
Christos Trochalakis
664bdf48f4 Bump standards to 3.9.8 2016-04-28 10:01:23 +03:00
Christos Trochalakis
58105135c4 Fix upgrading nginx-extras from a non-dynamic version
libnginx-mod-http-perl ships a common file with nginx-extras,
adding a Replaces header fixes that.

Note that the is no need to add a Breaks header since these
packages are not co-installable (they explicitly depend on
a different nginx-common version).
2016-04-27 16:37:15 +03:00
Christos Trochalakis
8b10bd4f01 Release 1.9.14-1 2016-04-19 12:27:53 +03:00
Christos Trochalakis
cfc16224c0 Fix changelog typo 2016-04-19 12:27:53 +03:00
Christos Trochalakis
ee4d3780e4 Upstream version 1.9.14
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJXFK/SAAoJEBE2JgCnR+zZi2YP/09C7XHBmSenwKxKYWOBxVud
 vjG4TRmxTeXj5ZjgbtVM0VaYGWzJ6CyxWDOfhrHup06iiqGKdLM7pdm0QGaOA/Uc
 jDrtAzOf/DV+Ol/g+Ve7HCpmdDMAqzaNMlsCDsOR2s/8RhPBnjZnwwBgS4IBCdHF
 grtBvoml6+4RRiA371cqTo8rkAOjyrBxjcciYJS/YOIyi8Yqzh5CAwmDgrnbqTLV
 zGkT/uoRzr6uvoz4xV8KwZy/3i74tRQdJtee3xWNlppL/hqp3wL3FZtcKgzSjI6F
 F8Fp8jU4llKn5bHMtAU80/TF0rpzPUrCvUibSODXHHvPBwqnnstE8sZXU2jh2aB7
 YsFP1MDUhbEpQToFV5gdUuPLE7PaqkObYod2OK1UNpJLhn21jTjb1sBgVUddT3bm
 PhfeefFSNzGfahKHlkdNpt0E+dPp94h6Tq+SbpTlkUK5gODLADA0S9XFCiPnAgfK
 LEXaffIClKs3OHnB/bMCjFXL/s3mcviG3M4LWhYDgMYj5GpWUtMl2FtKVqqpfvQp
 ZWM0ZXWpZap44FE+GzM1VCFi9JhiF1ukLlg1tSzG9MvpDbjddsaALhfj/6VipuGk
 aoEhRDhTHKP2jigzdXPJtxrobNzH/ZYnOs9KTCb5oAJNaFMypsu0rW/EKAkqPMcq
 a6s6ZIw3nP9n7U/MESwT
 =rVBz
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.14' into dyn

Upstream version 1.9.14
2016-04-18 13:00:49 +03:00
Christos Trochalakis
578f222e92 README.packaging: Add a note about dynamic module support. 2016-04-18 12:48:25 +03:00
Christos Trochalakis
65f92dd626 merge into dh_nginx 2016-04-18 12:48:25 +03:00
Christos Trochalakis
fef2251ae9 NDK is a dependency, load it before nginx-lua 2016-04-18 11:47:37 +03:00
Christos Trochalakis
57e63bc6d8 dh_nginx: Support setting module priorities in .nginx files 2016-04-18 11:47:37 +03:00
Christos Trochalakis
481751859a Introduce libnginx-mod-http-ndk module 2016-04-18 11:47:37 +03:00
Christos Trochalakis
30eb818ca4 Update nginx-development-kit module to 0.3.0rc1 (dynamic module) 2016-04-18 11:47:37 +03:00
Christos Trochalakis
9551b6324b Update nginx-auth-pam module to 1.5.1
Fixes linking issue with the dynamic module.
2016-04-18 11:47:37 +03:00
Christos Trochalakis
ddb8028502 Convert tests to scripts 2016-04-18 11:47:37 +03:00
Christos Trochalakis
f6a3b87f15 Test all modules in all flavors 2016-04-18 11:47:37 +03:00
Christos Trochalakis
832524e25e Mark nginx-common & nginx-doc as 'Multi-Arch: foreign' (Closes: #812484) 2016-04-18 11:47:37 +03:00
Christos Trochalakis
166eb74113 We accidentally closed a wishlist bug with the nginx-light enhancements 2016-04-18 11:47:37 +03:00
Christos Trochalakis
d5ba950907 Perl module ifdefs for SSI so it cannot be loaded across builds.
nginx-light is the only flavor that doesn't include SSI so we
are including it there.

Also, we switch the nginx-light module test to use
libnginx-mod-http-perl, that way it's more likely to fail.
2016-03-31 09:34:35 +03:00
Christos Trochalakis
6d20e665d3 Introduce libnginx-mod-http-perl 2016-03-31 09:34:35 +03:00
Christos Trochalakis
a12faa39a5 build modules using nginx-extras 2016-03-31 09:34:35 +03:00
Christos Trochalakis
e7ea50abbd Update LUA module and introduce libnginx-mod-http-lua 2016-03-31 09:34:34 +03:00
Christos Trochalakis
5d3e5e8fcb Update auth-pam module and introduce libnginx-mod-http-auth-pam 2016-03-31 09:33:38 +03:00
Christos Trochalakis
dfa3b2f2df New upstream release (1.9.13) 2016-03-30 11:28:10 +03:00
Christos Trochalakis
6baf817539 Upstream version 1.9.13
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJW+43ZAAoJEBE2JgCnR+zZvIEQAIOHrQNHpBRsUPvjoKZE+2V4
 28vh3qtl+wZhWV/7tcupwWj8u1AVc5tL2gas1+9RIC2FFuhEIIAJ9bluphb9g5H/
 s0FaTFH3LdHyaqSnq2eV+VzwQ/q4MTr5J66obi/wXnKRjqdPRfjlgUWY3zwmTzwM
 zCEPmLvCppyUpuRzj3mQMJuAyl/hwhF5ETadgRac8KECNcw8p0MpVfcEznaHCWZ3
 +9CdtyrY1bvttMWGglPSqPrxxL8eXjEX/9bBHWa4MqaBpkwXfNiT5DZkwAOvL7V1
 iG1VCAinvvdH/y2If/ssI+0tIfk5kfthYdnpZlcU/dy1XUY8vDeHBsBUs58UODuQ
 Az3asH9KHejZ85iFaYYPNID55LPGTbCGgL7oDG4AJr0ZNGJtZTb21yznXFBxNapD
 rCmHdXvPbS2b+mtHA4M19eXht6CgsxoFSYu71Idy6lHQFKFVpuuDncvRxKFo+fA9
 E5mbLMX/wYZS/7N9OVWT+n1aAv2+ufVhNxCUNYc3InnDhMifxhJgdt/kSdV591N4
 ZpxW2z4t7Uss40BVfOADJ1EqrNPZJPHa+ya0MfXD/J6raq+bk0npnsvJs2XCYojo
 VAwBWz8462Eo4/uLKZbjWPN4KryhMmsmuvx1Bwo0LEwBZrQ9bo8wxNAgxs+9i+Ad
 tVN2yE9B0weHDUWtWMnn
 =kunS
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.13' into dyn

Upstream version 1.9.13

# gpg: Signature made Wed 30 Mar 2016 11:27:05 AM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2016-03-30 11:27:05 +03:00
Christos Trochalakis
830a8fbc34 Sum up changes 2016-03-30 11:19:07 +03:00
Christos Trochalakis
bba86a8f89 tests: Test if nginx-light can successfully load dynamic modules 2016-03-30 11:19:07 +03:00
Christos Trochalakis
24ba8b51ef Make sure signature stays the same in all nginx builds
When a dyn module is loaded the signature of the module is compared to
the one of the nginx binary.

dyn modules are build from nginx-full, so in order to make them loadable
in other flavors we need to make sure all the binaries share the same
signature.

The signature is a vector computed from 33+3 parameters (src/core/ngx_module.h)
With this commit we align all nginx flavors to same signature vector.
2016-03-30 11:19:07 +03:00
Christos Trochalakis
d19e7548ee Build libnginx-mod-* packages 2016-03-30 10:03:46 +03:00
Christos Trochalakis
b231ba8f39 dh_nginx: Modules depend on nginx-common for now
We will change that to nginx-binary when it's available.
2016-03-30 10:03:46 +03:00
Christos Trochalakis
916384bde3 Setup libnginx-mod packaging flow
We introduce a dh_nginx helper script. For now dh_nginx
will only be used in the nginx source but when are confident
about it will ship it in a nginx-dev package.
2016-03-30 10:03:46 +03:00
Christos Trochalakis
7a5fa94b9d Setup modules-{enabled,available} directories
Modules have to be declared with top-level includes
2016-03-29 17:11:19 +03:00
Christos Trochalakis
44b30c100a Disable PIE hardening flags for now, it breaks dynamic libraries 2016-03-29 17:11:19 +03:00
Christos Trochalakis
a50cd439eb Add documentation option to systemd unit
Fixes systemd-service-file-missing-documentation-key lintian check.
2016-03-29 17:11:19 +03:00
Christos Trochalakis
7b00376f31 Bump Standards-Version to 3.9.7.0 (no changes needed) 2016-03-29 17:11:19 +03:00
Christos Trochalakis
fd1a40a6f8 Update Vcs field with secure links
Fixes vcs-field-uses-insecure-uri

https://lintian.debian.org/tags/vcs-field-uses-insecure-uri.html
2016-02-12 17:28:50 +02:00
Christos Trochalakis
3c7520fadd Update nginx-lua module to v0.10.1rc0-5-g01727a3
Fixes building issues with nginx 1.9.11.
2016-02-12 12:37:52 +02:00
Christos Trochalakis
586dea9358 New upstream release (1.9.11) 2016-02-11 15:07:08 +02:00
Christos Trochalakis
29fb5d54c5 Upstream version 1.9.11
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJWvIdIAAoJEBE2JgCnR+zZEmoQAK5dQITjmwBhBVsfNM7lRsMC
 nuBOIqgXjyc6FVwSnPUlnPC2SDc7A5OV4w6+L6ixUfX0YUBEJVe1yf4osm5LB655
 7goJS817WZXLQhWL66porg7NyS2UjoO1Zkyhuvul13vqG3BOzDj1GOXDWpwzJS0Y
 2+M7q5t5hwpeaRtny7uQrYkCKI08jqFe4go6ZyXxtcOqaT6rs7bumBDX+zE682PB
 LL/UFcgfzYh+Dt4K+MjSsGS6Fn+9ibgLrpfuq7U+RwjQmSqYbeQVzhhcME68S0sV
 Jpp3tem5/RJZWYxPX4bVo+MhVmz4yISClAOh9cfmAv2Da6XXuS6MKNA+4cb3+uub
 eec15yZC4jaJGhsftelo5IGjSX4G7HuaZpKEIXCY5aYmxPAqgDs7XZmZ1eieuJ7q
 FV+MYtz91bMywmSO4Q5lXcWi8kF8mxDMe4BNUPCCfxcK73EmSbxdl9ekhDNKllho
 Zbe+HfqZLgDIzuzupRQIcA5RV3JiLJZwsezehRgIUHoqeN6Qrq2z8HNQkr53rVFg
 pjMrnHH/tcjtrB0HAErKzh2SW5PC/BhkZFtQ77RUrGHcLij5k/cpUcRd9wn32cRB
 VNIjZINAxkUo38LwjY0XBLV/6PFw7DlAZQMU9Tf3MqGOyiE8TnqWJxNv0dcuAk+N
 VkAGTHB506Byu5ipcMti
 =v+DG
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.11'

Upstream version 1.9.11

# gpg: Signature made Thu 11 Feb 2016 03:06:16 PM EET
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2016-02-11 15:06:19 +02:00
Christos Trochalakis
19d658f41b Release 1.9.10-1 2016-01-26 20:12:14 +02:00
Christos Trochalakis
0bcc8e5f72 Remove python from nginx-common deps, closes ##808699
ngx-conf is going to be shipped as a separate package.
2016-01-26 20:11:10 +02:00
Christos Trochalakis
e752ea86a6 New upstream release (1.9.10) 2016-01-26 20:09:55 +02:00
Christos Trochalakis
eab4758c29 Upstream version 1.9.10
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJWp6/4AAoJEBE2JgCnR+zZ1RUP/RGhlN/wxk2nTOR2jko9Issp
 3+MEbj3+dsTNJdlSNTdKU6p9R9Btkyf//CgiEy/rSXOLhI2JwKjP26Lp/WFmJ9q6
 C9pwuKJMvW0ekHsHBP48458ZXvtBmEqdlJud4Y5nhCZ5tcwA5GkTBiVFtKHH2+rX
 p++puaPu6bZ21WG/hmWGQwI+QHW8k26crGmDbqR+8wcET1LKbAQfJB2MMclLhyTE
 JJolF0cfxWgtAbTbn0WXb8pWIlYG64AYQnMxSMkR+NLEzvLjJWh1yv/xiV740Nq4
 KJuoci6gXTxiMkuuyF0EC3Y6bW7QZfNQnPpcmHWOsVgSwOaydJA60LK01BAR5ZR3
 0NhMPMpIopO37UTM70uJFWpNRXJDbdsqN/6kS075szJirmRVoCV59s1E9sXWMSQ8
 Ne1nHpddg2b2eNmOhnEyHBlQPBXhf83dGwdg9J1KoAeBnKMv+cSQx5qQylgEarQS
 E6Lzoop1s7FRiIybwD0zkNg/k36za6l5nOSAEMelYJbbjUCLkB/thvGaTSCquoRl
 s9OJNzK6FFtsRBXvJpK2OJh6BEBTGzdmYnuVuFG9XBuOcs2OzixfUTvngkuM1CcA
 Xl8k6QdfA73POivxQ6cdK4v4W9vkB6dzwEmFtD3zGRYdUIoeeay5JAAIMxVoGbD2
 HOICeAGBzIGqm9gbq394
 =f9/U
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.10'

Upstream version 1.9.10

# gpg: Signature made Tue 26 Jan 2016 07:42:16 PM EET
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2016-01-26 19:42:19 +02:00
Christos Trochalakis
4f41a69293 Release 1.9.9-1 2016-01-14 11:05:19 +02:00
Christos Trochalakis
706a679a92 Add a NEWS entry for our logrotate policy change 2016-01-14 11:05:19 +02:00
Christos Trochalakis
45aed60c9d Keep logs for 14 *days*
Complements Mike's 255c62e0 (#805322)
2016-01-14 10:40:07 +02:00
Christos Trochalakis
3ed3460460 Update nginx-lua to v0.10.0 2016-01-14 10:40:07 +02:00
Christos Trochalakis
2de69eb494 New upstream release (1.9.9) 2016-01-14 10:13:53 +02:00
Christos Trochalakis
0d89f5a406 Merge tag 'upstream/1.9.9'
Upstream version 1.9.9
2016-01-14 10:06:29 +02:00
Michael Lustfield
23c5f93806 Adding some missing files 2015-12-15 01:51:24 -06:00
Michael Lustfield
255c62e0b5 Changing logrotate from 52 days to 14 because of a typo and similar bug. Bug #805322 2015-12-10 04:09:20 -06:00
Christos Trochalakis
b1928b468d Release 1.9.6-2 2015-11-13 16:08:16 +02:00
Christos Trochalakis
7a486795eb Update nginx-lua 0.9.19
Fixes http/2 issues
  o https://github.com/openresty/lua-nginx-module/issues/566
2015-11-13 16:07:02 +02:00
Christos Trochalakis
6f5cefd11e 1.9.6-1 2015-11-03 09:13:06 +02:00
Christos Trochalakis
b37dfd906a New upsteam release (1.9.6) 2015-11-03 08:59:14 +02:00
Christos Trochalakis
114f9bbff0 Upstream version 1.9.6
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJWOFr7AAoJEBE2JgCnR+zZ9nwP/jzry8wIragXdl/wPuSl+tl8
 A+q11+Dci9U1kXdS5f3AM/axhTicmZF7BtWzjGflLK7XAsxrXmRGthX6k07vHWmc
 ao+91HCsmP758sQaRg+TSZ8dWXFnubf8enUTFMq3rgTu3yvBmdDy46BQnAo+4u3u
 dJ8rt/hEJh8SZA+x3KbDTcuhs5S4lBeJOhmWPBhrNId4hb1A1dk4jYn8cBijx8hW
 kqB5pUZ9TlGDadspfzFDlOYLkA98/OlcbCfHMCqw8oiZjzQ9cs00d3uWCfeFuhIa
 7bDBheWDQtP19ctZ4FzijpIbR8iBqPjx2lAXMicynsE6nhFmjn+WB10cqwxGSeHy
 U6r1Nus4pMoxj3TNUtmyrdkyjRBc+oborXGwhss2T7mqjl9wZs7IUcZurXADm+aJ
 V/68pJd8YZ7IWyybvXQyUV43MwD+3EGo/Kxk9yrqWLTy//UX+jy/EjN+h6g2e6iw
 UM7gFjMnWZouW7sPNY4n8la8VVCLizkzfpmoQ+iU03Fnjjltltd4RCtQtCERn8pI
 Rl3eDbC/WaTac0WKy94RN7SurPieTuN5V1LsLKTuADwmrYZyjxifY2zGoQzCZLfy
 k/hJImDi+0IffbD+TKGrfhkl2pNuRQHCKUxcBaQ8px/o/1kkyYJUmqcGI3OgWUa/
 fiLV1fQz45b8bcSJwxdD
 =fJNK
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.6'

Upstream version 1.9.6

# gpg: Signature made Tue 03 Nov 2015 08:58:03 AM EET
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2015-11-03 08:58:06 +02:00
Christos Trochalakis
efe7d922f4 Add a NEWS entry for http2 2015-11-03 08:56:29 +02:00
Christos Trochalakis
baf8feb207 Enable http2 module 2015-11-03 08:56:28 +02:00
Christos Trochalakis
4e0f004806 New upstream release (1.9.5) 2015-09-25 14:04:15 +03:00
Christos Trochalakis
53a6842708 Upstream version 1.9.5
-----BEGIN PGP SIGNATURE-----
 
 iQIbBAABCAAGBQJWBSnYAAoJEBE2JgCnR+zZmqQP+Pfj09hV0hO3tk9vTskxFmxS
 wDxpGcCycSYltkKciS44kSjpfI3RHE/cqO2Md26s8sqNBvRjTfyKhglx6MyRn6yz
 aO1B3t7evqaxcNBgedouBbP2YB5nH+8Wv1/YjGydMz3IAPoRUXI+hp5WfyKzyz+I
 TOwvgbpUPvZ9oP6kwiTDaM5fBhoLl5kS3lTT3hYZnEPggsIwEon0gP710c0aQ3AS
 k1YEObaWF/HnYVIeJ69kYwqAhHCvcxUm/Td79yDFK3P/DaX30XboS+Q8jkBGh8Mv
 tQ5k5MOkO8J+3hgAPIrsEj8VZvIG/QTw/JQ3aJP/GkYibRj0P0SuunoBlfMeUzI+
 XeAk9CoFRtYtDMNs7LXK36ywx4MTH+5FZtmKkfEVoT91AE/UxtnZblvvmDiJavJN
 vxf8vYY42bYL3KWcBMMLeU1Ljk8iipET4j1bbP9ctC0ykgxzeGq+FoaCMX8qww/Y
 B7AUPc5dgWdbnKq/Yq3Hha3GaLbDzXYZvIHTa3ZFQdcMkVlsAw9uAIXBiIxTq6K2
 7P9J/OB+muKK027AeXFHg08VEjhw4Di9kjSQFaOGkA4cbMPFCb6/nbvTNeXxG+5D
 OfnsMseUPjnNemYlrBe/Nn5SmEQLVyoLdtgZz1VPF/zsa25En8GLLUMi/DuZEpTk
 XltD3TLK34NdmewH7xc=
 =cHb2
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.5'

Upstream version 1.9.5

# gpg: Signature made Fri 25 Sep 2015 02:02:48 PM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2015-09-25 14:02:52 +03:00
Christos Trochalakis
a8ef8abc7b Release 1.9.4-1 2015-08-24 16:23:50 +03:00
Christos Trochalakis
a9600e2b4d Update debian/copyright for nginx source 2015-08-24 15:35:35 +03:00
Christos Trochalakis
f539cc0a49 Fix licence ordering 2015-08-24 15:35:03 +03:00
Christos Trochalakis
a26063750f New upstream release (1.9.4) 2015-08-24 15:33:52 +03:00
Christos Trochalakis
55f36156a2 Upstream version 1.9.4
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJV2wtGAAoJEBE2JgCnR+zZ18IP/RPfVjvzB+6tdGSFYIOQCEOw
 lDr0cb1MQ90bAag4HS+hhKmGiWMnOR8pkZr+mH0XQEzDgXFRF2XQWFzb9djeN79g
 zF02b3Il17ZCk06xqCkzyVFBJaSJ/mA9URzmKq8R15jatGxvEUT2+Bl4EhMhzyuP
 hMFhUVBKeNulRF1K8D8Fmqw5QXTvLrbhEkvnCRzCoxheX+249cciwLHkHXg1DA7O
 K8T9o5ZzXf79OM1EB/c89UsvEQDKlWyTEkW9RC7g0j3chSwianYAGAB2hRhkfbRW
 Ehj2iRsd7CigRvbxocFiUTFJOHXlfgjSS1n2Gf/+/E6p16VSPjM1FLIVs2icHYdg
 i9J0PxrVEidUlMKw1o9rdTYkfPiUtGI9niwFSHN72WVkHXNtdN5ml4fxJ+yXq6IQ
 dgqEXPoyeGG6GyA3oTxvHIGhppLES9qc4j/vRBcCN6BleXNHM03Ib03O/5Vh1YT4
 vsS0lJ93YHeIPMesxTt6Kw3wDLjF1yhSYECOs35Lb/w7+7qkoX2M3FT3Or6b4ePO
 Hq8vNlGx6omAkKVTFIU/pK0vaQjG1Xj2ZV1FC/D9qQCRlaoaz9XoM4l5A8TU6z7P
 F1rq7iioG65hMtCzf1TMaB/s8s3+LzfnjcFG338g88CbLLcB0jfIp+vgtrjgMNiP
 DOC4/nfRFi1k4V+JBC6N
 =kjAG
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.4'

Upstream version 1.9.4

# gpg: Signature made Mon 24 Aug 2015 03:17:10 PM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2015-08-24 15:17:14 +03:00
Christos Trochalakis
93550c314f Release 1.9.3-1 2015-07-14 20:25:16 +03:00
Christos Trochalakis
5491f7bdca Upstream version 1.9.3
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJVpUT0AAoJEBE2JgCnR+zZBkgP/j6a5ploh/WH13EiBAPa5Y88
 sbMUREeyVrkKRTBUROW05HSvSl+tuQf+V3obk6WTck3KAIYTVnmt60yeC8xT9rfL
 ZYytmJenIgL6qipkmEla+0aLbch+EX+NzzOta1FlOl44QNbYjFEqCFps0xuiPuCJ
 2rbL9/BVe7XfD8NOqyMHImcO3VcIinTU9hw5WyTAWylG2zvgW2hOAWb9HxLa7sot
 x6UT9XuuD7UPoBaHuhZsQFScV7RlnjDEuhjVB7J8YGK3iZE4/1CVOl9GICN5awk2
 xbqFcPkyd8dKCUGDTk4mmRneUcrclc4/hGg5Of+1LAboR9epoWsP9U7BYoN0VLHI
 8BGvuclegqqFmHVTfDvQm9tcexsjEadREK6yC693OnAIy0qV/LifJlzqZmfhqWb+
 TgxQXYhJCxCJTUQHYokSETqXI525DhHYxUnTZSyHc/cn0xk3GvRTa8QWyHoiNT0O
 ojCy3J6CnSHAtJPeS6wn9exskvfwv3UiCWbpQ4sueAjlMfh+ZH/TEB3iqPazD3H3
 qixbw3PFHYK82Fz28EYgL0ksoq8ug7SFE83niGs8mkpV2o2KAergaZYhT/7lVmh/
 lTtPPosfdETi97n9H4g6PwBEyEf6a9u8jMt4abZahkXnMd/ifI9w5qP9q41z0DDk
 g2hU/xcFoIl1XHdNBDZV
 =SzSm
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.3'

Upstream version 1.9.3

# gpg: Signature made Tue 14 Jul 2015 08:20:52 PM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2015-07-14 20:21:03 +03:00
Christos Trochalakis
81f1a374e1 Sync cgi configs with upstream 2015-07-09 11:00:06 +03:00
Christos Trochalakis
5a275f8949 Update nginx-lua to v0.9.16 2015-07-01 17:15:20 +03:00
Christos Trochalakis
1979c23fea Remove XS-Testsuite header 2015-06-22 13:02:45 +03:00
Christos Trochalakis
6717510c81 Release 1.9.2-1 2015-06-22 10:16:31 +03:00
Christos Trochalakis
1715cb7c59 Add a reference for the backported lua patch to README.Modules-versions 2015-06-21 21:29:40 +03:00
Christos Trochalakis
edc91aa9dc Add thread pool support to nginx-full & nginx-extras
9531e5e7 was backported for lua-nginx-module v0.9.16rc1 breaking
compilation when thread pool was enabled.
2015-06-21 21:24:55 +03:00
Christos Trochalakis
632421e0e5 debian/rules: Add stream module for nginx-full & nginx-extras 2015-06-17 11:28:39 +03:00
Christos Trochalakis
782a6ed9fe New upstream release (1.9.2) 2015-06-17 11:27:01 +03:00
Christos Trochalakis
59054e9001 Upstream version 1.9.2
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJVgS4NAAoJEBE2JgCnR+zZ7H8P/0rZwvdLnQa/nfyJwa5AA6Pp
 kdyvEXUxkfjd0Mwp+qtqgZzw5FEuEHVVC1hYcUuyUakuCQz2YS5gClQnoFULS42S
 Bx6a75tu/Pdy8x7emmKf7DCoUkZzEDisLyhMVx0I8vIcz8xxunnMwpjitWKkfcgn
 83C6Ol0dlg4wssqYA8wH+94pWCcZL5bNXFSh/WfkWVX7f81yzaqygWpjDFQF6Nnn
 qdv2gRRQNIugmjJysLlauqmHE4ZtQWnv3tMXLsQ7KVcxVUKnjs8S3xX0GN4xyhfx
 r+LwDUcnXUK0aNLKY+/iDUv0hhTPzX2MwkmCXUX4xLkBA1LTojNHr9lGYtQUhUHV
 i7BTUgRHHhg8S9bMWXrAdVUkrNKaEb/GtztlGNuPxpm5rIkod0SIbxO1fVi6OiCY
 sJNVqshTLO5GxHzUaV2GMXXxsjs1KZKvVVgXfumzO9v/WLXxF2RFxTAUfkFG5/F/
 LuTx/LLg/hMY2hvkrjzyrSeTRrrYLLvbKbCWhqAji0kWvwQCE56NrINZXECw+ei3
 HDebBODNhV+QbCA7moq+Tlkto15KE7Y2d7Thrc9zyi/aqz3Efwo5YunwCUK5Tlxr
 P2ldhLiMV+YtNmO+v1QyUztJV3M0gH1c6MqG9S57Els9W9aIV2WxzYU/a0wR3tQ9
 eUT4kBmHqG1OpKXuuk0H
 =OUaa
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.2'

Upstream version 1.9.2

# gpg: Signature made Wed 17 Jun 2015 11:21:33 AM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2015-06-17 11:21:36 +03:00
Christos Trochalakis
8550544cb4 initscript: Add some comments/hints 2015-06-17 11:18:53 +03:00
Christos Trochalakis
ac2d55e8d2 initscript: Fix exit status
We need to explicitly `exit $?` since we don't use `set -e`
2015-06-16 19:17:14 +03:00
Michael Lustfield
0ddf1ccfc0 Cleaning up init script and fixed a bug with exit status 2015-06-15 22:16:37 -05:00
Christos Trochalakis
f1f0066de5 Release 1.9.1-1 2015-06-12 15:44:14 +03:00
Christos Trochalakis
9844dfdd8a Update NEWS entry version 2015-06-12 15:37:51 +03:00
Christos Trochalakis
f4860d82df debian/watch: Search mainline versions for now 2015-06-12 15:02:38 +03:00
Christos Trochalakis
6a6628bd93 Switch to libgd-dev now that jessie is released 2015-06-12 15:02:36 +03:00
Christos Trochalakis
9b8414bbc8 debian/modules/nginx-lua: Backport 1.9.x compilation fix
Backport fix fixing 1.9.x compilation. The fix will be included in
v0.9.16.

f4e1311
2015-06-12 15:01:38 +03:00
Christos Trochalakis
8bea90a55d debian/rules: http_limit_zone has been renamed to http_limit_conn
Fixes building failure.
2015-06-12 15:01:38 +03:00
Christos Trochalakis
6e41b4e4c3 Build upstream manpages before shipping
Complements Mike's commit.

Manpages should be build before shipping. As a side effect, it's better
to ship them together with the nginx binary.
2015-06-12 15:01:29 +03:00
Christos Trochalakis
7d77b1195b Don't ship ngx-conf just yet
Let's test it a bit first and discuss the api it exposes.
2015-06-12 14:51:06 +03:00
Christos Trochalakis
8e7e40b988 New upstream release, 1.9.1 2015-06-11 14:44:12 +03:00
Christos Trochalakis
69ff1cde87 Upstream version 1.9.1
-----BEGIN PGP SIGNATURE-----
 
 iEYEABECAAYFAlV5dAsACgkQWxL5HyjF6E4IgQCgn6ShKr7o48ycyRUKjydZCfka
 iXwAmQFu11YqUH3Up7182bMViqu02BWY
 =+tH7
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.9.1'

Upstream version 1.9.1

# gpg: Signature made Thu 11 Jun 2015 02:42:03 PM EEST
# gpg:                using DSA key 0x5B12F91F28C5E84E
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <nodreams@ideopolis.gr>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: F14C 5BAF E1D7 457B 7B1A  B0FC 5B12 F91F 28C5 E84E
2015-06-11 14:42:08 +03:00
Christos Trochalakis
242d723c68 Fix version number 2015-06-11 14:17:21 +03:00
Michael Lustfield
2eadfe8382 Switching to Nginx maintained version of index.html. Resolves unreported bugs. 2015-06-09 09:19:37 -05:00
Michael Lustfield
0b951e301d Fix Python 3 compatibility in ngx-conf 2015-04-09 17:58:12 -05:00
Michael Lustfield
5070bfa62d Fixing a minor typo. 2015-04-08 08:28:53 -05:00
Michael Lustfield
c4cfd60f94 Adding NEWS entry because of potential issues with i386 systems. 2015-04-07 19:21:00 -05:00
Michael Lustfield
841afb8eeb Updating list of modules. Thanks Peter Wu. 2015-04-07 18:55:34 -05:00
Michael Lustfield
4d43fb0c64 Updating modules 2015-04-07 09:42:46 -05:00
Michael Lustfield
a5bbc3a1c6 Updating module list 2015-04-07 08:28:28 -05:00
Michael Lustfield
153ef732c4 Adding gunzip to -full and -extras 2015-04-07 08:23:38 -05:00
Michael Lustfield
18315ad1e2 Switch worker_processes to auto. 2015-04-01 18:24:30 -05:00
Michael Lustfield
4f31089dd2 Changing PIE stuff after talking to Thomas Ward 2015-04-01 18:00:45 -05:00
Michael Lustfield
6502d238f8 Fixing small typo 2015-03-28 10:36:44 -05:00
Michael Lustfield
4a01f57379 Replaced man page with upstream maintained version. 2015-03-28 09:50:11 -05:00
Michael Lustfield
c761600ea9 Adding python as requirement for nginx-common (ngx-conf) 2015-01-22 00:04:50 -06:00
Michael Lustfield
3e4a3d9160 Added ngx-conf configuration utility... finally. 2015-01-21 22:45:15 -06:00
Michael Lustfield
16c3177924 Updated comment about ssl_ciphers 2015-01-11 17:31:52 -06:00
Michael Lustfield
e3cd58d651 Added comment about ssl_ciphers 2015-01-11 17:31:09 -06:00
Michael Lustfield
ef4e50d155 Updated nginx-lua version. 2015-01-11 16:33:05 -06:00
Michael Lustfield
843750b958 Adding -fPIE -pie to build. 2015-01-11 16:27:24 -06:00
Michael Lustfield
8680ff9cd1 Adding upstart script 2015-01-11 16:20:46 -06:00
Michael Lustfield
b7385768b6 Adding missing files. 2015-01-11 16:05:59 -06:00
Michael Lustfield
586aebd331 Adding note for contribution. 2015-01-11 16:03:03 -06:00
Michael Lustfield
635d51ca6d Added vim syntax highlighting. 2015-01-11 16:00:56 -06:00
Michael Lustfield
2a2ad8931e Updating sample configuration - adding warning about using gzip with ssl. 2015-01-11 14:55:01 -06:00
Christos Trochalakis
0a1d7ef4ec Release 1.6.2-5 2014-12-01 13:12:00 +02:00
Christos Trochalakis
dee432a263 Add a list of important changes since wheezy to README.Debian 2014-12-01 13:12:00 +02:00
Christos Trochalakis
577c3a484a Remove /etc/nginx/naxsi-ui.conf conffile 2014-11-30 10:16:42 +02:00
Christos Trochalakis
1f3ed200f2 Add copyright for ngx_http_substitutions_filter_module 2014-11-30 10:16:10 +02:00
Christos Trochalakis
a29d2e5a03 Dropping SSLv3 and preferring server cipher order by default, #767456
Those two directives were suggested (commented) in the default vhost
configuration, we are now moving them uncommented to nginx.conf.

SSLv3 is also disabled in other popular web servers in debian, like
apache and haproxy.
2014-11-30 10:15:20 +02:00
Christos Trochalakis
b69b26d362 Release 1.6.2-4 2014-10-19 08:24:13 +03:00
Christos Trochalakis
39c9401f34 Switch postrotate to the initscript's rotate command 2014-10-17 15:06:22 +03:00
Christos Trochalakis
7dbafe0f5e Rewrite debian/copyright
Copyright file was not up-to-date and had some minor errors that needed
to be fixed.
2014-10-17 15:06:22 +03:00
Christos Trochalakis
96646a8d62 Update ngx-fancy-index to 0.3.4 2014-10-17 15:06:21 +03:00
Christos Trochalakis
ff1999cfee nginx-upload-progress: Remove not needed binary file
There is no need to add an override for that one.
2014-10-17 15:06:21 +03:00
Christos Trochalakis
f343d86c94 Update nginx-upload-progress to v0.9.1 2014-10-16 15:56:00 +03:00
Christos Trochalakis
de47cfc46c Update nginx-echo to v0.56 2014-10-16 15:53:10 +03:00
Christos Trochalakis
0ca74c0172 Update nginx-development-kit to v0.2.19 2014-10-16 15:49:10 +03:00
Christos Trochalakis
f7b933b45c Release 1.6.2-3 2014-10-16 15:13:11 +03:00
Christos Trochalakis
d97018fe9e Remove attribution note to Tyler Riddle per his request
Tyler doesn't agree with the applied patch.
2014-10-16 12:03:57 +03:00
Christos Trochalakis
9a4e0f0a69 Suggest disabling SSLv3 in default site 2014-10-16 12:03:02 +03:00
Christos Trochalakis
32baa8bd2a Add a changelog entry about the ssl snakeoil snippet 2014-10-13 10:46:17 +03:00
Christos Trochalakis
c15f391783 Introduce a php-fastcgi snippet
Now uncommenting the php comments in the default site
results in a functional php setup, closes #762491.
2014-10-13 10:46:17 +03:00
Christos Trochalakis
3e7b102360 initscript: gracefully stop nginx by default
Following the previous commit, we sync the initscript with the
systemd.service file. We now give nginx 10 secs to gracefully stop
before force stopping it.

Also we introduce a STOP_SCHEDULE variable to make this configurable.
2014-10-13 10:46:17 +03:00
Christos Trochalakis
caee1c2a87 Fix systemd graceful stopping issue
The ExecStop stop command sends a SIGSTOP signal to the master process
that triggers the graceful-stop sequence.

The bug was that, when ExecStop exits and the process is still running,
systemd thinks that the command failed and sends a SIGTERM (force
stop for nginx) to all the processes in the process group. The command
used exited immediately so the SIGSTOP was followed by a SIGTERM
effectively canceling the graceful stop sequence.

We now use start-stop-deamon as the ExecStop command that waits for
5 secs before exiting.

So, after this fix, the stop sequence becomes:
STOP/5  (=> master)
TERM/5  (=> master)
KILL    (=> process group)
2014-10-13 10:46:17 +03:00
Christos Trochalakis
c6a5177c86 snakeoil snippet 2014-10-13 10:46:17 +03:00
Christos Trochalakis
5bfd672530 Merge https configuration example into the default server
We also use the cert/key path of the snakeoil certs that are installed
by the ssl-cert package.

ssl-cert is added to suggested packages.
2014-10-13 10:46:17 +03:00
Christos Trochalakis
715b7086fa Revamp default site configuration
* Remove ipv6only=on, it's on by default
 * Remove error pages derective, keep things simple
 * Use _ as the catch all server_name (nginx idiom)
 * Provide a simpler virtual host configuration
2014-10-13 10:46:17 +03:00
Christos Trochalakis
776f6a7e52 Fix a few more issues with the new document root
* Bump debian policy to 3.9.6.0
 * Override lintian dir-or-file-in-var-www error.
   /var/www/html is the new document root and should be create by the
   nginx-common package.
 * Move the default page to index.nginx-debian.html and make
   the index directive for the default site fallback to that location.
   Seems like a cleaner approach.
2014-10-13 10:46:13 +03:00
Christos Trochalakis
74531a5070 Change default document root and provide a new default page 2014-10-01 15:51:50 +03:00
Christos Trochalakis
2e1fbae915 Release 1.6.2-2 2014-09-26 11:06:57 +03:00
Christos Trochalakis
1b31986abe Remove passenger stanga and switch worker_processes to auto 2014-09-26 11:05:49 +03:00
Christos Trochalakis
bcb7334d86 Handle nginx related config files shipped with nginx-common 2014-09-18 12:50:13 +03:00
Christos Trochalakis
80cda88b41 Drop nginx-naxsi packages
Removing everything naxsi related from debian/

We have decided to remove the nginx-naxsi packages before jessie is
freezed.

Packaging naxsi is not trivial and, unfortunately, none of the
maintainers uses it. That's the reason nginx-naxsi is not in a good
shape and we are not feeling comfortable to release and support it.
2014-09-18 12:46:10 +03:00
Christos Trochalakis
52f6e1871a Remove naxsi module from debian/modules
nginx-naxsi is going to be dropped.
2014-09-18 12:44:19 +03:00
Christos Trochalakis
510ec78adf Release 1.6.2-1 2014-09-17 11:20:11 +03:00
Christos Trochalakis
8dd9a27e64 Upstream version 1.6.2
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJUGUNTAAoJEBE2JgCnR+zZirkQAMdagbVebNfeKelPH5KcK8cA
 7pZUS6a2LvzaHCScYQDr1ccD2fGUR/mDpfjUTUOVg+A1UK25muNk/V7xwvuqM160
 hbVG6NDIaUo2Y0sl1I2Y9e2oA4YXVDLahu/agaB5iTKu4in/aVuX0RFu/+CJbe33
 J8nyMrW5WnrFVRMTaPRFXAAHXx4Tck9GKbkS2+2J2luXnQng5ra/qjYbCpTzxEKF
 isiknMO/4Dnv0JZSPbIvhQyTO/Pn1qTgzvNqEEsfMjn9sNShRtIn97JfDxXMKtBW
 CmG7Wje+bUMDME8w/2AI3+MemIkSYE7nyy0k3msVt6s/6o/3z2APGVBfjanKilQe
 hfBZ5g9aQJv2tbaAbhBqfDRM6TRusQGCGpaiKKN8Xwaa/dVio4BjkZJtY4I7RsA1
 YLxcOj2dClk2yXLCZD95TN2Bp7gUaqvWBUw+dxEjNJJF1YsfJBwiWY/FOIGXh5Hz
 NdGE4pJ6Eg8JDLnoZUUy2uxzzNwaIXhM8/WHuZ1lFEUrDc/o7NAqssm7zHqrZA8g
 8lna5tQbDSM0sRUPXWMqhx3r1aZoi6lq14Hn5p83UaNy/JXKlYCrvUlkhGepdN5R
 xSuC+VS7Nq19safv9YC+yCuQWppJiRAan+dZDpZA1TF3lxNNf1cvIWrWN2wyz6bU
 S/6MD3gYncvt+jViWmYH
 =Fe0j
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.6.2'

Upstream version 1.6.2

# gpg: Signature made Wed 17 Sep 2014 11:16:19 AM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2014-09-17 11:16:24 +03:00
Christos Trochalakis
422d5505c9 Release 1.6.1-2 2014-09-04 13:00:54 +03:00
Christos Trochalakis
5fcb02f279 Update http_push module to 0.73, closes #745921
Fixes fd leak on reload.
2014-09-04 09:56:56 +03:00
Christos Trochalakis
c2007ef12b Update nginx-lua version in README.Modules-versions 2014-09-04 09:51:18 +03:00
Christos Trochalakis
0aaa29671f Add some simple autopkgtests 2014-09-03 15:10:06 +03:00
Christos Trochalakis
1f210f7fce Update nginx-lua module to v0.9.12 2014-09-03 10:29:05 +03:00
Christos Trochalakis
975eaa86b2 Add a NEWS entry describing the config file changes 2014-09-03 10:24:43 +03:00
Christos Trochalakis
2774152526 Sync fastcgi configuration files with upstream nginx, closes #718639
A NEWS entry will follow with more information.

Since we are also changing whitespace, it make more sense to view the
log with -w (--ignore-all-space) parameter.
2014-08-28 15:55:47 +03:00
Christos Trochalakis
ce2293e11a Sync koi-utf,kow-win,scgi_params,uwsgi_params with upstream
A NEWS entry will follow with more information.

Since we are also changing whitespace, it make more sense to view the
log with -w (--ignore-all-space) parameter.
2014-08-28 15:55:42 +03:00
Christos Trochalakis
7e92bc37db Add changelog entry for naxsi module order 2014-08-28 12:41:10 +03:00
Christos Trochalakis
8b518be817 Compile naxsi as the first nginx module, closes #758642
This is important according to the naxsi installation docs:
https://github.com/nbs-system/naxsi/wiki/installation
2014-08-27 17:26:45 +03:00
Christos Trochalakis
56f5ab3b7d Upgrade to the latest mime.types
Notice that now nginx uses "application/javascript" for js
files. The `gzip_types` proposed directive has been updated to reflect
that.
2014-08-27 17:04:31 +03:00
Christos Trochalakis
b4d1fd4a4e Better pidfile extraction from nginx.conf, closes #747329 2014-08-27 16:31:29 +03:00
Christos Trochalakis
bfa477957b Update nginx-lua module to v0.9.11 2014-08-27 15:02:12 +03:00
Christos Trochalakis
acf4dfca73 Build nginx-extras against luajit, #755875 2014-08-27 14:55:19 +03:00
Christos Trochalakis
793a370c66 Release 1.6.1-1 2014-08-06 10:05:18 +03:00
Christos Trochalakis
63a48d01ff Upstream version 1.6.1
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJT4c4dAAoJEBE2JgCnR+zZxtcP/RMy/yUaGACFmLONL+W3nDEa
 UuUfp1u5EIrGTBNUrSiXUDtZ9ChCdds+BPeO9e8mC4bef1I6wVhBLAw0cmBIPnI4
 fuadGJS3VXG+XVogwgGtwUXdMQqQJuypOrLgi3D3EIFaEQweMyzbLXZzXcu9Nn1b
 qpqe7Sv3nnWGFtfsK+vYrSGVhLlbte8E/hhXu/A5ent9U9eN0Y1yFRbuhNzMxonb
 BXTLk/gwPmOVubF2KHlt9XEOXm+uNoozDf05pdXz+aftzNfAwckXOYuvyhZWVEI1
 T84M5BKpkbLBb/DgH0Ix17T4FhmTnRhWCfU3ZvCgp4peJVgn7SeWgQjLkWkDdK4+
 xedqrNRrUI7+P/uSGPu9+4j+hKnu31PrEuMQgfTCy7pmsIr1tIeIDGKtPMUQgvFZ
 VMbwpnXcvCjdy+Ly1RVYErBkZk5k97YH5dfE5OLX4b2+Cvkcn33CjohGi7wThmqi
 OqsWVkZJBHjwfuczngkoTsOfTKvOFqzYUd1dXv/qh3OqA8ZP/ciO5Ez4wJmpQPdx
 fkWX/pLeR2Ssj9SPfHK7TGa2nzvD4csp2lUQCAwLdK1RXJIKtJQoWOzqONBCqww2
 2+OJxOZlGZxYxONTu3JGxYkKkZsfVBRtSeK66KN6Z57WFQIYsCDhUQ0NA6Q3fXSB
 2ZjhwOlDDEwia6wQgPFP
 =3tsJ
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.6.1'

Upstream version 1.6.1

# gpg: Signature made Wed 06 Aug 2014 09:41:33 AM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2014-08-06 09:41:39 +03:00
Kartik Mistry
cc1d34ba57 Make nginx-extras.install executable 2014-07-29 09:06:18 +00:00
Kartik Mistry
d5c6dc62bc Added patch for #752796 2014-07-29 04:56:31 +00:00
Christos Trochalakis
9b8a8e8f8a Release nginx 1.6.0-1 2014-04-24 19:23:46 +03:00
Christos Trochalakis
958aa51c10 Update README.Packaging now that 1.6 is stable 2014-04-24 19:23:20 +03:00
Christos Trochalakis
10a44be1ca Remove already present openssl guard patch 2014-04-24 17:40:45 +03:00
Christos Trochalakis
6d1d34a939 Enable auth request http module everywhere 2014-04-24 17:39:27 +03:00
Christos Trochalakis
cbfae485d2 New upstream release 2014-04-24 17:37:00 +03:00
Christos Trochalakis
e4559da440 Upstream version 1.6.0
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJTWSEiAAoJEBE2JgCnR+zZLnIQAKbxBa65gJDqeGX6Zoz3fE50
 G7A/+lQuKt5qwpmDH2Q4UlEKnlObf2Iria4xUfhkQdyQetipQ2AOii3zZDKAxv4v
 cUxLuDo0op3MwwvI3c2L6FcF8SiCkJPYCJA+SItBgwGG9k9uMX5nbyCDoAXAbkqZ
 0zSI0LaTvfXXFB5Rv95t+7v4l3H82SvXn9VadHHe2orKUO5bLe0gI84dzaFdUf77
 vGe+A785jLigMm+LOxk8bGoMAtSeK2wEyeMWGy81PI2St8jpv/mtL0WHRDYFvTJ+
 IGnbfbry754YGXUCJLNP34IdJER25ACeyUc2gjLcBIJKZphRppSLJwhz9u747WIj
 yxn3DrBO503vRXhitkDEcvGH5E2lkWrEg8lFX2KXtG2IpBE6ACTVBfVwFrnkMtHR
 C/Q6VYX6nOjRlHdkG23l8vi/sC+B+rNRG6QNKRXo38bKljSmXJlueybeRODnyEIG
 L1mhyi4Gq5JsPTh9FZK+Ex/az8fW2GBF5fiRHL39Us9+8hd69xbUGGs7hdA16+H3
 iWT9Wyc3iAEtKciVwIJPcwrE2XLXy7EnzQN7IK1x5dZIDpWo8dJr/ViYTnjl85vW
 r9cu1Qc8vhDOexrS3Xqgp9jLCMvu3jPrCRy+QSr1w8p7Ti+olkddWVXcwhC5RbkK
 lQDduIcu//c+Rcs5t+z+
 =FTRj
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.6.0'

Upstream version 1.6.0

# gpg: Signature made Thu 24 Apr 2014 05:35:14 PM EEST
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2014-04-24 17:35:29 +03:00
Christos Trochalakis
08cacc7f0c Fix typo in recent changelog entry 2014-04-18 10:59:44 +03:00
Christos Trochalakis
0334fa8ada Release 1.4.7-2 2014-04-17 14:30:48 +03:00
Christos Trochalakis
69cae7f74f Rewrite debian/rules to use dh
Results in a cleaner rules file and, as a side-effect, solves
the double building issue described in #744050.
2014-04-16 16:14:45 +03:00
Christos Trochalakis
3db771b754 Add packaging readme
Document the experimental workflow as it's a bit complicated.
2014-04-11 12:48:50 +03:00
Christos Trochalakis
1ed0224979 Release 1.4.7-1, CVE-2014-0133
Release announcement:
http://mailman.nginx.org/pipermail/nginx-announce/2014/000135.html
2014-03-18 22:09:37 +02:00
Christos Trochalakis
7bb71e975a Merge tag 'upstream/1.4.7'
Upstream version 1.4.7
2014-03-18 21:59:01 +02:00
Christos Trochalakis
81ac776e2f Remove loop symlink from nginx-http-push source 2014-03-18 21:58:30 +02:00
Christos Trochalakis
063b36ea10 Fix changelog style a bit 2014-03-18 21:35:23 +02:00
Christos Trochalakis
0ea679071b Update nginx-auth-pam to 1.3
Contains our downstream patch introduced in bdf157e
2014-03-15 11:17:33 +02:00
Christos Trochalakis
6016e1e45e Update ngx_http_substitutions_filter_module to v0.6.4 2014-03-15 11:17:28 +02:00
Christos Trochalakis
0478db91fb Update nginx-dav-ext-module to v0.0.3 2014-03-15 11:17:24 +02:00
Christos Trochalakis
aecad99283 Update echo-nginx-module to v0.51 2014-03-15 11:17:17 +02:00
Christos Trochalakis
d5b181ed48 Update headers-more-nginx-module to v0.25 2014-03-15 10:46:19 +02:00
Christos Trochalakis
3792bc32c9 Remove commented note about nginx-upload 2014-03-15 10:23:55 +02:00
Christos Trochalakis
0313966313 Update nginx-http-push module to v0.711 2014-03-13 13:05:08 +02:00
Christos Trochalakis
b99ba6f455 Release 1.4.6-1 2014-03-04 18:12:12 +02:00
Christos Trochalakis
c361ba740b New upstream release 1.4.6 2014-03-04 18:06:22 +02:00
Christos Trochalakis
a446826bf5 Upstream version 1.4.6
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJTFfmzAAoJEBE2JgCnR+zZ2GsP/j18V7xI23tL9cQ8DkK654UK
 i/csdxMmXjZApk27woGw2qrE7OfbY+dzDE5kDiOFNFW6kRg/rdiqDX4AonYakIst
 2GQcFkn0kYgw0Jex/42UpmDdmXlquyfCUaajnNipSJSAHT81vhf95U1VF1jT0sF0
 1AOMa2HAQhVa6M1g97k9GTbaAnaFQQxsW2fZ8bzGCD2GGDrJ1IPFLeQjwjZBGlIr
 SayncA2uepXSLqR2Ru+b9v8yBmKSPeoEuJObDcmYU1Ek0wVwUqX2HPFGf+gMJ9Wu
 2wFi+ACCcbi5yZp7GZRNIeMmRZPdwToDtLzLvbU4V7YUIpuwiNm6uq2YEpt3fTB2
 PfopMJDg6p2CxWqa8zbzzhjbB06Swg3YcblpiolMCS1iI63wCKiZsxHC0rv+tvFe
 EqaOHlb32CcM8AGu8jDo/eJHai/fIT77LbP7zhSQt9yEG2tYBgWin/9juDJCrghT
 ejUMT2tC3oCM147h/YtqsqgQxHz7Cz9RZNsW6hClD4LuhL4+P/eozoYxJ7ES5mOO
 Zf4RIf8JrriIouXpxBYcS94xul1j76KXuJOX2iImh/O5DIFncJ+22G1chlKk6xy3
 7S/bU3HaMpka8eQuODR0mS3Thu2ynmg1jRLUuLAbJKJWJUQyrS7QcebLNQRseRJZ
 fh0n5fv8SoRFgvb35JHB
 =yM8a
 -----END PGP SIGNATURE-----

Merge tag 'upstream/1.4.6'

Upstream version 1.4.6

# gpg: Signature made Tue 04 Mar 2014 06:05:07 PM EET
# gpg:                using RSA key 0x11362600A747ECD9
# gpg: Good signature from "Christos Trochalakis <yatiohi@ideopolis.gr>"
# gpg:                 aka "Christos Trochalakis <yatiohi@gmail.com>"
2014-03-04 18:05:11 +02:00
Christos Trochalakis
7c10d6dbf7 Fix upstream signature verification 2014-02-25 15:01:20 +02:00
Christos Trochalakis
fe33ec0aa3 Enable debug module for nginx-light and nginx-naxsi
Moving debug to common modules, there is no need to differentiate
our flavors.
2014-02-24 10:12:16 +02:00
Christos Trochalakis
6d55878c95 Enable realip for nginx-light
Realip is an important module already included in the other
flavours, moving it to common modules.
2014-02-24 10:11:47 +02:00
Christos Trochalakis
88f758991d Split common configure options 2014-02-23 14:26:57 +02:00
Christos Trochalakis
82106b19a7 Switch to --with-cc-opt/--with-ld-opt configure flags
As a result the following gcc arguments are added, making the build more
strict.

-pipe -Wpointer-arith -Wno-unused-parameter -Werror
2014-02-23 14:19:41 +02:00
Christos Trochalakis
a8a3c6ed11 Expand buildflags so the build log is easier to follow 2014-02-18 08:57:58 +02:00
Christos Trochalakis
6d69e51be0 Hardening flags are already present
* -D FORTIFY_SOURCE=2 is included in
     `dpkg-buildflags --get CPPFLAGS`
 * -fstack-protector is included in
     `dpkg-buildflags --get CFLAGS`
2014-02-18 08:56:35 +02:00
Christos Trochalakis
e1fd8efb37 Releasing 1.4.5-1 2014-02-14 11:55:07 +02:00
Christos Trochalakis
6e883e1e56 debian/control: Change Breaks now that 1.4.4-5 will not be released
Switch Breaks to 1.4.5-1
2014-02-14 11:55:00 +02:00
Christos Trochalakis
4c2eef85b6 Merge branch 'initscript' 2014-02-12 11:22:22 +02:00
Christos Trochalakis
8467e9dddb Add changelog entry regarding the initscript changes 2014-02-12 11:22:03 +02:00
Christos Trochalakis
096c6e115b initscript: Introduce upgrade command
This basically an implementation of the method described in
http://nginx.org/en/docs/control.html.

This is also a silent feature, we will switch the maintainer
scripts when we feel ready.
2014-02-12 11:20:03 +02:00
Christos Trochalakis
bbd1cf7497 initscript: Introduce rotate command
This is more of a silent feature, we should switch the logrotate
script to use it later on.
2014-02-12 11:20:03 +02:00
Christos Trochalakis
9c9faae137 initscript: force-reload should be an alias for reload 2014-02-12 11:20:03 +02:00
Christos Trochalakis
6887649cfd initscript: Minor fixes 2014-02-12 11:20:03 +02:00
Christos Trochalakis
a5fa9dd2b0 initscript: Rewrite reload command
Nothing functional changed, just stylistic changes and a few comments.
2014-02-12 11:20:03 +02:00
Christos Trochalakis
495222c1db initscript: Rewrite restart command
o Better orchestration
2014-02-12 11:20:03 +02:00
Christos Trochalakis
29ab3b7839 initscript: Rewrite stop command
o Return correct error codes
 o Be more generous with signal timeouts
2014-02-12 11:20:03 +02:00
Christos Trochalakis
b5a468fd86 initscript: Rewrite start command
o Return correct error codes
 o There is no need to explicitly check the configuration
   nginx will fail to start.
2014-02-12 11:20:02 +02:00
Christos Trochalakis
acd10f6283 initscript: fix mixed indentation 2014-02-12 11:20:02 +02:00
Christos Trochalakis
1d144d88ec initscript: Remove "set -e" 2014-02-12 11:20:02 +02:00
Christos Trochalakis
3cf15a281a New upstream release 1.4.5 2014-02-11 18:36:43 +02:00
Christos Trochalakis
0866cfb513 Merge tag 'upstream/1.4.5'
Upstream version 1.4.5
2014-02-11 18:34:18 +02:00
Christos Trochalakis
2a8c38b355 Cleanup nginx-* prerm scripts 2014-01-17 14:20:07 +02:00
Christos Trochalakis
6aac19ae7a Fix #735551, nginx should be started by default
We don't handle the systemd case yet.
2014-01-17 13:45:56 +02:00
Christos Trochalakis
2dc6bd7d04 Add Breaks on nginx flavor packages
Handle the transition caused by the previous commit.

nginx package prior to 1.4.4-5 doesn't depend on a specific nginx-*
version, so you could end up with nginx_1.4.4-5 and nginx-full_1.4.4-6
installed at the same time.

The same is true for the nginx-naxsi-ui package. You could end up with
nginx-naxsi-ui_1.4.4-5 and nginx-naxsi_1.4.4-6

This patch should handle those cases.
2014-01-16 18:15:02 +02:00
Christos Trochalakis
5fec0bea22 Stricter dependencies and 'arch:all' to 'arch:any'
nginx now depends on specific nginx-* versions.
nginx-naxsi-ui now depends on specific nginx-naxsi version.

Since those package are 'arch:all' depending on 'arch:any' we need to
correctly handle dependencies with possible binary uploads.

http://lintian.debian.org/tags/not-binnmuable-all-depends-any.html
2014-01-16 18:14:59 +02:00
Christos Trochalakis
f2da1da397 Fix #735152, exit issue in naxsi-ui preinst script 2014-01-15 12:41:33 +02:00
Christos Trochalakis
90f2003497 Update nginx-lua to v0.9.4 2014-01-15 11:57:11 +02:00
Kartik Mistry
aed487eb51 Changed distribution. LGTM. 2014-01-07 23:27:12 +05:30
Christos Trochalakis
c1d7feec89 Fix #734139, log re-opening issue
The change of /var/log/nginx permissions to root:adm 0750 introduced
a serious log rotate issue.

According to the nginx documentation:
http://nginx.org/en/docs/control.html (Rotating Log-Files)

In order to rotate log files, they need to be renamed first. After that
USR1 signal should be sent to the master process. The master process
will then re-open all currently open log files and assign them an
unprivileged user under which the worker processes are running, as an
owner. After successful re-opening, the master process closes all open
files and *sends the message to worker process to ask them to re-open
files*.

The problem is that worker processes running as www-data cannot re-open
the log files as www-data does not have execute permission to
/var/log/nginx. The workers keep writing to /var/log/nginx/access.log.1
and after a second run of logrotate you will end up with corrupted log
files because of gzipping.

We now change the permissions to www-data:adm 0750.
2014-01-04 10:42:00 +02:00
Kartik Mistry
af306babb6 Updated dist 2014-01-01 16:50:26 +05:30
Christos Trochalakis
1f119224df Fix #715435, early exit issue in naxsi-ui postinst script
The script exited prematurely due to `set -e` when dpkg
--compare-versions exited with non-zero exit code.
2013-12-31 18:24:06 +02:00
Kartik Mistry
9a2639030f Updated timestamp 2013-12-27 21:16:16 +05:30
Michael Lustfield
c81abc1fa0 Removed nginx-custom from prior testing (unintentional commit) 2013-12-26 08:40:51 -06:00
Christos Trochalakis
3b6b53738c Add a changelog entry about the previous commit 2013-12-26 16:10:37 +02:00
Christos Trochalakis
9304737192 Remove nginx-naxsi-ui Provides and Conflicts
Those are handled by the nginx-naxsi package which provides the nginx
binary.
2013-12-26 16:07:20 +02:00
Christos Trochalakis
0f000e6b9f Remove nginx-naxsi-ui from the list of nginx dependencies
This completes commit 29b0f83 by Michael.
2013-12-26 16:06:08 +02:00
Kartik Mistry
accf521886 Use upstream PGP signature to verify upstream tarball in watch file 2013-12-26 16:59:57 +05:30
Kartik Mistry
c514220a1b Updated Standards-Version to 3.9.5, Fix Michael's email addresses in changelog and NEWS 2013-12-26 12:52:14 +05:30
Kartik Mistry
49d66d5620 Added patch to fix #733107 by Neutron Soutmun. 2013-12-25 21:50:08 +05:30
Christos Trochalakis
fa8ea785db Pass X-Forwarded-Proto header when proxying
X-Forwarded-Proto header is a de facto standard for identifying the
originating protocol of an HTTP request.
2013-12-24 22:01:14 +02:00
Christos Trochalakis
7eccf8306a Pass the full HTTP host header in proxy_params, #733016
Previously the server port was stripped from the original Host header.
Using the original header as-is by default makes more sense.
2013-12-24 21:47:07 +02:00
Christos Trochalakis
254b27549b Ship NEWS with nginx-common instead of nginx-doc
The package name is also changed to `nginx-common` as apt-listchanges
compares entries with local installed packages and we can be sure that
nginx-common is installed.
2013-12-10 16:42:57 +02:00
Christos Trochalakis
3a4f08671c /var/log/nginx permission handling
o Handle permissions in one place (postinst)
 o Allow the local admin to override them
2013-12-10 16:40:57 +02:00
Christos Trochalakis
63becb701c Revert "Removed type=forking."
This reverts commit 92461bb1cb.

type=forking is needed, the relevant discussion is here:

http://bugs.debian.org/728015
2013-12-04 17:05:06 +02:00
Michael Lustfield
282e135c14 Fixed up ssl_ciphers for redundancy and compatibility. 2013-11-24 21:18:39 -06:00
Michael Lustfield
3fbec49fb2 Added spdy support to nginx-full. 2013-11-24 18:58:09 -06:00
Michael Lustfield
3601d41c8a Modify permissions of /var/log/nginx and added NEWS entry. 2013-11-24 16:02:29 -06:00
Michael Lustfield
29b0f83f74 Added other options to nginx depends. 2013-11-24 15:11:33 -06:00
Michael Lustfield
fdf68f0516 Changed ssl_protocols and ssl_ciphers. 2013-11-24 15:01:43 -06:00
Michael Lustfield
92461bb1cb Removed type=forking. 2013-11-24 14:47:31 -06:00
Michael Lustfield
f725adba67 Added missing line from patch. 2013-11-24 14:37:10 -06:00
Michael Lustfield
4718b7b7b5 Added Provieds: httpd-cgi to packages. 2013-11-24 14:25:03 -06:00
Kartik Mistry
6cf36706d8 Fixed changelog a bit 2013-11-21 19:26:13 +05:30
Christos Trochalakis
cbf1bd5f16 Import upstream version 1.4.4 2013-11-20 16:26:36 +02:00
Christos Trochalakis
7723773719 Merge tag 'upstream/1.4.4'
Upstream version 1.4.4
2013-11-20 01:02:12 +02:00
Christos Trochalakis
4fb0bccaf5 Make git-import-orig use pristine-tar by default 2013-11-20 01:01:48 +02:00
Christos Trochalakis
a9c808cdd5 #729003 Remove upload module from nginx-extras description 2013-11-08 10:43:28 +02:00
Christos Trochalakis
1f4a93be9a #728721 Upgrade fancy index module to v0.3.3 2013-11-06 10:00:20 +02:00
Michael Lustfield
abc519b33a Committing patch - show a proper message with config test 2013-10-29 05:59:06 +00:00
Michael Lustfield
5f96bc7f26 Updated package description for spdy 2013-10-27 19:54:27 +00:00
Christos Trochalakis
1e27766780 Fix systemd issue with package updates
If nginx was running, there was a high possibility that the
postrm hook would kill the nginx process without restarting or
upgrading it.
2013-10-17 16:35:37 +03:00
Kartik Mistry
85f151d9a6 Updated dist. Uploading 2013-10-16 14:58:27 +05:30
Christos Trochalakis
bcb13a73df Override false lintian spelling error warning 2013-10-15 12:33:15 +03:00
Christos Trochalakis
42f984cf08 Don't ship an empty /run dir
Since wheezy we can assume that /run is already provided.
2013-10-14 19:36:11 +03:00
Christos Trochalakis
ad4cd39909 Nginx build system doesn't use config.{sub,guess} 2013-10-14 19:18:03 +03:00
Christos Trochalakis
ffd6a93736 Remove unused mime-types rules target 2013-10-14 19:18:03 +03:00
Christos Trochalakis
b9ef067032 *-stamp files are deleted by dh_clean 2013-10-14 19:18:03 +03:00
Christos Trochalakis
987b884e34 Switch to dh_installlogrotate 2013-10-14 19:18:03 +03:00
Kartik Mistry
76300a78ab Renamed debian/nginx-common.service to debian/nginx-common.nginx.service. Set compat to 9, updated debhelper dependency 2013-10-11 22:08:59 +05:30
Kartik Mistry
5c9b7b853e #713853 Switch to dh-systemd, making packaging easier and more correct 2013-10-10 19:58:42 +05:30
Christos Trochalakis
97da1b340f New upstream version (1.4.3) 2013-10-10 10:14:31 +03:00
Christos Trochalakis
53ac18305d Merge tag 'upstream/1.4.3'
Upstream version 1.4.3
2013-10-09 10:35:51 +03:00
Christos Trochalakis
3c28176763 Use verbose arguments 2013-10-05 10:55:14 +03:00
Christos Trochalakis
c0d5189c14 Fix #696797, gracefully handle empty pidfile in logrotate
Under certain circumstances we could end up with an empty pidfile[1].
The logrotate script should handle that gracefully. We now also check
that the pidfile size is not zero before signaling nginx master.

[1] `nginx -t` creates/opens an empty pidfile without deleting it to
avoid posible race conditions. So if nginx is not running at the moment,
you will end up with an empty pidfile.

Relevant discusion:
http://mailman.nginx.org/pipermail/nginx/2008-May/005229.html
2013-09-30 16:46:02 +03:00
Christos Trochalakis
e7a2c3a21f Fix #724232, handle missing files correctly 2013-09-23 11:22:34 +03:00
Christos Trochalakis
b0681853bb Fix typo in debian/changelog 2013-09-21 08:03:12 +03:00
Christos Trochalakis
3f8551da66 Only scan for stable releases, not mainline. 2013-09-17 09:25:32 +03:00
Christos Trochalakis
bdf157e885 Bugfix auth_pam module
ngx_module_t commands array should end with a ngx_null_command.

Closes #721702
2013-09-16 20:45:31 +03:00
Christos Trochalakis
f31ef22423 Better pidfile extraction in initscript 2013-09-16 14:55:20 +03:00
Kartik Mistry
f4baeb48dc Added Christos Trochalakis as Uploaders, wrap-and-sort control file 2013-09-15 17:03:12 +05:30
Christos Trochalakis
8e9fb6b911 New upstream release 2013-09-14 10:39:50 +03:00
Christos Trochalakis
3908b78105 Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
2013-09-14 10:34:23 +03:00
Kartik Mistry
5b633ac54d Fixed changelog for correct version and minor typo 2013-07-17 13:40:10 +05:30
Michael Lustfield
d7223b1e27 Removed /doc/ from default config. 2013-07-17 07:06:11 +00:00
Cyril Lavier
96a15a1302 Fixed #712989 2013-06-21 17:34:14 +02:00
Cyril Lavier
8746ae5624 Added missing arguments to have clean postinst/preinst scripts. 2013-06-12 10:35:13 +02:00
Kartik Mistry
2c874e3809 Preparing for upload 2013-06-09 13:09:09 +05:30
Cyril Lavier
91d5926827 Updated changelog 2013-06-08 12:52:29 +02:00
Cyril Lavier
ed84b674be Actually fixing #711590 (wrong copy/paste earlier) 2013-06-08 12:40:37 +02:00
Cyril Lavier
5551f05321 Fix #711590 2013-06-08 12:29:52 +02:00
Kartik Mistry
de646ce8d2 #711505: Changed libgd2-dev build-dep to libgd2-dev|libgd2-noxpm-dev allow backporting 2013-06-07 19:33:22 +05:30
Kartik Mistry
7e690289b5 Updated timestamp 2013-06-06 12:55:35 +05:30
Kartik Mistry
f364f8879b Minor changes in NEWS.Debian 2013-06-05 19:52:34 +05:30
Kartik Mistry
f0d641c4a9 Fixed changelog 2013-06-05 19:49:09 +05:30
Cyril Lavier
d1fabcdc42 Fixed wrong version number in NEWS.Debian 2013-06-05 14:07:55 +02:00
Cyril Lavier
152fca8f53 Fix #708522 2013-06-05 11:09:42 +02:00
Cyril Lavier
54d196673a An actual clean fix for #707291 2013-06-05 10:18:36 +02:00
Cyril Lavier
0c969fe550 Removed the "echo "Display some message here"" line in nginx-naxsi-ui.preinst 2013-05-20 14:28:49 +02:00
Kartik Mistry
b4b074b7bd Urgency set to Medium 2013-05-20 17:36:18 +05:30
Cyril Lavier
8be7c376ce First try on fixing bug #707291 2013-05-14 20:12:03 +02:00
Cyril Lavier
8614d64165 Performed the libgd2-{xpm,noxpm}-dev -> libgd2-dev transition. 2013-05-13 23:52:19 +02:00
Kartik Mistry
fb0a5ae14e Fixed typo for ipv6only=on in conf 2013-05-13 08:37:53 +05:30
Kartik Mistry
d710434bb7 Looks fine, uploading 2013-05-07 20:28:37 +05:30
Kartik Mistry
2eb75a35c7 New upstream version, S-V to 3.9.4 2013-05-07 19:33:31 +05:30
Kartik Mistry
660b896e2e Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
2013-05-07 19:30:56 +05:30
Kartik Mistry
8f1e230fe2 Uploading.. 2013-05-01 10:48:55 +05:30
Cyril Lavier
66ee44cce5 Updated control file to reflect the recent add of external modules. 2013-04-30 14:37:13 +02:00
Cyril Lavier
d997570a3d \#706456 Added http_substitutions_filter module 2013-04-30 14:18:17 +02:00
Kartik Mistry
c2e3f58e73 Fixed changelog 2013-04-29 18:01:46 +05:30
Cyril Lavier
fa4edd9301 Switch naxsi-ui DB engine from MySQL to SQLite (fixes #699678). 2013-04-29 13:17:11 +02:00
Kartik Mistry
34bbfa3f52 #704210 Added FancyIndexs module 2013-04-29 13:11:52 +05:30
Kartik Mistry
a84f88634e #701508, Suggests: fcgiwrap 2013-04-29 12:29:51 +05:30
Kartik Mistry
abae0911ee #706195 enabled spdy module 2013-04-26 13:27:07 +05:30
Kartik Mistry
e5e10e2156 Fixed Files: path for modules, Updated debian/* copyright 2013-04-26 12:48:31 +05:30
Kartik Mistry
19161b69a0 Removed nginx-upload-module as it no longer works 2013-04-26 09:52:49 +05:30
Ondřej Surý
464fd80261 Give changelog some i18n love 2013-04-25 12:22:31 +02:00
Kartik Mistry
f49dbd4451 Updated changelog for last commit 2013-04-25 15:41:57 +05:30
Ondřej Surý
f414316901 Remove upstream .git* files from modules 2013-04-25 11:34:55 +02:00
Ondřej Surý
4a4fe63d1e Update module version numbers 2013-04-25 11:34:06 +02:00
Ondřej Surý
d2a663629e Update nginx-echo module to 0.45 2013-04-25 11:33:01 +02:00
Ondřej Surý
b7eff3af39 Update nginx-cache-purge to 2.1 2013-04-25 11:32:16 +02:00
Ondřej Surý
01b8f22b96 Update naxsi module to 0.50 2013-04-25 11:32:00 +02:00
Kartik Mistry
564e3d2562 Updated copyright year and fixed missing text in License 2013-04-25 13:52:41 +05:30
Kartik Mistry
12dcc2ff62 Updated nginx-lua to 0.8.0, Patched nginx-upload, Updated rules for chunking removal, Updated README.Modules-versions 2013-04-25 13:10:04 +05:30
Kartik Mistry
e186f280b5 Removed chunkin module. No longer needed for 1.3.9+ 2013-04-25 13:07:16 +05:30
Kartik Mistry
84daa772f8 Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
2013-04-25 12:34:43 +05:30
Kartik Mistry
6618afdb9f Refreshed patch for new release 2013-04-23 09:25:39 +05:30
Kartik Mistry
fc3f945f56 Update to 1.2.8 2013-04-22 17:58:11 +05:30
Kartik Mistry
199cbd410d Merge tag 'upstream/1.2.8'
Upstream version 1.2.8
2013-04-22 17:49:07 +05:30
Kartik Mistry
b371a03b4d Fixed changelog 2013-04-19 16:13:30 +05:30
Kartik Mistry
7f62d7194c Fixed version number in changelog 2013-04-19 12:58:16 +05:30
Michael Lustfield
9f4f0888a0 fixed two bugs 2013-04-16 03:02:09 +00:00
Kartik Mistry
2f789c4341 Suggests: nginx-doc for nginx-common, #702923 2013-03-13 08:26:32 +05:30
Michael Lustfield
35182921d1 Pointing to the correct bug. 2013-03-12 03:28:32 +00:00
Michael Lustfield
4f6042ea9a Removed obsolete --with-md5 and --with-sha1 2013-03-11 23:10:30 +00:00
Michael Lustfield
2b44e83b0e Adding default_server to default ipv4 server block. 2013-03-11 22:48:49 +00:00
Michael Lustfield
9e098261bd Adding ipv6only=on to default server block. 2013-03-11 22:45:10 +00:00
Kartik Mistry
82d94b0a10 Added cache purge module to nginx-extras, rearrange some modules in config 2013-01-16 13:58:24 +05:30
Kartik Mistry
2e6ee5d7b1 Set default log to stay for 52 weeks instead of 52 days 2012-12-27 15:15:00 +05:30
Kartik Mistry
91cc0d6961 Preparing release 2012-12-18 10:29:32 +05:30
Kartik Mistry
119c6c8a08 Added ja and pt_BR translations 2012-12-17 12:38:50 +05:30
Cyril Lavier
7be17f73dc Added changelog entries 2012-12-12 11:42:21 +01:00
Cyril Lavier
63c5f685f1 Updated nginx-cache-purge module with the 2.0 version. 2012-12-12 11:38:08 +01:00
Cyril Lavier
e68990083e Updated nginx-lua with the 0.7.8 version. 2012-12-12 11:32:35 +01:00
Cyril Lavier
e1c052af95 Updated the nginx-echo module with the 0.41 version. 2012-12-12 11:24:11 +01:00
Cyril Lavier
18e70f08f3 Updated the Headers-more third party module with the 0.19 version. 2012-12-12 11:16:04 +01:00
Kartik Mistry
4f930e928c New upstream release 2012-12-12 15:22:47 +05:30
Kartik Mistry
569749e6c5 Merge tag 'upstream/1.2.6'
Upstream version 1.2.6
2012-12-12 15:22:06 +05:30
Kartik Mistry
bde7fed353 Oops. Updated changelog 2012-12-10 16:32:48 +05:30
Kartik Mistry
febb8ab3ba #695374: nginx.init doesn't check start-stop-daemon exit status 2012-12-10 16:29:14 +05:30
Kartik Mistry
5c0ba7c27b Revert "Added patch to fix function test_nginx_config doesn't clean pid file at the end, #695119. Not tested yet though"
This reverts commit 60b422f38a.
2012-12-10 16:27:35 +05:30
Kartik Mistry
60b422f38a Added patch to fix function test_nginx_config doesn't clean pid file at the end, #695119. Not tested yet though 2012-12-06 18:21:45 +05:30
Kartik Mistry
2f28b7dc61 New upstream release 1.2.5 2012-11-30 11:51:18 +05:30
Kartik Mistry
ca8f3ffbcc Merge tag 'upstream/1.2.5'
Upstream version 1.2.5
2012-11-30 11:50:05 +05:30
Michael Lustfield
4fe7bd7d49 Uncommented listen lines in default server block to make it default regardless of order. 2012-11-30 01:23:24 +00:00
Cyril Lavier
5c493041dd Added RealIP module in nginx-naxsi 2012-11-27 14:34:16 +01:00
Kartik Mistry
5e28cea556 Much better init log output using log_*_msg 2012-11-19 17:52:45 +05:30
Kartik Mistry
5e6c2bb164 Added #692335 translation bug 2012-11-05 13:06:02 +05:30
Kartik Mistry
403ae38096 Bring back conf/fastcgi.conf 2012-11-05 12:42:42 +05:30
Kartik Mistry
38a3980c71 Fixed those nasty ^M characters in templates file #692191 2012-11-04 09:07:54 +05:30
Michael Lustfield
886922c08f Changing fastcgi.conf to symlink. 2012-11-02 21:58:32 +00:00
Michael Lustfield
e181384ad4 Merging local changes to master. 2012-11-02 21:53:54 +00:00
Michael Lustfield
1025071796 Updating PID in nginx.conf. 2012-11-02 21:53:41 +00:00
Kartik Mistry
c5f72729d7 Fixed nginx.pid path in config file, this should not affect as /var/run is symlink to /run 2012-10-31 19:36:54 +05:30
Kartik Mistry
d9a483af15 Updated po files for unfuzzyness 2012-10-30 10:57:38 +05:30
Michael Lustfield
c63763a48e Updated root to point at /usr/share/nginx/html instead of /usr/share/nginx/www. 2012-10-29 23:45:06 +00:00
Michael Lustfield
3315364528 Updated debconf templates 2012-10-29 23:22:28 +00:00
Michael Lustfield
de84132aee Moved the symlink creation of the default sites to nginx-common. Avoids the chance of it being recreated when installing different nginx versions. 2012-10-29 23:17:42 +00:00
Michael Lustfield
3fb2092faa Added extra checking to .postinst files. 2012-10-29 23:07:17 +00:00
Michael Lustfield
f4cc66e60b Added /run to nginx-common.dirs 2012-10-29 22:55:19 +00:00
Kartik Mistry
28ca0e10e5 Acknowledged NMUs 2012-10-29 11:27:29 +05:30
Kartik Mistry
22a5287788 Fixed version 2012-10-29 10:28:40 +05:30
Kartik Mistry
ad59d990a6 Fixed long changelog 2012-10-29 09:34:46 +05:30
Michael Lustfield
032f30d196 Updating naxsi version. 2012-10-28 00:30:15 +00:00
Kartik Mistry
d7a48ab682 Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/nginx 2012-10-12 15:42:45 +05:30
Michael Lustfield
ceff779564 Changed version number. 2012-10-12 02:17:20 +00:00
Michael Lustfield
30c20ca283 Changed /var/run to /run in multiple files. 2012-10-12 02:16:03 +00:00
Kartik Mistry
c4150a3d74 Merge tag 'upstream/1.2.4'
Upstream version 1.2.4
2012-09-29 21:46:48 +05:30
Kartik Mistry
1e77aa89c6 Fixed version, urgency. Do not change version without importing pristine tar :) 2012-09-19 17:13:29 +05:30
Kartik Mistry
5e42789f9f Removed trailing slash from Files: field 2012-09-07 12:35:46 +05:30
Michael Lustfield
fc339b54d1 Added a couple more fixes 2012-08-08 23:45:21 +00:00
Michael Lustfield
62ef97768e Updated french translation 2012-08-08 23:29:32 +00:00
Michael Lustfield
3fa9d835be Touched up some broken stuff. 2012-08-08 23:21:57 +00:00
Michael Lustfield
11afe077b5 Added some other modifications after testing. 2012-08-08 23:00:14 +00:00
Kartik Mistry
dc1813f620 Added patch from Gregor Herrmann for #681758, NMU 1.2.1-2.2 2012-08-05 17:30:07 +05:30
Michael Lustfield
e7c190c799 fixed conflict 2012-07-22 03:44:12 +00:00
Michael Lustfield
28bbc752f5 Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/nginx
Conflicts:
	debian/changelog
2012-07-22 03:21:05 +00:00
Michael Lustfield
bf8c36142d Fixed up a few minor things. 2012-07-22 02:40:50 +00:00
Kartik Mistry
429bba6ad0 Applied patch to fix PO files, templates.pot from Christian PERRIER, #681381 2012-07-15 10:19:21 +05:30
Kartik Mistry
e59746cf25 Urgency set to medium 2012-06-27 19:33:24 +05:30
Cyril Lavier
319b6a4b3d Change changelog message for naxsi upgrade 2012-06-27 14:40:03 +02:00
Cyril Lavier
a05fc3dae7 Removed useless pyc files from naxsi module 2012-06-27 13:56:43 +02:00
Cyril Lavier
b96c1b0cf5 Updated naxsi to version 0.46-1 2012-06-27 13:53:12 +02:00
Kartik Mistry
746497a0c7 Urgency set to medium for RC bug, preparing for upload 2012-06-27 09:26:05 +05:30
Kartik Mistry
75b492a2cd Added it.po and updated pt.po translations 2012-06-27 09:13:25 +05:30
Cyril Lavier
3e246867e3 Updated French translation 2012-06-26 16:53:36 +02:00
Cyril Lavier
bea4d4a1d5 Added Spanish and Galician po files. 2012-06-25 15:07:21 +02:00
Cyril Lavier
19d938d079 wrap-and-sort -a 2012-06-23 19:30:46 +02:00
Cyril Lavier
303b6c497b Updated modules lists 2012-06-23 19:30:26 +02:00
Cyril Lavier
5bc63c292c Updated Czech debconf translation 2012-06-23 19:00:38 +02:00
Kartik Mistry
a6ad96aa4f Added Polish translation 2012-06-20 08:37:37 +05:30
Michael Lustfield
b3d53f4512 Pushing dangling changes 2012-06-18 23:48:50 +00:00
Michael Lustfield
e30a854cd4 Moved configuration purging to nginx-common. 2012-06-18 23:07:54 +00:00
Michael Lustfield
aabfd16d35 Changed try_files in default config. 2012-06-18 22:55:34 +00:00
Michael Lustfield
98bd84de2f Added --with-pcre-jit to debian/rules 2012-06-18 22:47:24 +00:00
Michael Lustfield
dad6eb30a1 Updated debian/nginx-common.preinst 2012-06-18 22:37:20 +00:00
Kartik Mistry
04e09dc271 Fixed long changelog entries 2012-06-17 20:31:20 +05:30
Kartik Mistry
1ef4bdd0ea Run debconf-updatepo, fixed all translation files for fuzzy. Updated nginx-naxsi-ui.templates for empty line 2012-06-17 20:21:21 +05:30
Kartik Mistry
d8549684a7 Updated de.po, da.po 2012-06-17 13:37:35 +05:30
Cyril Lavier
25438dad4c Changelog entry for the nginx-naxsi-ui postrm and prerm scripts 2012-06-14 22:33:03 +02:00
Cyril Lavier
33a1ab4ba9 Add SSL in nginx-full module list. Fixing #677128 2012-06-14 22:22:02 +02:00
root
98477dbd51 Merge commit 'upstream/1.2.1' 2012-06-14 21:43:42 +02:00
Cyril Lavier
1cc2306a84 Revert "Add gbp.conf"
This reverts commit 986782d4f8.
2012-06-13 20:03:21 +02:00
Cyril Lavier
986782d4f8 Add gbp.conf 2012-06-13 20:00:44 +02:00
Kartik Mistry
2fd1959301 New upstream version, (really) Added nl.po, sk.po 2012-06-13 21:28:46 +05:30
Kartik Mistry
1fc7babbd8 Added nl, sk po debconf translations 2012-06-13 17:51:53 +05:30
Kartik Mistry
391775cbb0 Updated to reviewed debconf template. Updated pt.po, ru.po, sv.po 2012-06-13 17:48:16 +05:30
Kartik Mistry
656f538dee Added Swedish debconf po translation 2012-05-30 10:40:51 +05:30
Kartik Mistry
16cce32747 Added missing files from nginx-lua module. Oops.. 2012-05-29 15:14:18 +05:30
Kartik Mistry
8b52eb51ea Updated nginx-lua to upstream tag v0.5.0rc29, fixed for worker process crashes 2012-05-29 15:13:01 +05:30
Kartik Mistry
e3d7726c60 Added Portuguese translation of PO debconf template 2012-05-29 14:39:56 +05:30
Cyril Lavier
e693eef2c4 corrected the lintian warning about this script 2012-05-25 12:34:59 +02:00
Kartik Mistry
d97ade7282 Removed duplicate copyright field 2012-05-25 12:46:47 +05:30
Kartik Mistry
a38b2bac6a Added Danish translation of debconf template 2012-05-25 12:02:40 +05:30
Cyril Lavier
198aaf528b Added Russian and German PO files 2012-05-23 19:26:12 +02:00
Cyril Lavier
6de5011dab Adding postrm and prerm scripts to nginx-naxsi-ui to correct the piupart error. For the moment, they are not removing the /etc/dbconfig-common/nginx-naxsi-ui.conf file. Don't hesitate to correct it :) 2012-05-23 19:22:19 +02:00
Cyril Lavier
4deb15d5dc Update the nginx-naxsi module list 2012-05-17 20:57:57 +02:00
Cyril Lavier
93bfafa7a5 Changelog entry for previous commit 2012-05-17 20:49:25 +02:00
Cyril Lavier
e4843421c5 Added status module to nginx-naxsi 2012-05-17 20:47:24 +02:00
Kartik Mistry
053a9b8f74 Updated manpage, added Czech translation for Debconf 2012-05-16 16:51:27 +05:30
Kartik Mistry
5152463a8c Set dist to unstable for upload 2012-05-14 11:15:57 +05:30
Kartik Mistry
0488f8bf3c Better changelog entries 2012-05-13 22:36:41 +05:30
Kartik Mistry
25c2b31efa Added patch to fix deprecated listen directive 2012-05-12 21:02:31 +05:30
Kartik Mistry
6986bc7299 Added patch to add ULIMIT for restarts 2012-05-12 20:58:59 +05:30
Kartik Mistry
d5d5f85a3a More minor formatting of manpages 2012-05-09 20:14:06 +05:30
Cyril Lavier
ce79b882d3 Changed Thibault Koechlin's email address 2012-05-09 14:42:46 +02:00
Cyril Lavier
d687cdf6cf Formated naxsi-ui-intercept.1 base on the reformat did by Kartik on naxsi-ui-extract 2012-05-09 13:42:45 +02:00
Kartik Mistry
b61fb337d0 Fixed naxsi-ui-extract manpage for formatting etc 2012-05-09 16:33:48 +05:30
Cyril Lavier
daf7b88b5d Updated the changelog file 2012-05-09 11:25:36 +02:00
Cyril Lavier
9901d9d24e Modified it to remove the wildcard. 2012-05-09 11:23:11 +02:00
Cyril Lavier
2afa9266a3 Added the manpages list for nginx-naxsi-ui 2012-05-09 11:22:54 +02:00
Cyril Lavier
6c9a3507fa Added manpages for nginx-naxsi-ui 2012-05-09 11:22:21 +02:00
Kartik Mistry
11eede6db0 Fixed duplicate Description 2012-05-09 14:03:01 +05:30
Cyril Lavier
f5a0faaa3b Updated the pot/po files according to the new templates 2012-05-09 09:36:39 +02:00
Cyril Lavier
8e27ae7cc3 Fixed duplicate field Description at line 118 2012-05-09 09:21:29 +02:00
Cyril Lavier
7b2fc03b17 Applied Justin's patch to nginx-naxsi-ui.templates 2012-05-09 09:15:15 +02:00
Cyril Lavier
a679d82195 Applied Justin's patch to the control file 2012-05-09 09:14:52 +02:00
Kartik Mistry
daa927d0e0 Fixed typo in template 2012-05-08 20:08:31 +05:30
Kartik Mistry
224d583177 Added missing bug number for new upstream release 2012-05-08 16:36:01 +05:30
Kartik Mistry
7353c3fd8e Added missing copyrights from modules/, minor formatting etc 2012-05-08 12:21:53 +05:30
Kartik Mistry
e4c7e65be9 Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/nginx 2012-05-08 11:54:35 +05:30
Kartik Mistry
44943ac09b wrap-and-sort debian/control 2012-05-08 11:53:58 +05:30
Cyril Lavier
13822681aa Updated the Vcs-* fields 2012-05-08 08:16:31 +02:00
Cyril Lavier
01942e936b Changed from unstable to UNRELEASED 2012-05-08 07:57:36 +02:00
Cyril Lavier
04d69c73f4 Imported Debian patch 1.2.0-1 2012-05-08 07:55:38 +02:00
880 changed files with 164469 additions and 11 deletions

10
.gitignore vendored Normal file
View file

@ -0,0 +1,10 @@
objs/*
!objs/ndk_*
.pc/
.vscode/
modules/media-framework/
modules/nginx-srt-module/
modules/nginx-vod-module/
Makefile
*.orig
*.txt

View file

@ -2,6 +2,11 @@
# Copyright (C) Igor Sysoev
# Copyright (C) Nginx, Inc.
basename_last2() {
local basename_1=`basename \`dirname $1\``
local basename_2=$(basename "$1")
echo $(printf "$basename_1/$basename_2" | sed 's/\.\.\///')
}
echo "creating $NGX_MAKEFILE"
@ -174,7 +179,7 @@ ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"`
for ngx_src in $NGX_ADDON_SRCS
do
ngx_obj="addon/`basename \`dirname $ngx_src\``"
ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj
@ -413,7 +418,7 @@ if test -n "$NGX_ADDON_SRCS"; then
for ngx_src in $NGX_ADDON_SRCS
do
ngx_obj="addon/`basename \`dirname $ngx_src\``"
ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
| sed -e "s/\//$ngx_regex_dirsep/g"`
@ -576,7 +581,7 @@ END
ngx_obj=$ngx_src
;;
*)
ngx_obj="addon/`basename \`dirname $ngx_src\``"
ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
mkdir -p $NGX_OBJS/$ngx_obj
ngx_obj="$ngx_obj/`basename $ngx_src`"
;;
@ -638,7 +643,7 @@ END
ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
;;
*)
ngx_obj="addon/`basename \`dirname $ngx_source\``"
ngx_obj="addon/`basename_last2 \`dirname $ngx_source\``"
ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \
| sed -e "s/\//$ngx_regex_dirsep/g"`
;;

69
configure.docker.sh Executable file
View file

@ -0,0 +1,69 @@
#!/bin/bash
./configure \
--with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/tmp/build/quickjs/" \
--with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/tmp/build/quickjs/" \
--sbin-path=/usr/local/sbin/nginx \
--conf-path=/video_server/nginx/nginx.conf \
--error-log-path=/var/log/nginx/error.log \
--pid-path=/var/run/nginx/nginx.pid \
--lock-path=/var/lock/nginx/nginx.lock \
--http-log-path=/var/log/nginx/access.log \
--http-client-body-temp-path=/tmp/nginx-client-body \
--with-compat \
--with-debug \
--with-pcre-jit \
--with-http_ssl_module \
--with-http_stub_status_module \
--with-http_realip_module \
--with-http_auth_request_module \
--with-http_v2_module \
--with-http_dav_module \
--with-http_slice_module \
--with-threads \
--with-http_addition_module \
--with-http_flv_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_mp4_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_sub_module \
--with-mail_ssl_module \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
--with-stream_realip_module \
--with-http_geoip_module=dynamic \
--with-http_image_filter_module=dynamic \
--with-http_perl_module=dynamic \
--with-http_xslt_module=dynamic \
--with-mail=dynamic \
--with-stream=dynamic \
--with-stream_geoip_module=dynamic \
--add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
--add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
--add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
--add-dynamic-module=./modules/njs/nginx \
--add-dynamic-module=./modules/nginx-vod-module \
--add-module=./modules/media-framework/nginx-common \
--add-dynamic-module=./modules/nginx-stream-preread-str-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
--add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
--add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
--add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
--add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
--add-dynamic-module=./modules/media-framework/nginx-live-module \
--add-dynamic-module=./modules/nginx-srt-module \
--add-dynamic-module=./modules/media-framework/nginx-pckg-module \
--add-dynamic-module=./modules/nginx-secure-token-module

66
configure.sh Executable file
View file

@ -0,0 +1,66 @@
#!/bin/bash
./configure \
--with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/usr/local/include/quickjs/" \
--with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/usr/local/lib/quickjs/" \
--prefix=/usr/local/temp/nginx/ \
--error-log-path=stderr \
--lock-path=/var/lock/nginx.lock \
--pid-path=/run/nginx.pid \
--with-compat \
--with-debug \
--with-pcre-jit \
--with-http_ssl_module \
--with-http_stub_status_module \
--with-http_realip_module \
--with-http_auth_request_module \
--with-http_v2_module \
--with-http_dav_module \
--with-http_slice_module \
--with-threads \
--with-http_addition_module \
--with-http_flv_module \
--with-http_gunzip_module \
--with-http_gzip_static_module \
--with-http_mp4_module \
--with-http_random_index_module \
--with-http_secure_link_module \
--with-http_sub_module \
--with-mail_ssl_module \
--with-stream_ssl_module \
--with-stream_ssl_preread_module \
--with-stream_realip_module \
--with-http_geoip_module=dynamic \
--with-http_image_filter_module=dynamic \
--with-http_perl_module=dynamic \
--with-http_xslt_module=dynamic \
--with-mail=dynamic \
--with-stream=dynamic \
--with-stream_geoip_module=dynamic \
--add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
--add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
--add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
--add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
--add-dynamic-module=./modules/njs/nginx \
--add-dynamic-module=./modules/nginx-vod-module \
--add-module=./modules/media-framework/nginx-common \
--add-dynamic-module=./modules/nginx-stream-preread-str-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
--add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
--add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
--add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
--add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
--add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
--add-dynamic-module=./modules/media-framework/nginx-live-module \
--add-dynamic-module=./modules/nginx-srt-module \
--add-dynamic-module=./modules/media-framework/nginx-pckg-module \
--add-dynamic-module=./modules/nginx-secure-token-module

63
debian/README.source vendored Normal file
View file

@ -0,0 +1,63 @@
Debian Packaging
================
We use git-buildpackage for packaging.
Workflow for Unstable
=====================
We use the standard git-buildpackage workflow.
Dynamic Modules
===============
Since v1.9.11 Nginx added dynamic module support. This will sanitize the
nginx packaging flow in the long term, but there is a lot work to be done
in order to get there. We gradually convert all modules to dynamic
as they add support for it.
[0] https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/
Workflow for Experimental
=========================
Nginx mainline releases (1.11.x series) are been packaged for experimental,
as they lack security support.
The workflow we use is based on the assumption that packaging work happens on
origin/master and experimental builds are a trivial patch away from that.
The direct consequence of treating experimental as a patchset for origin/master
is that the relevant branches are forced-pushed whenever we release a new
1.11.x version. In other words, **it is not safe to base your work on the
experimental branch**.
This is a brief description of our experimental branches and how we are using
them.
* experimental-base
Force-pushed when origin/master changes.
experimental-base tracks the changes needed for building the 1.11.x branch,
such as new configure parameters, etc. On new 1.11.x releases, it is rebased
on origin/master so it is always up-to-date with our latest packaging work.
* experimental
Force-pushed on every 1.11.x release.
This branch points to the latest 1.11.x release.
Before release this branch is reset to experimental-base, and then merged
with the new upstream-1.11 branch. Finally all the release specific changes
are commited (changelog entry etc) and the build is made.
* upstream-1.11
Pushed on every 1.11.x release.
Before a new 1.11.x release origin/upstream is dummy merged (-s ours) into
ustream-1.11. This is a technicallity so we can avoid resolving conflicts
when a new 1.10.x release happens between two experimental releases.
Older 1.11.x releases are not referenced by any branch, but they can be found
by the relevant debian/* tag.

19
debian/apport/source_nginx.py vendored Normal file
View file

@ -0,0 +1,19 @@
'''
apport package hook for nginx packages
Copyright (c) 2015, Thomas Ward <teward@ubuntu.com>
'''
import apport.hookutils
import os
import subprocess
def add_info(report, ui):
if (report['Package'].split()[0] != 'nginx-common'
and report['ProblemType'] == 'Package'
and os.path.isdir('/run/systemd/system')):
report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
['journalctl', '-xe', '--unit=nginx.service'])
report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen(
['systemctl', '-l', 'status', 'nginx.service'],
stdout=subprocess.PIPE).communicate()[0]

26
debian/autoscripts/postinst-nginx vendored Normal file
View file

@ -0,0 +1,26 @@
for confpair in #NAMES# ; do
from=$(echo $confpair | cut -d: -f1)
to=$(echo $confpair | cut -d: -f2)
if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
rm /etc/nginx/modules-enabled/$to.removed
removed_link=true
else
removed_link=false
fi
# Symlink on
# 1) Fresh installations
# 2) Reinstalls after automatic removes (preserve admin actions)
if [ -z "$2" -o "$removed_link" = "true" ]; then
ln -sf /usr/share/nginx/modules-available/$from \
/etc/nginx/modules-enabled/$to
fi
done
if [ "$1" = "configure" ] ; then
if which dpkg-trigger >/dev/null 2>&1 ; then
dpkg-trigger --no-await nginx-reload
fi
fi

28
debian/autoscripts/postrm-nginx vendored Normal file
View file

@ -0,0 +1,28 @@
if [ "$1" = "purge" ] ; then
for confpair in #NAMES# ; do
from=$(echo $confpair | cut -d: -f1)
to=$(echo $confpair | cut -d: -f2)
if [ -L /etc/nginx/modules-enabled/$to ]; then
rm /etc/nginx/modules-enabled/$to
fi
if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
rm /etc/nginx/modules-enabled/$to.removed
fi
done
fi
if [ "$1" = "remove" ] ; then
for confpair in #NAMES# ; do
from=$(echo $confpair | cut -d: -f1)
to=$(echo $confpair | cut -d: -f2)
if [ -L /etc/nginx/modules-enabled/$to ]; then
mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
fi
done
if which dpkg-trigger >/dev/null 2>&1 ; then
dpkg-trigger --no-await nginx-reload
fi
fi

10
debian/autoscripts/prerm-nginx vendored Normal file
View file

@ -0,0 +1,10 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
for confpair in #NAMES# ; do
from=$(echo $confpair | cut -d: -f1)
to=$(echo $confpair | cut -d: -f2)
if [ -L /etc/nginx/modules-enabled/$to ]; then
mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
fi
done
fi

2897
debian/changelog vendored Normal file

File diff suppressed because it is too large Load diff

27
debian/conf/fastcgi.conf vendored Normal file
View file

@ -0,0 +1,27 @@
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param REQUEST_SCHEME $scheme;
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param REMOTE_USER $remote_user;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
# PHP only, required if PHP was built with --enable-force-cgi-redirect
fastcgi_param REDIRECT_STATUS 200;

26
debian/conf/fastcgi_params vendored Normal file
View file

@ -0,0 +1,26 @@
fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param CONTENT_TYPE $content_type;
fastcgi_param CONTENT_LENGTH $content_length;
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
fastcgi_param REQUEST_URI $request_uri;
fastcgi_param DOCUMENT_URI $document_uri;
fastcgi_param DOCUMENT_ROOT $document_root;
fastcgi_param SERVER_PROTOCOL $server_protocol;
fastcgi_param REQUEST_SCHEME $scheme;
fastcgi_param HTTPS $https if_not_empty;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
fastcgi_param REMOTE_ADDR $remote_addr;
fastcgi_param REMOTE_PORT $remote_port;
fastcgi_param REMOTE_USER $remote_user;
fastcgi_param SERVER_ADDR $server_addr;
fastcgi_param SERVER_PORT $server_port;
fastcgi_param SERVER_NAME $server_name;
# PHP only, required if PHP was built with --enable-force-cgi-redirect
fastcgi_param REDIRECT_STATUS 200;

109
debian/conf/koi-utf vendored Normal file
View file

@ -0,0 +1,109 @@
# This map is not a full koi8-r <> utf8 map: it does not contain
# box-drawing and some other characters. Besides this map contains
# several koi8-u and Byelorussian letters which are not in koi8-r.
# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
# map instead.
charset_map koi8-r utf-8 {
80 E282AC ; # euro
95 E280A2 ; # bullet
9A C2A0 ; # &nbsp;
9E C2B7 ; # &middot;
A3 D191 ; # small yo
A4 D194 ; # small Ukrainian ye
A6 D196 ; # small Ukrainian i
A7 D197 ; # small Ukrainian yi
AD D291 ; # small Ukrainian soft g
AE D19E ; # small Byelorussian short u
B0 C2B0 ; # &deg;
B3 D081 ; # capital YO
B4 D084 ; # capital Ukrainian YE
B6 D086 ; # capital Ukrainian I
B7 D087 ; # capital Ukrainian YI
B9 E28496 ; # numero sign
BD D290 ; # capital Ukrainian soft G
BE D18E ; # capital Byelorussian short U
BF C2A9 ; # (C)
C0 D18E ; # small yu
C1 D0B0 ; # small a
C2 D0B1 ; # small b
C3 D186 ; # small ts
C4 D0B4 ; # small d
C5 D0B5 ; # small ye
C6 D184 ; # small f
C7 D0B3 ; # small g
C8 D185 ; # small kh
C9 D0B8 ; # small i
CA D0B9 ; # small j
CB D0BA ; # small k
CC D0BB ; # small l
CD D0BC ; # small m
CE D0BD ; # small n
CF D0BE ; # small o
D0 D0BF ; # small p
D1 D18F ; # small ya
D2 D180 ; # small r
D3 D181 ; # small s
D4 D182 ; # small t
D5 D183 ; # small u
D6 D0B6 ; # small zh
D7 D0B2 ; # small v
D8 D18C ; # small soft sign
D9 D18B ; # small y
DA D0B7 ; # small z
DB D188 ; # small sh
DC D18D ; # small e
DD D189 ; # small shch
DE D187 ; # small ch
DF D18A ; # small hard sign
E0 D0AE ; # capital YU
E1 D090 ; # capital A
E2 D091 ; # capital B
E3 D0A6 ; # capital TS
E4 D094 ; # capital D
E5 D095 ; # capital YE
E6 D0A4 ; # capital F
E7 D093 ; # capital G
E8 D0A5 ; # capital KH
E9 D098 ; # capital I
EA D099 ; # capital J
EB D09A ; # capital K
EC D09B ; # capital L
ED D09C ; # capital M
EE D09D ; # capital N
EF D09E ; # capital O
F0 D09F ; # capital P
F1 D0AF ; # capital YA
F2 D0A0 ; # capital R
F3 D0A1 ; # capital S
F4 D0A2 ; # capital T
F5 D0A3 ; # capital U
F6 D096 ; # capital ZH
F7 D092 ; # capital V
F8 D0AC ; # capital soft sign
F9 D0AB ; # capital Y
FA D097 ; # capital Z
FB D0A8 ; # capital SH
FC D0AD ; # capital E
FD D0A9 ; # capital SHCH
FE D0A7 ; # capital CH
FF D0AA ; # capital hard sign
}

103
debian/conf/koi-win vendored Normal file
View file

@ -0,0 +1,103 @@
charset_map koi8-r windows-1251 {
80 88 ; # euro
95 95 ; # bullet
9A A0 ; # &nbsp;
9E B7 ; # &middot;
A3 B8 ; # small yo
A4 BA ; # small Ukrainian ye
A6 B3 ; # small Ukrainian i
A7 BF ; # small Ukrainian yi
AD B4 ; # small Ukrainian soft g
AE A2 ; # small Byelorussian short u
B0 B0 ; # &deg;
B3 A8 ; # capital YO
B4 AA ; # capital Ukrainian YE
B6 B2 ; # capital Ukrainian I
B7 AF ; # capital Ukrainian YI
B9 B9 ; # numero sign
BD A5 ; # capital Ukrainian soft G
BE A1 ; # capital Byelorussian short U
BF A9 ; # (C)
C0 FE ; # small yu
C1 E0 ; # small a
C2 E1 ; # small b
C3 F6 ; # small ts
C4 E4 ; # small d
C5 E5 ; # small ye
C6 F4 ; # small f
C7 E3 ; # small g
C8 F5 ; # small kh
C9 E8 ; # small i
CA E9 ; # small j
CB EA ; # small k
CC EB ; # small l
CD EC ; # small m
CE ED ; # small n
CF EE ; # small o
D0 EF ; # small p
D1 FF ; # small ya
D2 F0 ; # small r
D3 F1 ; # small s
D4 F2 ; # small t
D5 F3 ; # small u
D6 E6 ; # small zh
D7 E2 ; # small v
D8 FC ; # small soft sign
D9 FB ; # small y
DA E7 ; # small z
DB F8 ; # small sh
DC FD ; # small e
DD F9 ; # small shch
DE F7 ; # small ch
DF FA ; # small hard sign
E0 DE ; # capital YU
E1 C0 ; # capital A
E2 C1 ; # capital B
E3 D6 ; # capital TS
E4 C4 ; # capital D
E5 C5 ; # capital YE
E6 D4 ; # capital F
E7 C3 ; # capital G
E8 D5 ; # capital KH
E9 C8 ; # capital I
EA C9 ; # capital J
EB CA ; # capital K
EC CB ; # capital L
ED CC ; # capital M
EE CD ; # capital N
EF CE ; # capital O
F0 CF ; # capital P
F1 DF ; # capital YA
F2 D0 ; # capital R
F3 D1 ; # capital S
F4 D2 ; # capital T
F5 D3 ; # capital U
F6 C6 ; # capital ZH
F7 C2 ; # capital V
F8 DC ; # capital soft sign
F9 DB ; # capital Y
FA C7 ; # capital Z
FB D8 ; # capital SH
FC DD ; # capital E
FD D9 ; # capital SHCH
FE D7 ; # capital CH
FF DA ; # capital hard sign
}

101
debian/conf/mime.types vendored Normal file
View file

@ -0,0 +1,101 @@
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/avif avif;
image/png png;
image/svg+xml svg svgz;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/webp webp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
font/woff woff;
font/woff2 woff2;
application/java-archive jar war ear;
application/json json;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.apple.mpegurl m3u8;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt;
application/vnd.oasis.opendocument.graphics odg;
application/vnd.oasis.opendocument.presentation odp;
application/vnd.oasis.opendocument.spreadsheet ods;
application/vnd.oasis.opendocument.text odt;
application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
xlsx;
application/vnd.openxmlformats-officedocument.wordprocessingml.document
docx;
application/vnd.wap.wmlc wmlc;
application/wasm wasm;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/xslt+xml xsl xslt;
application/xspf+xml xspf;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp2t ts;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/ogg ogv;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-matroska mkv;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}

84
debian/conf/nginx.conf vendored Normal file
View file

@ -0,0 +1,84 @@
user www-data;
worker_processes auto;
worker_cpu_affinity auto;
pid /run/nginx.pid;
error_log /var/log/nginx/error.log;
include /etc/nginx/modules-enabled/*.conf;
events {
worker_connections 768;
# multi_accept on;
}
http {
##
# Basic Settings
##
sendfile on;
tcp_nopush on;
types_hash_max_size 2048;
server_tokens off; # Recommended practice is to turn this off
# server_names_hash_bucket_size 64;
# server_name_in_redirect off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
##
# SSL Settings
##
ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3 (POODLE), TLS 1.0, 1.1
ssl_prefer_server_ciphers off; # Don't force server cipher order.
##
# Logging Settings
##
access_log /var/log/nginx/access.log;
##
# Gzip Settings
##
gzip on;
# gzip_vary on;
# gzip_proxied any;
# gzip_comp_level 6;
# gzip_buffers 16 8k;
# gzip_http_version 1.1;
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
##
# Virtual Host Configs
##
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
}
#mail {
# # See sample authentication script at:
# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
#
# # auth_http localhost/auth.php;
# # pop3_capabilities "TOP" "USER";
# # imap_capabilities "IMAP4rev1" "UIDPLUS";
#
# server {
# listen localhost:110;
# protocol pop3;
# proxy on;
# }
#
# server {
# listen localhost:143;
# protocol imap;
# proxy on;
# }
#}

4
debian/conf/proxy_params vendored Normal file
View file

@ -0,0 +1,4 @@
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;

17
debian/conf/scgi_params vendored Normal file
View file

@ -0,0 +1,17 @@
scgi_param REQUEST_METHOD $request_method;
scgi_param REQUEST_URI $request_uri;
scgi_param QUERY_STRING $query_string;
scgi_param CONTENT_TYPE $content_type;
scgi_param DOCUMENT_URI $document_uri;
scgi_param DOCUMENT_ROOT $document_root;
scgi_param SCGI 1;
scgi_param SERVER_PROTOCOL $server_protocol;
scgi_param REQUEST_SCHEME $scheme;
scgi_param HTTPS $https if_not_empty;
scgi_param REMOTE_ADDR $remote_addr;
scgi_param REMOTE_PORT $remote_port;
scgi_param SERVER_PORT $server_port;
scgi_param SERVER_NAME $server_name;

91
debian/conf/sites-available/default vendored Normal file
View file

@ -0,0 +1,91 @@
##
# You should look at the following URL's in order to grasp a solid understanding
# of Nginx configuration files in order to fully unleash the power of Nginx.
# https://www.nginx.com/resources/wiki/start/
# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
# https://wiki.debian.org/Nginx/DirectoryStructure
#
# In most cases, administrators will remove this file from sites-enabled/ and
# leave it as reference inside of sites-available where it will continue to be
# updated by the nginx packaging team.
#
# This file will automatically load configuration files provided by other
# applications, such as Drupal or Wordpress. These applications will be made
# available underneath a path with that package name, such as /drupal8.
#
# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
##
# Default server configuration
#
server {
listen 80 default_server;
listen [::]:80 default_server;
# SSL configuration
#
# listen 443 ssl default_server;
# listen [::]:443 ssl default_server;
#
# Note: You should disable gzip for SSL traffic.
# See: https://bugs.debian.org/773332
#
# Read up on ssl_ciphers to ensure a secure configuration.
# See: https://bugs.debian.org/765782
#
# Self signed certs generated by the ssl-cert package
# Don't use them in a production server!
#
# include snippets/snakeoil.conf;
root /var/www/html;
# Add index.php to the list if you are using PHP
index index.html index.htm index.nginx-debian.html;
server_name _;
location / {
# First attempt to serve request as file, then
# as directory, then fall back to displaying a 404.
try_files $uri $uri/ =404;
}
# pass PHP scripts to FastCGI server
#
#location ~ \.php$ {
# include snippets/fastcgi-php.conf;
#
# # With php-fpm (or other unix sockets):
# fastcgi_pass unix:/run/php/php7.4-fpm.sock;
# # With php-cgi (or other tcp sockets):
# fastcgi_pass 127.0.0.1:9000;
#}
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
#location ~ /\.ht {
# deny all;
#}
}
# Virtual Host configuration for example.com
#
# You can move that to a different file under sites-available/ and symlink that
# to sites-enabled/ to enable it.
#
#server {
# listen 80;
# listen [::]:80;
#
# server_name example.com;
#
# root /var/www/example.com;
# index index.html;
#
# location / {
# try_files $uri $uri/ =404;
# }
#}

13
debian/conf/snippets/fastcgi-php.conf vendored Normal file
View file

@ -0,0 +1,13 @@
# regex to split $uri to $fastcgi_script_name and $fastcgi_path
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
# Check that the PHP script exists before passing it
try_files $fastcgi_script_name =404;
# Bypass the fact that try_files resets $fastcgi_path_info
# see: http://trac.nginx.org/nginx/ticket/321
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
fastcgi_index index.php;
include fastcgi.conf;

5
debian/conf/snippets/snakeoil.conf vendored Normal file
View file

@ -0,0 +1,5 @@
# Self signed certificates generated by the ssl-cert package
# Don't use them in a production server!
ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;

17
debian/conf/uwsgi_params vendored Normal file
View file

@ -0,0 +1,17 @@
uwsgi_param QUERY_STRING $query_string;
uwsgi_param REQUEST_METHOD $request_method;
uwsgi_param CONTENT_TYPE $content_type;
uwsgi_param CONTENT_LENGTH $content_length;
uwsgi_param REQUEST_URI $request_uri;
uwsgi_param PATH_INFO $document_uri;
uwsgi_param DOCUMENT_ROOT $document_root;
uwsgi_param SERVER_PROTOCOL $server_protocol;
uwsgi_param REQUEST_SCHEME $scheme;
uwsgi_param HTTPS $https if_not_empty;
uwsgi_param REMOTE_ADDR $remote_addr;
uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_PORT $server_port;
uwsgi_param SERVER_NAME $server_name;

125
debian/conf/win-utf vendored Normal file
View file

@ -0,0 +1,125 @@
# This map is not a full windows-1251 <> utf8 map: it does not
# contain Serbian and Macedonian letters. If you need a full map,
# use contrib/unicode2nginx/win-utf map instead.
charset_map windows-1251 utf-8 {
82 E2809A; # single low-9 quotation mark
84 E2809E; # double low-9 quotation mark
85 E280A6; # ellipsis
86 E280A0; # dagger
87 E280A1; # double dagger
88 E282AC; # euro
89 E280B0; # per mille
91 E28098; # left single quotation mark
92 E28099; # right single quotation mark
93 E2809C; # left double quotation mark
94 E2809D; # right double quotation mark
95 E280A2; # bullet
96 E28093; # en dash
97 E28094; # em dash
99 E284A2; # trade mark sign
A0 C2A0; # &nbsp;
A1 D18E; # capital Byelorussian short U
A2 D19E; # small Byelorussian short u
A4 C2A4; # currency sign
A5 D290; # capital Ukrainian soft G
A6 C2A6; # borken bar
A7 C2A7; # section sign
A8 D081; # capital YO
A9 C2A9; # (C)
AA D084; # capital Ukrainian YE
AB C2AB; # left-pointing double angle quotation mark
AC C2AC; # not sign
AD C2AD; # soft hypen
AE C2AE; # (R)
AF D087; # capital Ukrainian YI
B0 C2B0; # &deg;
B1 C2B1; # plus-minus sign
B2 D086; # capital Ukrainian I
B3 D196; # small Ukrainian i
B4 D291; # small Ukrainian soft g
B5 C2B5; # micro sign
B6 C2B6; # pilcrow sign
B7 C2B7; # &middot;
B8 D191; # small yo
B9 E28496; # numero sign
BA D194; # small Ukrainian ye
BB C2BB; # right-pointing double angle quotation mark
BF D197; # small Ukrainian yi
C0 D090; # capital A
C1 D091; # capital B
C2 D092; # capital V
C3 D093; # capital G
C4 D094; # capital D
C5 D095; # capital YE
C6 D096; # capital ZH
C7 D097; # capital Z
C8 D098; # capital I
C9 D099; # capital J
CA D09A; # capital K
CB D09B; # capital L
CC D09C; # capital M
CD D09D; # capital N
CE D09E; # capital O
CF D09F; # capital P
D0 D0A0; # capital R
D1 D0A1; # capital S
D2 D0A2; # capital T
D3 D0A3; # capital U
D4 D0A4; # capital F
D5 D0A5; # capital KH
D6 D0A6; # capital TS
D7 D0A7; # capital CH
D8 D0A8; # capital SH
D9 D0A9; # capital SHCH
DA D0AA; # capital hard sign
DB D0AB; # capital Y
DC D0AC; # capital soft sign
DD D0AD; # capital E
DE D0AE; # capital YU
DF D0AF; # capital YA
E0 D0B0; # small a
E1 D0B1; # small b
E2 D0B2; # small v
E3 D0B3; # small g
E4 D0B4; # small d
E5 D0B5; # small ye
E6 D0B6; # small zh
E7 D0B7; # small z
E8 D0B8; # small i
E9 D0B9; # small j
EA D0BA; # small k
EB D0BB; # small l
EC D0BC; # small m
ED D0BD; # small n
EE D0BE; # small o
EF D0BF; # small p
F0 D180; # small r
F1 D181; # small s
F2 D182; # small t
F3 D183; # small u
F4 D184; # small f
F5 D185; # small kh
F6 D186; # small ts
F7 D187; # small ch
F8 D188; # small sh
F9 D189; # small shch
FA D18A; # small hard sign
FB D18B; # small y
FC D18C; # small soft sign
FD D18D; # small e
FE D18E; # small yu
FF D18F; # small ya
}

311
debian/control vendored Normal file
View file

@ -0,0 +1,311 @@
Source: nginx
Section: httpd
Priority: optional
Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
Uploaders: Jan Mojžíš <janmojzis@debian.org>
Build-Depends: debhelper-compat (= 13),
libexpat-dev,
libgd-dev,
libgeoip-dev,
libpcre2-dev,
libperl-dev,
libssl-dev,
libxslt1-dev,
po-debconf,
zlib1g-dev
Standards-Version: 4.7.0
Homepage: https://nginx.org
Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
Rules-Requires-Root: no
Package: nginx
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
iproute2,
nginx-common (= ${source:Version}),
Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
Provides: httpd, httpd-cgi, ${nginx:abi}
Description: small, powerful, scalable web/proxy server
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
Package: nginx-doc
Architecture: all
Multi-Arch: foreign
Section: doc
Depends: ${misc:Depends}
Description: small, powerful, scalable web/proxy server - documentation
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This package provides extra documentation to help unleash the power of Nginx.
Package: nginx-common
Breaks: nginx (<< 1.22.1-8)
Replaces: nginx (<< 1.22.1-8)
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: fcgiwrap, nginx-doc, ssl-cert
Description: small, powerful, scalable web/proxy server - common files
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This package contains base configuration files used by all versions of
nginx.
Package: nginx-dev
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, ${S:Build-Depends},
${nginx:abi},
nginx (<< ${source:Version}.1~),
nginx (>= ${source:Version}),
Provides: dh-sequence-nginx
Description: nginx web/proxy server - development headers
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This package provides development headers and necessary config scripts
for the nginx web/proxy server, useful to develop and link third party
additions to the Debian nginx web/proxy server packages.
Package: nginx-core
Architecture: all
Depends: libnginx-mod-http-geoip (>= ${source:Version}),
libnginx-mod-http-geoip (<< ${source:Version}.1~),
libnginx-mod-http-image-filter (>= ${source:Version}),
libnginx-mod-http-image-filter (<< ${source:Version}.1~),
libnginx-mod-http-xslt-filter (>= ${source:Version}),
libnginx-mod-http-xslt-filter (<< ${source:Version}.1~),
libnginx-mod-mail (>= ${source:Version}),
libnginx-mod-mail (<< ${source:Version}.1~),
libnginx-mod-stream (>= ${source:Version}),
libnginx-mod-stream (<< ${source:Version}.1~),
libnginx-mod-stream-geoip (>= ${source:Version}),
libnginx-mod-stream-geoip (<< ${source:Version}.1~),
nginx (>= ${source:Version}),
nginx (<< ${source:Version}.1~),
${misc:Depends},
${shlibs:Depends}
Breaks: nginx-full (<< 1.18.0-1),
Replaces: nginx-full (<< 1.18.0-1),
Description: nginx web/proxy server (standard version)
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This metapackage provides a version of nginx identical to that of nginx-full,
but without any third-party modules, and only modules in the original
nginx code base.
.
STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
Referer, Rewrite, SCGI, Split Clients, UWSGI.
.
OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
Slice, SSI, SSL, SSL Preread, Stub Status, Substitution, Thread Pool,
Upstream, User ID, XSLT.
.
OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
.
OPTIONAL STREAM MODULES: Stream Core, GeoIP
Package: nginx-full
Architecture: all
Depends: libnginx-mod-http-auth-pam,
libnginx-mod-http-dav-ext,
libnginx-mod-http-echo,
libnginx-mod-http-geoip2,
libnginx-mod-http-subs-filter,
libnginx-mod-http-upstream-fair,
libnginx-mod-stream-geoip2,
nginx (>= ${source:Version}),
nginx (<< ${source:Version}.1~),
${misc:Depends},
${shlibs:Depends}
Description: nginx web/proxy server (standard version with 3rd parties)
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This metapackage provides a version of nginx with the complete set of
standard modules included (but omitting some of those included in
nginx-extras).
.
STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
Referer, Rewrite, SCGI, Split Clients, UWSGI.
.
OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread Pool,
Upstream, User ID, XSLT.
.
OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
.
OPTIONAL STREAM MODULES: Stream Core, GeoIP, GeoIP2
.
THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, GeoIP2, HTTP Substitutions
Upstream Fair Queue.
Package: nginx-light
Architecture: all
Depends: libnginx-mod-http-echo,
nginx (>= ${source:Version}),
nginx (<< ${source:Version}.1~),
${misc:Depends},
${shlibs:Depends}
Description: nginx web/proxy server (basic version)
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This metapackage provides a very light version of nginx with only the
minimal set of features and modules.
.
STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF,
FastCGI, Map, Proxy, Rewrite, SCGI, uWSGI.
.
OPTIONAL HTTP MODULES: Auth Request, Charset, Gzip, Gzip Precompression,
Headers, HTTP/2, Index, Log, Real IP, Slice, SSI, SSL, Stub Status, Thread
Pool, WebDAV, Upstream.
.
THIRD PARTY MODULES: Echo.
Package: nginx-extras
Architecture: any
Depends: nginx (= ${binary:Version}),
libnginx-mod-http-geoip (= ${binary:Version}),
libnginx-mod-http-image-filter (= ${binary:Version}),
libnginx-mod-http-perl (= ${binary:Version}),
libnginx-mod-http-xslt-filter (= ${binary:Version}),
libnginx-mod-mail (= ${binary:Version}),
libnginx-mod-stream (= ${binary:Version}),
libnginx-mod-stream-geoip (= ${binary:Version}),
libnginx-mod-http-auth-pam,
libnginx-mod-http-cache-purge,
libnginx-mod-http-dav-ext,
libnginx-mod-http-echo,
libnginx-mod-http-fancyindex,
libnginx-mod-http-geoip2,
libnginx-mod-http-headers-more-filter,
libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
libnginx-mod-http-subs-filter,
libnginx-mod-http-uploadprogress,
libnginx-mod-http-upstream-fair,
libnginx-mod-nchan,
libnginx-mod-stream-geoip2,
${misc:Depends},
${shlibs:Depends}
Description: nginx web/proxy server (extended version)
Nginx ("engine X") is a high-performance web and reverse proxy server
created by Igor Sysoev. It can be used both as a standalone web server
and as a proxy to reduce the load on back-end HTTP or mail servers.
.
This metapackage provides a version of nginx with the standard modules, plus
extra features and modules such as the Perl module, which allows the
addition of Perl in configuration files.
.
STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
Referer, Rewrite, SCGI, Split Clients, UWSGI.
.
OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
MP4, Embedded Perl, Random Index, Real IP, Slice, Secure Link, SSI, SSL,
SSL Preread, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
.
OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
.
OPTIONAL STREAM MODULES: Stream, GeoIP, GeoIP2
.
THIRD PARTY MODULES: Auth PAM, Cache Purge, DAV Ext, Echo, Fancy Index,
GeoIP2, Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
Upstream Fair Queue.
Package: libnginx-mod-http-geoip
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: GeoIP HTTP module for Nginx
The ngx_http_geoip module creates variables with values depending on the
client IP address, using the precompiled MaxMind databases.
.
Those variables include country, region, city, latitude, longitude, postal
code, etc.
Package: libnginx-mod-http-image-filter
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: HTTP image filter module for Nginx
The ngx_http_image_filter module is a filter that transforms images in JPEG,
GIF, and PNG formats.
.
The module supports filters such as rotate, resize, crop, quality, sharpening,
interlacing and more.
Package: libnginx-mod-http-xslt-filter
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: XSLT Transformation module for Nginx
The ngx_http_xslt_filter module is a filter that transforms XML responses
using one or more XSLT stylesheets.
.
The transformation can be adjusted by setting the relevant configuration
parameters.
Package: libnginx-mod-mail
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: Mail module for Nginx
The nginx_mail module adds mail proxy support to nginx.
.
The module supports proxying all the standard mail protocols such as IMAP,
POP3 & SMTP.
Package: libnginx-mod-stream
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: Stream module for Nginx
The nginx_stream module adds stream proxy support to nginx.
.
Stream module supports loadbalancing & proxying to TCP servers. The module
also supports ACLs/connection limiting and configuring multiple operational
parameters.
Package: libnginx-mod-stream-geoip
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
libnginx-mod-stream (= ${binary:Version}),
Recommends: nginx,
Description: GeoIP Stream module for Nginx
The ngx_stream_geoip module creates variables with values depending on the
client IP address, using the precompiled MaxMind databases.
.
Those variables include country, region, city, latitude, longitude, postal
code, etc.
Package: libnginx-mod-http-perl
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
Recommends: nginx,
Description: Perl module for Nginx
Embed Perl runtime into nginx.
.
The ngx_http_perl module is used to implement location and variable handlers
in Perl and insert Perl calls into SSI.
.
Note that this module is marked experimental.

136
debian/copyright vendored Normal file
View file

@ -0,0 +1,136 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nginx
Source: https://nginx.org/en/download.html
Files: *
Copyright: Valentin V. Bartenev
Ruslan Ermilov
Roman Arutyunyan
Maxim Dounin
2011-2024, Nginx, Inc.
2002-2021, Igor Sysoev
License: BSD-2-clause
Files: contrib/geo2nginx.pl
Copyright: 2005, Andrei Nigmatulin
License: BSD-2-clause
Files: debian/*
Copyright: 2022-2025, Jan Mojžíš <janmojzis@debian.org>
2020-2022, Ondřej Nový <onovy@debian.org>
2019-2022, Thomas Ward <teward@ubuntu.com>
2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
2011, Dmitry E. Oboukhov <unera@debian.org>
2010-2014, Michael Lustfield <michael@lustfield.net>
2009-2014, Kartik Mistry <kartik@debian.org>
2008, Jose Parrella <joseparrella@cantv.net>
2007-2009, Fabio Tranchitella <kobold@debian.org>
License: BSD-2-clause
Files: debian/apport/*
Copyright: 2015, Thomas Ward <teward@ubuntu.com>
License: BSD-2-clause
Files: debian/debhelper/*
Copyright: 2022, Miao Wang
License: Expat
Files: debian/debhelper/dh_nginx
Copyright: 2016, Christos Trochalakis <ctrochalakis@debian.org>
License: GPL-2+
Files: debian/ngx-conf/ngx-conf
Copyright: 2015, Michael Lustfield <michael@lustfield.net>
License: Expat
Files: man/*
Copyright: Nginx, Inc.
2010, 2019, Sergey A. Osokin
License: BSD-2-clause
Files: src/core/ngx_murmurhash.c
Copyright: Austin Appleby
License: public-domain
All MurmurHash versions are public domain software, and the author
disclaims all copyright to their code.
Files: src/http/modules/ngx_http_scgi_module.c
Copyright: Nginx, Inc.
Manlio Perillo (manlio.perillo@gmail.com)
Igor Sysoev
License: BSD-2-clause
Files: src/http/modules/ngx_http_uwsgi_module.c
Copyright: Nginx, Inc.
Igor Sysoev
2009, 2010, Unbit S.a.s.
2008, Manlio Perillo (manlio.perillo@gmail.com)
License: BSD-2-clause
Files: src/http/ngx_http_huff_encode.c
Copyright: Valentin V. Bartenev
Nginx, Inc.
2015, Vlad Krasnov
License: BSD-2-clause
Files: src/stream/ngx_stream_set_module.c
Copyright: Pavel Pautov
Nginx, Inc.
License: BSD-2-clause
License: BSD-2-clause
All rights reserved.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
License: GPL-2+
This is free software, licensed under:
.
The GNU General Public License, Version 2, June 1991
.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 dated June, 1991, or (at
your option) any later version.
On Debian systems, the complete text of version 2 of the GNU General
Public License can be found in '/usr/share/common-licenses/GPL-2'.

334
debian/debhelper/dh_nginx vendored Executable file
View file

@ -0,0 +1,334 @@
#! /usr/bin/perl
# dh_nginx - Nginx configuration helper
# Copyright (C) 2016 Christos Trochalakis <ctrochalakis@debian.org>
#
# This program is licensed under the terms of the GNU General
# Public License veserion 2+
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
use strict;
use File::Find;
use Debian::Debhelper::Dh_Lib;
use Dpkg::Substvars;
=head1 NAME
dh_nginx - register configuration snippets to the nginx web server
=cut
my $nginx_in_tree;
my $abi;
sub nginx_depends
{
if (!$abi) {
my $sv = Dpkg::Substvars->new();
if ($nginx_in_tree) {
$sv->load("debian/libnginx-mod.abisubstvars");
}
else {
$sv->load("/usr/share/nginx/src/debian/libnginx-mod.abisubstvars");
}
$abi = $sv->get("nginx:abi");
}
return "$abi";
}
sub nginx_api_installdir
{
return "/usr/lib/nginx/modules/";
}
sub nginx_modules_conf_installdir
{
return "usr/share/nginx/modules-available/"
}
=head1 SYNOPSIS
B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>] [B<--in-nginx-tree>]
=head1 DESCRIPTION
B<dh_nginx> is a debhelper program that is responsible for correctly installing
Nginx configuration snippets and setting postinst, prerm and dependencies in
Nginx web server modules and web applications.
It supports the following configuration types
=over 4
=item *
Nginx modules
=back
=head1 INVOCATION
%:
dh $@ --with nginx
=head1 FILES
=over 4
=item debian/I<package>.nginx
=item debian/nginx
=back
Lists files to be registered with the Nginx HTTP server. The file is
interpreted as line separated list of installation stanzas, where each entry
consists of whitespace separated values conforming to the file semantics below.
When this file is missing but the name of the package looks like a nginx module,
the module load file and its loading priority is automatically generated inferring
from the package name. In this case, I<package-name>B<.install> or other mechanisms
should be used for copying the B<.so> library into the correct place.
=head2 FILE SEMANTICS
Each line consists of a triple
I<type> I<file> [I<arguments>]
where the values are interpreted as follows:
=head3 I<type>
Denotes the type of file to be installed. Recognized values are B<mod> for
Nginx modules.
=head3 I<file>
Is interpreted as existing file name within the source package. No path
expansion is effectuated. Just like L<dh_install(1)>, B<dh_nginx> can not
rename files.
=head3 I<arguments>
Is inrerpreted as optional arguments if any, currently not used.
=head2 MODULES
Modules are handled specially and are determined by the B<mod> type. Modules must
have a I<.conf> suffix. In that case the file is interpreted as module load
file and is installed to I</etc/nginx/modules-available>. If the file is ending
with a I<.so> suffix it is interpreted as actual module shared object and is
installed to the Nginx module directory, an optional numeric priority can be
set as the last argument to handle module dependencies.
=head1 OPTIONS
=over 4
=item B<-e>, B<--noenable>
Install maintainer scripts accordingly, but do not enable the scripts or
configuration by default.
=item B<-n>, B<--noscripts>
Do not modify F<postinst>/F<postrm>/F<prerm> maintainer scripts.
=item B<--in-nginx-tree>
Specify this option when building in-tree modules along with nginx. When
specified, nginx abi version is not required in package name.
=back
=head1 NOTES
Note that this command is not idempotent. L<dh_prep(1)> should be called
between invocations of this command. Otherwise, it may cause multiple
instances of the same text to be added to maintainer scripts.
=head1 AUTHOR
This manual and L<dh_nginx> was written by Christos Trochalakis.
dh_nginx is heavily influnced by dh_apache2 written by Arno Toell
<debian@toell.net>.
=cut
##
## main code starts here
##
init(options => {
"e|noenable" => \$dh{NOENABLE},
"in-nginx-tree" => \$nginx_in_tree,
});
foreach my $package ((@{$dh{DOPACKAGES}}))
{
my %PACKAGE_TYPE = (
has_a_module => [],
);
my $file = pkgfile($package, "nginx");
my $tmp = tmpdir($package);
my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
my $modinstalldir = $tmp . "/" . nginx_api_installdir();
if ($file){
my @files_to_register = filedoublearray($file, ".") if $file;
foreach my $line (@files_to_register)
{
my $type = lc(shift @{$line}) if $line->[0];
my $source = shift @{$line} if $line->[0];
my @arguments = @{$line};
my $destination;
$type = "modules" if $type eq "mod";
verbose_print("$type -- $source -- @arguments\n\n");
if ($type eq "modules")
{
my $basesource = basename($source);
if ($type eq "modules")
{
if ($basesource =~ m/\.conf$/)
{
my $enablename = $basesource;
my $prio = $#arguments >= 0 ? $arguments[0] : 50;
$destination = "$prio-$basesource";
push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
}
elsif ($basesource =~ m/\.so$/)
{
verbose_print("Installing module binary $source into $modinstalldir\n");
if (! -d $modinstalldir)
{
complex_doit("mkdir","-p", $modinstalldir);
complex_doit("chmod","755","$modinstalldir");
}
complex_doit("cp", $source, $modinstalldir);
next;
}
# TODO
error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
}
if (! -d $installdir)
{
complex_doit("mkdir","-p",$installdir);
complex_doit("chmod","755","$installdir");
}
complex_doit("cp",$source,$installdir);
complex_doit("chmod","644","$installdir/$basesource");
}
else
{
error("Unknown parameter: $type\n");
}
}
} elsif ($package =~ /^libnginx-mod-/){
verbose_print("$package might be a nginx module\n");
my $module = $package;
$module =~ s/^libnginx-mod-//;
verbose_print("Guessed module name: $module\n");
my $modulepath = $module;
$modulepath =~ s/-/_/g;
if (-e "$modinstalldir/ngx_${modulepath}_module.so"){
my $prio = 50;
if ($module =~ /^\w+-/ && !($module =~ /^http-/) ){
$prio = 70;
}
verbose_print("Guessed load priority: $prio\n");
my $conf_name = "mod-$module.conf";
install_dir($installdir);
verbose_print("Installing module configuration $conf_name into $installdir prio:$prio\n");
open(MOD_CONF, $dh{NO_ACT} ? ">&STDERR" : ">$installdir/$conf_name") or error("open($installdir/$conf_name): $!");
print(MOD_CONF "load_module modules/ngx_${modulepath}_module.so;\n");
close(MOD_CONF);
chmod(0644, "$installdir/$conf_name") or error("chmod(0644, $installdir/$conf_name): $!");
push @{$PACKAGE_TYPE{'has_a_module'}}, "$conf_name:$prio-$conf_name";
} else {
verbose_print("$package is not a nginx module because $modinstalldir/ngx_${modulepath}_module.so not found");
verbose_print("If it is not correct, check if the module is installed before invoking this script");
}
}
my @postinst_autoscripts;
if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
{
if ($package !~ m/libnginx-mod-\w+?/)
{
warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
}
addsubstvar($package, "misc:Depends", nginx_depends());
my $modules = "";
foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
{
$modules .= "$module ";
}
push @postinst_autoscripts, ["module", $modules];
}
if (! $dh{NOSCRIPTS})
{
foreach my $ref (@postinst_autoscripts)
{
for my $script_type (qw/postinst prerm postrm/)
{
if ($script_type eq "postinst" && $dh{NOENABLE})
{
next
}
my %replacements = (
NAMES => $ref->[1],
);
my $sed_command = "";
foreach my $key (sort keys %replacements)
{
my $val = $replacements{$key};
# Use a control char as separator for sed, to
# reduce escaping issues. Everything else is
# passed verbatim, i.e. it must not contain any
# shell or sed special characters.
my $sep = "\x17";
$sed_command .= "s" . $sep . "#$key#" .
$sep . $val .
$sep . "g; ";
}
autoscript($package, "$script_type", "$script_type-nginx", $sed_command);
}
}
}
}
# vim: syntax=perl sw=8 sts=8 sr noet

14
debian/debhelper/nginx.pm vendored Normal file
View file

@ -0,0 +1,14 @@
#!/usr/bin/perl
use warnings;
use strict;
use Debian::Debhelper::Dh_Lib;
add_command_options( "dh_auto_test", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_configure", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_build", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_install", "--buildsystem=nginx_mod" );
add_command_options( "dh_auto_clean", "--buildsystem=nginx_mod" );
insert_after("dh_install", "dh_nginx");
1;

138
debian/debhelper/nginx_mod.pm vendored Normal file
View file

@ -0,0 +1,138 @@
# A build system class for handling nginx modules.
#
# Copyright: © 2022 Miao Wang
# License: MIT
package Debian::Debhelper::Buildsystem::nginx_mod;
use strict;
use warnings;
use Dpkg::Deps qw(deps_parse);
use Dpkg::Control::Info;
use Debian::Debhelper::Dh_Lib qw(error doit getpackages addsubstvar);
use File::Spec;
use parent qw(Debian::Debhelper::Buildsystem::makefile);
use Config;
sub DESCRIPTION {
"Nginx Module (config)"
}
sub check_auto_buildable {
my ($this, $step) = @_;
return 1 if -e $this->get_sourcepath("config");
}
sub _NGINX_SRC_DIR {
"/usr/share/nginx/src"
}
sub _NDK_SRC_DIR {
"/usr/share/nginx-ndk/src"
}
sub new {
my $class=shift;
my $this= $class->SUPER::new(@_);
my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
chomp($ngx_ver);
$this->prefer_out_of_source_building(@_);
$this->{has_ndk} = $this->has_build_dep("libnginx-mod-http-ndk-dev");
$this->{has_stream} = $this->has_build_dep("libnginx-mod-stream");
foreach my $cur (getpackages('arch')) {
if ($this->{has_ndk} == 1) {
addsubstvar($cur, "misc:Depends", "libnginx-mod-http-ndk");
}
if ($this->{has_stream} == 1) {
addsubstvar($cur, "misc:Depends", "libnginx-mod-stream (>= $ngx_ver), libnginx-mod-stream (<< $ngx_ver.1~)");
}
}
return $this;
}
sub configure {
my $this=shift;
doit({
"chdir" => $this->_NGINX_SRC_DIR,
"update_env" => {
"src_dir" => $this->get_sourcedir,
"bld_dir" => $this->get_builddir,
"pwd_dir" => $this->{cwd},
},
}, "bash", "-c", '. ./conf_flags
./configure \\
--with-cc-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CFLAGS) -fPIC $(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CPPFLAGS)" \\
--with-ld-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get LDFLAGS) -fPIC" \\
"${NGX_CONF_FLAGS[@]}" \\
--add-dynamic-module="$pwd_dir/$src_dir" \\
--builddir="$pwd_dir/$bld_dir" \\
' . ($this->{has_ndk} ? '--add-module=' . $this->_NDK_SRC_DIR : '') . ' \\
' . ($this->{has_stream} ? '--with-stream' : '') . ' \\
"$@"', "dummy", @_);
}
sub build {
my $this=shift;
$this->do_make("-f", File::Spec->catfile($this->{cwd}, $this->get_buildpath("Makefile")), "-C", $this->_NGINX_SRC_DIR, "modules");
}
sub test {
my $this=shift;
if ( $this->{has_ndk} and !grep( /^ndk_http_module.so$/, @_ ) ) {
unshift @_, "ndk_http_module.so";
}
if ( $this->{has_stream} and !grep( /^ngx_stream_module.so$/, @_ ) ) {
unshift @_, "ngx_stream_module.so";
}
$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
tmp_conf=$(mktemp -p .)
for pre_dep in "$@"; do
echo "load_module modules/$pre_dep;" >> "$tmp_conf"
done
for i in *.so; do
echo "load_module $PWD/$i;" >> "$tmp_conf"
done
echo "events{}" >> "$tmp_conf"
/usr/sbin/nginx -g "error_log /dev/null; pid /dev/null;" -t -q -c "$PWD/$tmp_conf"
rm -f "$tmp_conf"
', "dummy", @_);
}
sub install {
my $this=shift;
my $destdir=shift;
$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
destdir=$1
mkdir -p "$destdir/usr/lib/nginx/modules"
for i in *.so; do
cp "$i" "$destdir/usr/lib/nginx/modules/"
done
', "dummy", $destdir);
}
sub clean {
my $this=shift;
$this->rmdir_builddir();
}
sub has_build_dep {
my $this=shift;
my $bd=shift;
my $control = Dpkg::Control::Info->new()->get_source();
my $depends = deps_parse($control->{'Build-Depends'});
foreach (split /,\s+/,$depends) {
if ($_ =~ /$bd/) {
return 1;
}
}
return 0;
}
1

13
debian/gbp.conf vendored Normal file
View file

@ -0,0 +1,13 @@
[DEFAULT]
debian-branch = main
upstream-branch = upstream
upstream-tag = upstream/%(version)s
pristine-tar = True
sign-tags = True
upstream-signatures = on
[import-orig]
merge-mode = replace
[pull]
track-missing = True

14
debian/help/docs/fcgiwrap vendored Normal file
View file

@ -0,0 +1,14 @@
##
# File:
# fcgiwrap
# Description:
# The fcgiwrap tool allows a user to quickly and painlessly setup a socket
# to handle CGI requests. This is useful for Python, Perl, etc.
##
The easy way:
apt-get install fcgiwrap
The less-easy way:
If your distribution does not provide it, the Nginx wiki describes the steps.
http://wiki.nginx.org/Fcgiwrap

119
debian/help/docs/php vendored Normal file
View file

@ -0,0 +1,119 @@
##
# File:
# php
# Description:
# This file is meant to help users get a basic understanding of a PHP stack
# with Nginx as the web server.
##
# Note: This is not a configuration sample and comment lines will be userd differently.
== PHP Options ==
There are a number of options that can be used to provide PHP. The two most
common methods are php-cgi and php-fpm. The php-fpm option is relatively new
and is not yet a standard option. This package is stable however and is moving
toward being a standard option in distribution repositories.
== PHP-FPM ==
The php-fpm option is considerably harder to debug. However, the hardest issues
to debug should be solved by including that fastcgi_params file provided by
this package. It should at a minimum remove all silent errors.
# sudo apt-get install php5-fpm
If you do not have php5-fpm available, you will want to add the repository for
the package. https://launchpad.net/~nginx/+archive/php5
In php5-fpm, you will want to edit the php pool.
Edit /etc/php5/fpm/pool.d/www.conf
The listen directive is the most important piece in this file. It is suggested
to listen to a local unix socket. This listen directive will be used in your
nginx configuration.
Example: listen = /tmp/phpfpm.socket
The rest of this file can be tweaked to your liking.
== PHP-CGI ==
The simplest and easiest method to run PHP is to use php-cgi. It does not offer
the ability to monitor and restart processes that hang or die however.
# sudo apt-get install php5-cgi
To make php5-cgio work, you will need to create an init script.
===== FILE: /etc/init.d/phpcgi =====
#!/bin/bash
#
### BEGIN INIT INFO
# Provides: php-fcgi
# Required-Start: $local_fs $remote_fs $network $syslog
# Required-Stop: $local_fs $remote_fs $network $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: starts php-cgi processes
# Description: starts php-cgi using start-stop-daemon for each user
### END INIT INFO
# Number of PHP processes to be able to handle connections.
CHILD=10
# Maximum number of requests each child should handle before being regenerated
MAX_REQS=750
start() {
start-stop-daemon --quiet --start --background --chuid "www-data" \
--exec /usr/bin/env \
-- - USER="www-data" \
PATH=/usr/bin PHP_FCGI_CHILDREN=$CHILD PHP_FCGI_MAX_REQUESTS=$MAX_REQS \
php-cgi -b /tmp/phpcgi.socket &
}
stop() {
killall -w php-cgi
rm /tmp/phpcgi.socket
sync
sleep 1
}
case "$1" in
start) start;;
stop) stop;;
restart) stop; start;;
*) echo "Usage: php-fastcgi {start|stop|restart} [user]"; exit 1;;
esac
===== END FILE =====
# Make file executable
chmod +x /etc/init.d/phpcgi
# Add file to startup
update-rc.d phpcgi defaults
== Using PHP in Nginx ==
In order to use the sockets you created (/tmp/phpfpm.socket or /tmp/phpcgi.socket)
you will need to add a php block to your Nignx configuration.
# This block adds a little security.
# See /usr/share/doc/nginx/examples/drupal for context
location ~ \..*/.*\.php$ {
return 403;
}
# This is basic PHP block that can be used to handle all PHP requests.
# See /usr/share/doc/nginx/examples/drupal for context
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
# Intercepting errors will cause PHP errors to appear in Nginx logs
fastcgi_intercept_errors on;
fastcgi_pass unix:/tmp/phpcgi.socket;
}
# The above example will use php5-cgi which is bound to /tmp/phpcgi.socket.
# If you choose to use php5-fpm the example above will bind to /tmp/phpcgi.socket
# instead and this should be used for fastcgi_pass instead.

28
debian/help/docs/support-irc vendored Normal file
View file

@ -0,0 +1,28 @@
##
# File:
# support-irc
# Description:
# This file explains how to get support on IRC.
##
Nginx has a moderately active IRC channel on Freenode.
You can get there by:
* Client
Using an IRC Client and pointing it to:
#nginx on irc.freenode.net
* Browser
Opening a web browser and pointing it to:
http://webchat.freenode.net?channels=nginx
Common sense is expected to be followed:
* Code of Conduct
http://www.ubuntu.com/community/conduct
* IRC Etiquette
http://www.ircbeginner.com/ircinfo/etiquette.html
* Patience
If somebody doesn't answer you right away, then wait.
Even active IRC users have to run off sometimes.
If you need more help with IRC The Linux Documentation Project has more information:
http://tldp.org/HOWTO/IRC/beginners.html

51
debian/help/docs/upstream vendored Normal file
View file

@ -0,0 +1,51 @@
##
# File:
# upstream
# Description:
# This file describes how to use upstream blocks.
##
An upstream block allows you to set a list of upstream locations for both
proxy_pass and fastcgi_pass directives.
Examples of upstream blocks:
# PHP listening on the same server
upstream php {
# ip_hash ensures the same backend is used for client reconnects.
ip_hash;
# This assumes we have multiple PHP listeners on different known ports.
server 127.0.0.1:9000;
server 127.0.0.1:9001;
server 127.0.0.1:9002;
server 127.0.0.1:9003;
# In addition to listening on ports, we can listen to unix sockets.
server unix:/tmp/php-cgi.socket;
}
# Multiple backend Apache instances on separate servers
upstream apache {
# Adding a weight alters the chance the upstream server will be used.
server apache1.domain.com weight 5;
server apache2.domain.com;
server apache3.domain.com;
# Adding 'down' keeps the upstream from being used. Useful for downtime management.
server apache4.domain.com down;
server apache5.domain.com;
}
Using an upstream location:
# Passing PHP to upstream
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
fastcgi_pass php;
}
# Passing all requests for /cgi-bin/* to Apache upstreams.
location /cgi-bin {
proxy_pass apache;
}
For more information see http://wiki.nginx.org/HttpUpstreamModule

114
debian/help/examples/drupal vendored Normal file
View file

@ -0,0 +1,114 @@
##
# File:
# drupal
# Description:
# This file is meant to offer a very detailed set of instructions and best
# practices for deploying a Drupal website with Nginx. This file should be
# almost drop-in if the user is able to understand the three lines that
# need to be changed.
##
server {
# This is the URI of your website. You can specify multiple sites to be
# served by the same Drupal installation.
server_name domain.com www.domain.com .example.net;
# This is the root of the Drupal directory.
# Note that Drupal 6, Drupal 7, and Pressflow are interchangeable
root /var/www/drupal6;
# In some cases a favicon does not exist but this is not something you
# normally need to worry about. It's also a microscopic image and will
# just clutter the logs.
location = /favicon.ico {
log_not_found off;
access_log off;
}
# This is for the robots.txt file used by search engines.
location = /robots.txt {
# If you have one, you want to allow them access to it.
allow all;
# If you don't have one, you don't want to fill your logs with
# not found errors.
log_not_found off;
access_log off;
}
# This matters if you use drush because drush copies backups of modules
# to this directory. In the event personal information wound up in the
# module, you want to know outside users can't access it.
location = /backup {
deny all;
}
# Very rarely should these ever be accessed outside of your lan
# The above location for robots.txt is an exact match and will override
# this location block.
location ~* \.(txt|log)$ {
allow 192.168.0.0/16;
deny all;
}
# This location block protects against a known attack. It happens if
# the attacker uploads a non-php file and attempts to run it as a
# php file on the server.
location ~ \..*/.*\.php$ {
return 403;
}
# This is our primary location block. The try_files directive will
# attempt to serve the data in the order listed. First try the exact
# request (such as an image or text file). If it doesn't exist, see if
# the directory exists. If not, then we move to the rewrite which is
# used for the front-end controller pattern.
location / {
try_files $uri $uri/ @rewrite;
}
# This will rewrite our request from domain.com/node/1/ to domain.com/index.php?q=node/1
# This could be done in try_files without a rewrite however, the GlobalRedirect
# module enforces no slash (/) at the end of URL's. This rewrite removes that
# so no infinite redirect loop is reached.
location @rewrite {
rewrite ^/(.*)$ /index.php?q=$1;
}
# If a PHP file is served, this block will handle the request. This block
# works on the assumption you are using php-cgi listening on /tmp/phpcgi.socket.
# Please see the php example (usr/share/doc/nginx/exmaples/php) for more
# information about setting up PHP.
# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
# Intercepting errors will cause PHP errors to appear in Nginx logs
fastcgi_intercept_errors on;
fastcgi_pass unix:/tmp/phpcgi.socket;
}
# The ImageCache module builds an image 'on the fly' which means that
# if it doesn't exist, it needs to be created. Nginx is king of static
# so there's no point in letting PHP decide if it needs to be servered
# from an existing file.
# If the image can't be served directly, it's assumed that it doesn't
# exist and is passed off to PHP via our previous rewrite to let PHP
# create and serve the image.
# Notice that try_files does not have $uri/ in it. This is because an
# image should never be a directory. So there's no point in wasting a
# stat to serve it that way.
location ~ ^/sites/.*/files/imagecache/ {
try_files $uri @rewrite;
}
# As mentioned above, Nignx is king of static. If we're serving a static
# file that ends with one of the following extensions, it is best to set
# a very high expires time. This will generate fewer requests for the
# file. These requests will be logged if found, but not if they don't
# exist.
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
expires max;
log_not_found off;
}
}

58
debian/help/examples/http vendored Normal file
View file

@ -0,0 +1,58 @@
##
# File:
# http
# Description:
# This file is meant to deliver a basic understanding of the http block.
##
# All web configuration should be inside of the http block.
# Most settings here are pretty self explanatory.
# See http://wiki.nginx.org/HttpCoreModule for details.
http {
##
# Basic Settings
##
sendfile on;
tcp_nopush on;
tcp_nodelay on;
keepalive_timeout 65;
# server_tokens off;
# server_names_hash_bucket_size 64;
# server_name_in_redirect off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
##
# Logging Settings
##
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
##
# Gzip Settings
##
gzip on;
# gzip_vary on;
# gzip_proxied any;
# gzip_comp_level 6;
# gzip_buffers 16 8k;
# gzip_http_version 1.1;
# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
##
# Virtual Host Configs
# These lines will include:
# any files in /etc/nginx/sites-enabled/
# and any in /etc/nginx/conf.d/ ending with .conf
##
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
}

30
debian/help/examples/mail vendored Normal file
View file

@ -0,0 +1,30 @@
##
# File:
# mail
# Description:
# Provides a basic example of a mail proxy.
##
# All mail proxy configuration should be inside of the mail block.
# Most settings here are pretty self explanatory.
# See http://wiki.nginx.org/MailCoreModule
mail {
# See sample authentication script at:
# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
# auth_http localhost/auth.php;
# pop3_capabilities "TOP" "USER";
# imap_capabilities "IMAP4rev1" "UIDPLUS";
server {
listen localhost:110;
protocol pop3;
proxy on;
}
server {
listen localhost:143;
protocol imap;
proxy on;
}
}

59
debian/help/examples/mailman vendored Normal file
View file

@ -0,0 +1,59 @@
##
# File:
# mailman
# Description:
# This file explains how to install MailMan and offers a nearly drop-in
# model if MailMan was installed from Debian/Ubuntu repositories.
##
server {
# This is the URI of your website. You can specify multiple sites to be
# served by the same Drupal installation.
server_name lists.DOMAIN.TLD;
# This is the default MailMan root directory.
root /usr/lib/cgi-bin;
# If the request is exactly the server_name, then we need to redirect
# the browser to the listinfo page. Notice the = for an exact match.
location = / {
rewrite ^ /mailman/listinfo permanent;
}
# Any requests need to be rewritten to /mailman/.
# This happens only if no other location block matches.
location / {
rewrite ^ /mailman$uri;
}
# If /mailmain/ was part of the request, then we need to let python
# handle the request.
location /mailman/ {
fastcgi_split_path_info (^/mailman/[^/]*)(.*)$;
include fastcgi_params;
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
# fcgiwrap was used to create this socket.
# See /usr/share/doc/nginx-doc/fcgiwrap
fastcgi_pass unix:/tmp/cgi.socket;
}
# If a request was made for an image, we need to change the directory
# that is beeing looked at. Nothing else is needed because the images
# are static content.
location /images/mailman {
alias /var/lib/mailman/icons;
}
# If a request for /pipermail was made, we are still only dealing with
# static content. The archives are at a different location and we need
# to point at it. Because these are public, there's no issue in letting
# them be browsed; autoindex is turned on to allow browsing.
location /pipermail {
alias /var/lib/mailman/archives/public;
autoindex on;
}
}

34
debian/help/examples/nginx.conf vendored Normal file
View file

@ -0,0 +1,34 @@
##
# File:
# nginx.conf
# Description:
# Provides a very basic description of the use of nginx.conf.
##
# For more options with more detailed descriptions:
# See http://wiki.nginx.org/CoreModule
# Sets user/group of worker processes. If group is not specified, group is assumed
# to be the same as user. Syntax: user user [group]
user www-data;
# nginx has the ability to use more than one worker process
worker_processes 4;
# The pid-file. It can be used for the kill-command to send signals to nginx.
# Example: To reload the config: kill -HUP `cat /var/log/nginx.pid`
pid /var/run/nginx.pid;
# See http://wiki.nginx.org/HttpEventsModule
events {
worker_connections 1024;
# multi_accept on;
}
# See /usr/share/doc/nginx/examples/http
http {
}
# See /usr/share/doc/nginx/examples/mail
mail {
}

162
debian/help/examples/nginx_modsite vendored Executable file
View file

@ -0,0 +1,162 @@
#!/bin/bash
##
# File:
# nginx_modsite
# Description:
# Provides a basic script to automate enabling and disabling websites found
# in the default configuration directories:
# /etc/nginx/sites-available and /etc/nginx/sites-enabled
# For easy access to this script, copy it into the directory:
# /usr/local/sbin
# Run this script without any arguments or with -h or --help to see a basic
# help dialog displaying all options.
##
# Copyright (C) 2010 Michael Lustfield <mtecknology@ubuntu.com>
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
##
# Default Settings
##
NGINX_CONF_FILE="$(awk -F= -v RS=' ' '/conf-path/ {print $2}' <<< $(nginx -V 2>&1))"
NGINX_CONF_DIR="${NGINX_CONF_FILE%/*}"
NGINX_SITES_AVAILABLE="$NGINX_CONF_DIR/sites-available"
NGINX_SITES_ENABLED="$NGINX_CONF_DIR/sites-enabled"
SELECTED_SITE="$2"
##
# Script Functions
##
ngx_enable_site() {
[[ ! "$SELECTED_SITE" ]] &&
ngx_select_site "not_enabled"
[[ ! -e "$NGINX_SITES_AVAILABLE/$SELECTED_SITE" ]] &&
ngx_error "Site does not appear to exist."
[[ -e "$NGINX_SITES_ENABLED/$SELECTED_SITE" ]] &&
ngx_error "Site appears to already be enabled"
ln -sf "$NGINX_SITES_AVAILABLE/$SELECTED_SITE" -T "$NGINX_SITES_ENABLED/$SELECTED_SITE"
ngx_reload
}
ngx_disable_site() {
[[ ! "$SELECTED_SITE" ]] &&
ngx_select_site "is_enabled"
[[ ! -e "$NGINX_SITES_AVAILABLE/$SELECTED_SITE" ]] &&
ngx_error "Site does not appear to be \'available\'. - Not Removing"
[[ ! -e "$NGINX_SITES_ENABLED/$SELECTED_SITE" ]] &&
ngx_error "Site does not appear to be enabled."
rm -f "$NGINX_SITES_ENABLED/$SELECTED_SITE"
ngx_reload
}
ngx_list_site() {
echo "Available sites:"
ngx_sites "available"
echo "Enabled Sites"
ngx_sites "enabled"
}
##
# Helper Functions
##
ngx_select_site() {
sites_avail=($NGINX_SITES_AVAILABLE/*)
sa="${sites_avail[@]##*/}"
sites_en=($NGINX_SITES_ENABLED/*)
se="${sites_en[@]##*/}"
case "$1" in
not_enabled) sites=$(comm -13 <(printf "%s\n" $se) <(printf "%s\n" $sa));;
is_enabled) sites=$(comm -12 <(printf "%s\n" $se) <(printf "%s\n" $sa));;
esac
ngx_prompt "$sites"
}
ngx_prompt() {
sites=($1)
i=0
echo "SELECT A WEBSITE:"
for site in ${sites[@]}; do
echo -e "$i:\t${sites[$i]}"
((i++))
done
read -p "Enter number for website: " i
SELECTED_SITE="${sites[$i]}"
}
ngx_sites() {
case "$1" in
available) dir="$NGINX_SITES_AVAILABLE";;
enabled) dir="$NGINX_SITES_ENABLED";;
esac
for file in $dir/*; do
echo -e "\t${file#*$dir/}"
done
}
ngx_reload() {
read -p "Would you like to reload the Nginx configuration now? (Y/n) " reload
[[ "$reload" != "n" && "$reload" != "N" ]] && invoke-rc.d nginx reload
}
ngx_error() {
echo -e "${0##*/}: ERROR: $1"
[[ "$2" ]] && ngx_help
exit 1
}
ngx_help() {
echo "Usage: ${0##*/} [options]"
echo "Options:"
echo -e "\t<-e|--enable> <site>\tEnable site"
echo -e "\t<-d|--disable> <site>\tDisable site"
echo -e "\t<-l|--list>\t\tList sites"
echo -e "\t<-h|--help>\t\tDisplay help"
echo -e "\n\tIf <site> is left out a selection of options will be presented."
echo -e "\tIt is assumed you are using the default sites-enabled and"
echo -e "\tsites-disabled located at $NGINX_CONF_DIR."
}
##
# Core Piece
##
case "$1" in
-e|--enable) ngx_enable_site;;
-d|--disable) ngx_disable_site;;
-l|--list) ngx_list_site;;
-h|--help) ngx_help;;
*) ngx_error "No Options Selected" 1; ngx_help;;
esac

155
debian/help/examples/virtual_hosts vendored Normal file
View file

@ -0,0 +1,155 @@
##
# File:
# virtual_hosts
# Description:
# This file is meant to deliver a basic understanding of server blocks.
##
##
# You should look at the following URL's in order to grasp a solid understanding
# of Nginx configuration files in order to fully unleash the power of Nginx.
# http://wiki.nginx.org/Pitfalls
# http://wiki.nginx.org/Configuration
##
##
# Every "virtual host" that you serve will need to be in its own server block.
#
# server {
# ...
# }
#
# After reading this file, you should understand the structure of server blocks
# and be able to understand how to modify them to your needs.
##
server {
# The listen directive is only needed if this server block:
# needs to listen for IPv6
# needs to listen on another port
# If you need to listen for IPv6 then both of the following lines can
# be included.
# DO NOT listen for both SSL and non-SSL in the same server block.
#listen 80; ## listen for ipv4; this line is default and implied
#listen [::]:80 default ipv6only=on; ## listen for ipv6
# root specifies the document root for the requests
root /usr/share/nginx/www;
# index specifies the list of files (in order) to be tried in the event
# no file is requested in the URI.
index index.html index.htm;
# Make site accessible from http://localhost/
server_name localhost;
# Unless you run everything as a proxy, you will want to have a root
# location block. This example controls how files are requested.
location / {
# First attempt to serve request as file, then as directory,
# then fall back to index.html. /index.html would normally be
# front end controller pattern for handling "clean url's" in
# a CMS such as Drupal or Wordpress.
try_files $uri $uri/ /index.html;
}
# This location block would server any requests for /doc as well
# as anything below it.
location /doc {
# root changes the root directory for these requests
root /usr/share;
# autoindex on allows these request to display directory listings
# if a directory was requested
autoindex on;
# We'll allow these requests for localhost
allow 127.0.0.1;
# Anyone outside is forbidden
deny all;
}
# This location block would serve any requests for /images as well
# as anything below it.
location /images {
# This is the same as /doc except we don't allow indexes
root /usr/share;
autoindex off;
allow 127.0.0.1;
deny all;
}
# This will serve the file 404.html in the event the request is not found.
error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
# This will hit if the server generates a 500, 502, 503, or 504 status code
error_page 500 502 503 504 /50x.html;
# This location block isn't actually needed because our root for the
# server block is the same directory. However, this could be used to
# have a central directory for all error html files.
location = /50x.html {
root /usr/share/nginx/www;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
# If you're going to proxy to Apache, then just push the whole
# request to it. You'll generally have better performance with
# a dedicated php listener (fastcgi: php-cgi, php-fpm).
#location ~ \.php$ {
# proxy_pass http://127.0.0.1;
#}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
# This is used for passing to php-cgi and php-fpm.
# For more information see /usr/share/doc/nginx/examples/php
location ~ \.php$ {
# This is where the php socket is listening.
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
include fastcgi_params;
}
# deny access to .htaccess, .htpasswd, and .htgroup files
location ~ /\.ht {
deny all;
}
}
# another virtual host using mix of IP-, name-, and port-based configuration
server {
listen 8000;
listen somename:8080;
server_name somename alias another.alias;
root html;
index index.html index.htm;
location / {
try_files $uri $uri/ /index.html;
}
}
# HTTPS server
server {
listen 443;
server_name localhost;
root html;
index index.html index.htm;
ssl on;
ssl_certificate cert.pem;
ssl_certificate_key cert.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1;
ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
ssl_prefer_server_ciphers on;
location / {
try_files $uri $uri/ /index.html;
}
}

73
debian/help/examples/wordpress vendored Normal file
View file

@ -0,0 +1,73 @@
##
# File:
# wordpress
# Description:
# This file is meant to offer a basic guide to get a Wordpress site up and
# running on Nginx. This file should be almost drop-in if the user is able
# to understand the three lines that need to be changed.
##
server {
# This is the URI of your website.
server_name domain.com;
# This is the root of the Wordpress directory.
root /var/www/wordpress;
# In some cases a favicon does not exist but this is not something you
# normally need to worry about. It's also a microscopic image and will
# just clutter the logs.
location = /favicon.ico {
log_not_found off;
access_log off;
}
# This is for the robots.txt file used by search engines.
location = /robots.txt {
# If you have one, you want to allow them access to it.
allow all;
# If you don't have one, you don't want to fill your logs with
# not found errors.
log_not_found off;
access_log off;
}
# This location block protects against a known attack. It happens if
# the attacker uploads a non-PHP file and attempts to run it as a
# PHP file on the server.
location ~ \..*/.*\.php$ {
return 403;
}
# This is our primary location block. The try_files directive will
# attempt to serve the data in the order listed. First try the exact
# request (such as an image or text file). If it doesn't exist, see if
# the directory exists. If not, then we move to the last option which
# passes the request to /index.php with the requested query.
location / {
try_files $uri $uri/ /index.php?q=$uri&$args;
}
# If a PHP file is served, this block will handle the request. This block
# works on the assumption you are using php-cgi listening on /tmp/phpcgi.socket.
# Please see the PHP example (/usr/share/doc/nginx-doc/php) for more
# information about setting up PHP.
# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
# Intercepting errors will cause PHP errors to appear in Nginx logs
fastcgi_intercept_errors on;
fastcgi_pass unix:/tmp/phpcgi.socket;
}
# If we're serving a static file that ends with one of the following
# extensions, it is best to set a very high expires time. This will
# generate fewer requests for the file. These requests will be logged if
# found, but not if they don't exist.
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
expires max;
log_not_found off;
}
}

13
debian/libnginx-mod-http-geoip.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

13
debian/libnginx-mod-http-image-filter.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

7
debian/libnginx-mod-http-perl.install vendored Executable file
View file

@ -0,0 +1,7 @@
#!/usr/bin/perl -w
use Config;
my $vendorarch = substr($Config{vendorarch}, 1);
print "debian/build-bin/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
print "debian/build-bin/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";

13
debian/libnginx-mod-http-perl.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

13
debian/libnginx-mod-http-xslt-filter.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

13
debian/libnginx-mod-mail.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

13
debian/libnginx-mod-stream-geoip.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";

13
debian/libnginx-mod-stream.nginx vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

11
debian/libnginx-mod.abisubstvars vendored Normal file
View file

@ -0,0 +1,11 @@
# ABI must be changed:
# - when upstream nginx version is changed
# - when module signature is changed (e.g. time_t change from 32bit integer to 64bit integer https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069997)
# - when symbols/structures/... (exported from header files) are changed
#
# ABI format: nginx-abi-{UPSTREAM_VERSION}-{SUFFIX}
# the {SUFFIX} provides a mechanism on rare cases when there have to be ABI
# changes without upgrading the upstream nginx version, e.g. security updates
# in oldstable
nginx:abi=nginx-abi-1.26.3-1

View file

@ -0,0 +1 @@
load_module modules/ngx_http_geoip_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_http_image_filter_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_http_perl_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_http_xslt_filter_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_mail_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_stream_geoip_module.so;

View file

@ -0,0 +1 @@
load_module modules/ngx_stream_module.so;

13
debian/libnginx-mod.nginx.skeleton vendored Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/perl -w
use File::Basename;
# Guess module name
$module = basename($0, '.nginx');
$module =~ s/^libnginx-mod-//;
$modulepath = $module;
$modulepath =~ s/-/_/g;
print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";

188
debian/nginx-common.NEWS vendored Normal file
View file

@ -0,0 +1,188 @@
nginx-common (1.10.2-4) unstable; urgency=medium
Since nginx 1.9.14 Debian has gradually switched to dynamic loadable modules
for all third party modules and core modules that support it. For each
module a new binary package is introduced under the libnginx-mod-* namespace.
The modules are loadable from all nginx flavors (light,full,extras) and are
automatically registered by installing a symlink under
/etc/nginx/modules-enabled/. If you use a modified /etc/nginx/nginx.conf make
sure to include that directory.
-- Christos Trochalakis <ctrochalakis@debian.org> Sun, 22 Jan 2017 12:19:30 +0200
nginx-common (1.10.2-1) unstable; urgency=high
In order to secure nginx against privilege escalation attacks, we are
changing the way log file owners & permissions are handled so that www-data
is not allowed to symlink a logfile. /var/log/nginx is now owned by root:adm
and its permissions are changed to 0755. The package checks for such symlinks
on existing installations and informs the admin using debconf.
That unfortunately may come at a cost in terms of privacy. /var/log/nginx is
now world-readable, and nginx hardcodes permissions of non-existing logs to
0644. On systems running logrotate log files are private after the first
logrotate run, since the new log files are created with 0640 permissions.
-- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 04 Oct 2016 15:20:33 +0300
nginx-common (1.9.9-1) unstable; urgency=medium
Starting with this release we are changing the default logrotate rule to keep
daily logs for 14 days, this aligns our policy with apache2 (Bug #805322).
-- Christos Trochalakis <yatiohi@ideopolis.gr> Thu, 14 Jan 2016 10:17:33 +0200
nginx-common (1.9.6-1) unstable; urgency=medium
As of nginx 1.9.5 spdy has been replaced by the http2 module. Make sure to
replace "spdy" with "http2" in your config files.
-- Christos Trochalakis <yatiohi@ideopolis.gr> Fri, 25 Sep 2015 14:06:28 +0300
nginx-common (1.9.1-1) unstable; urgency=medium
Starting with this release, we have enabled PIE build features which allows
Address Space Layout Randomization. This is a hardening feature that
prevents some potential security issues.
While this will significantly help increase security, it can potentially cause
significant performance issues on i386 systems.
-- Michael Lustfield <michael@lustfield.net> Tue, 07 Apr 2015 18:57:45 -0500
nginx-common (1.6.2-5) unstable; urgency=medium
We have disabled SSLv3 in nginx.conf for security reasons (ref: POODLE),
don't forget to re-enable it if your site depends on it.
In this release we also include a summary of important changes since wheezy
at /usr/share/doc/nginx-common/README.Debian.
-- Christos Trochalakis <yatiohi@ideopolis.gr> Sun, 02 Nov 2014 09:10:09 +0200
nginx-common (1.6.2-3) unstable; urgency=medium
Starting with this release, we changed the default document root from
/var/www to /var/www/html, so that sensitive files from other virtual hosts
wich are typically put into some directory below /var/www are not exposed by
the default virtual host.
-- Christos Trochalakis <yatiohi@ideopolis.gr> Tue, 30 Sep 2014 17:34:58 +0300
nginx-common (1.6.1-2) unstable; urgency=medium
As of nginx-1.6.1-2 we have synced all configuration files with upstream and
we plan to keep them in sync from now on.
Unfortunately that might break existing configuration for some users. Please
check the matrix below for more information:
File Changes
-----------------------
koi-win whitespace
koi-utf whitespace
mime-types whitespace, changed js/rss mime type,
minor other changes & additions
scgi_params whitespace, added HTTPS
uwsgi_params whitespace, added HTTPS, removed UWSGI_SCHEME
fastcgi_params whitespace, removed SCRIPT_FILENAME
fastcgi.conf new upstream configuration file
Fastcgi configuration issues
============================
nginx shipped a modified `fastcgi_params`, which declared `SCRIPT_FILENAME`
fastcgi_param. This line has now been removed. From now on we are also
shipping fastcgi.conf from the upstream repository, which includes a sane
`SCRIPT_FILENAME` parameter value.
So, if you are using fastcgi_params, you can try switching to fastcgi.conf
or manually set the relevant params.
You might also want to read the documentation section before proceeding.
http://nginx.org/en/docs/http/ngx_http_fastcgi_module.html
section: $fastcgi_script_name variable.
-- Christos Trochalakis <yatiohi@ideopolis.gr> Thu, 28 Aug 2014 14:23:42 +0300
nginx-common (1.4.4-2) unstable; urgency=low
Per CVE-2013-0337 (bug #701112), we are changing /var/log/nginx permissions
to root:adm 750. If you have manipulated these permissions in any way, you
can add a dpkg-statoverride entry and the directory will not be touched.
You also have to manually set the permissions once, as dpkg doesn't do that
automatically for directories.
e.g.
chown root:adm /var/log/nginx
chmod 0755 /var/log/nginx
dpkg-statoverride --add root adm 0755 /var/log/nginx
-- Michael Lustfield <michael@lustfield.net> Sun, 24 Nov 2013 15:59:52 -0600
nginx (1.4.1-2) unstable; urgency=medium
Started with nginx 1.4.1-2 upload, nginx-naxsi-ui switched backend from
MySQL to SQLite.
This was mostly caused by the future removal of MySQL support in naxsi-ui.
Thus, the nginx maintainers decided to switch from MySQL to SQLite.
All data contained in the MySQL database is not affected by this switch but
you need to start with a clean SQLite database to ensure nginx-naxsi-ui
reliability.
-- Cyril Lavier <cyril.lavier@davromaniak.eu> Wed, 5 Jun 2013 09:45:03 +0200
nginx (0.8.53-1) unstable; urgency=low
As stated by upstream, the 0.7.x branch is consedered legacy and 0.8.x will
be the new stable branch. For this reason, the nginx maintainers decided to
upload 0.8.53 to unstable.
-- Kartik Mistry <kartik@debian.org> Fri, 26 Nov 2010 19:42:09 +0530
nginx (0.7.59-1) unstable; urgency=low
As stated by upstream, the 0.6.x branch is consedered legacy and 0.7.x will
be the new stable branch. For this reason, the nginx maintainers decided to
upload 0.7.59 to unstable.
Should you get the following error while starting nginx:
could not build the server_names_hash, you should increase
server_names_hash_bucket_size: 32
Please add the following parameter to your nginx.conf:
server_names_hash_bucket_size 100;
Where 100 is the size of your server names hash bucket. For more information
about this option, please read the following resources:
http://wiki.nginx.org/NginxHttpCoreModule#server_names_hash_bucket_size
http://thread.gmane.org/gmane.comp.web.nginx.english/820/focus=821
http://thread.gmane.org/gmane.comp.web.nginx.english/985/focus=989
-- Fabio Tranchitella <kobold@debian.org> Sun, 31 May 2009 18:30:10 +0200
nginx (0.6.30-2) unstable; urgency=low
As of May 4th., nginx 0.5.x branch is considered legacy and 0.6.x will
be the new stable branch. The announcement was made by Igor Sysoev when
releasing the last 0.5.x version, nginx 0.5.36.
Debian, the universal operating system, has provided binary packages for
both 0.5 and 0.6 branches in unstable and experimental, and will now offer
only 0.6 packages in the unstable distribution, starting with the
0.6.30-1 package.
In the future, Debian will also provide experimental packages for the
next testing branch of nginx, at the moment upstream announces it.
Should you have any problem with nginx in Debian, please file a bug in
the Debian Bug Tracking System.
-- Fabio Tranchitella <kobold@debian.org> Mon, 12 May 2008 14:24:53 +0200

36
debian/nginx-common.config vendored Executable file
View file

@ -0,0 +1,36 @@
#!/bin/sh
set -e
. /usr/share/debconf/confmodule
logdir="/var/log/nginx"
log_symlinks_check() {
# Skip new installations
[ -z "$1" ] && return
# Skip unaffected installations
dpkg --compare-versions "$1" lt-nl "1.10.2-1~" || return 0
# Check for unsecure symlinks
linked_logfiles="` find "$logdir" -type l -user www-data -name '*.log' `"
# Skip if nothing is found
[ -z "$linked_logfiles" ] && return
db_subst nginx/log-symlinks logfiles $linked_logfiles
db_input high nginx/log-symlinks || true
db_go || true
}
case "$1" in
configure|reconfigure)
log_symlinks_check "$2"
;;
*)
;;
esac
# vim: set ts=4 sts=4 sw=4 et sta ai :

12
debian/nginx-common.dirs vendored Normal file
View file

@ -0,0 +1,12 @@
etc/nginx
etc/nginx/conf.d
etc/nginx/modules-available
etc/nginx/modules-enabled
etc/nginx/sites-available
etc/nginx/sites-enabled
etc/ufw/applications.d
usr/share/nginx
usr/share/vim/addons
usr/share/vim/registry
var/lib/nginx
var/log/nginx

6
debian/nginx-common.install vendored Normal file
View file

@ -0,0 +1,6 @@
contrib/vim/* usr/share/vim/addons
debian/conf/* etc/nginx
debian/apport/source_nginx.py usr/share/apport/package-hooks
debian/ufw/nginx etc/ufw/applications.d
debian/vim/nginx.yaml usr/share/vim/registry
html/index.html usr/share/nginx/html/

1
debian/nginx-common.links vendored Normal file
View file

@ -0,0 +1 @@
usr/lib/nginx/modules usr/share/nginx/modules

10
debian/nginx-common.nginx.default vendored Normal file
View file

@ -0,0 +1,10 @@
# Note: You may want to look at the following page before setting the ULIMIT.
# http://wiki.nginx.org/CoreModule#worker_rlimit_nofile
# Set the ulimit variable if you need defaults to change.
# Example: ULIMIT="-n 4096"
#ULIMIT="-n 4096"
# Define the stop schedule for nginx
# see the start-stop-daemon --retry documentation for more information
#
#STOP_SCHEDULE="QUIT/5/TERM/5/KILL/5"

196
debian/nginx-common.nginx.init vendored Normal file
View file

@ -0,0 +1,196 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: nginx
# Required-Start: $local_fs $remote_fs $network $syslog $named
# Required-Stop: $local_fs $remote_fs $network $syslog $named
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: starts the nginx web server
# Description: starts nginx using start-stop-daemon
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/nginx
NAME=nginx
DESC=nginx
# Include nginx defaults if available
if [ -r /etc/default/nginx ]; then
. /etc/default/nginx
fi
STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}"
test -x $DAEMON || exit 0
. /lib/init/vars.sh
. /lib/lsb/init-functions
# Try to extract nginx pidfile
PID=$(cat /etc/nginx/nginx.conf | grep -Ev '^\s*#' | awk 'BEGIN { RS="[;{}]" } { if ($1 == "pid") print $2 }' | head -n1)
if [ -z "$PID" ]; then
PID=/run/nginx.pid
fi
if [ -n "$ULIMIT" ]; then
# Set ulimit if it is set in /etc/default/nginx
ulimit $ULIMIT
fi
start_nginx() {
# Start the daemon/service
#
# Returns:
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON --test > /dev/null \
|| return 1
start-stop-daemon --start --quiet --pidfile $PID --exec $DAEMON -- \
$DAEMON_OPTS 2>/dev/null \
|| return 2
}
test_config() {
# Test the nginx configuration
$DAEMON -t $DAEMON_OPTS >/dev/null 2>&1
}
stop_nginx() {
# Stops the daemon/service
#
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PID --name $NAME
RETVAL="$?"
sleep 1
return "$RETVAL"
}
reload_nginx() {
# Function that sends a SIGHUP to the daemon/service
start-stop-daemon --stop --signal HUP --quiet --pidfile $PID --name $NAME
return 0
}
rotate_logs() {
# Rotate log files
start-stop-daemon --stop --signal USR1 --quiet --pidfile $PID --name $NAME
return 0
}
upgrade_nginx() {
# Online upgrade nginx executable
# http://nginx.org/en/docs/control.html
#
# Return
# 0 if nginx has been successfully upgraded
# 1 if nginx is not running
# 2 if the pid files were not created on time
# 3 if the old master could not be killed
if start-stop-daemon --stop --signal USR2 --quiet --pidfile $PID --name $NAME; then
# Wait for both old and new master to write their pid file
while [ ! -s "${PID}.oldbin" ] || [ ! -s "${PID}" ]; do
cnt=`expr $cnt + 1`
if [ $cnt -gt 10 ]; then
return 2
fi
sleep 1
done
# Everything is ready, gracefully stop the old master
if start-stop-daemon --stop --signal QUIT --quiet --pidfile "${PID}.oldbin" --name $NAME; then
return 0
else
return 3
fi
else
return 1
fi
}
case "$1" in
start)
log_daemon_msg "Starting $DESC" "$NAME"
start_nginx
case "$?" in
0|1) log_end_msg 0 ;;
2) log_end_msg 1 ;;
esac
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
stop_nginx
case "$?" in
0|1) log_end_msg 0 ;;
2) log_end_msg 1 ;;
esac
;;
restart)
log_daemon_msg "Restarting $DESC" "$NAME"
# Check configuration before stopping nginx
if ! test_config; then
log_end_msg 1 # Configuration error
exit $?
fi
stop_nginx
case "$?" in
0|1)
start_nginx
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start
esac
;;
*)
# Failed to stop
log_end_msg 1
;;
esac
;;
reload|force-reload)
log_daemon_msg "Reloading $DESC configuration" "$NAME"
# Check configuration before stopping nginx
#
# This is not entirely correct since the on-disk nginx binary
# may differ from the in-memory one, but that's not common.
# We prefer to check the configuration and return an error
# to the administrator.
if ! test_config; then
log_end_msg 1 # Configuration error
exit $?
fi
reload_nginx
log_end_msg $?
;;
configtest|testconfig)
log_daemon_msg "Testing $DESC configuration"
test_config
log_end_msg $?
;;
status)
status_of_proc -p $PID "$DAEMON" "$NAME" && exit 0 || exit $?
;;
upgrade)
log_daemon_msg "Upgrading binary" "$NAME"
upgrade_nginx
log_end_msg $?
;;
rotate)
log_daemon_msg "Re-opening $DESC log files" "$NAME"
rotate_logs
log_end_msg $?
;;
*)
echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest|rotate|upgrade}" >&2
exit 3
;;
esac

18
debian/nginx-common.nginx.logrotate vendored Normal file
View file

@ -0,0 +1,18 @@
/var/log/nginx/*.log {
daily
missingok
rotate 14
compress
delaycompress
notifempty
create 0640 www-data adm
sharedscripts
prerotate
if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
run-parts /etc/logrotate.d/httpd-prerotate; \
fi \
endscript
postrotate
invoke-rc.d nginx rotate >/dev/null 2>&1
endscript
}

31
debian/nginx-common.nginx.service vendored Normal file
View file

@ -0,0 +1,31 @@
# Stop dance for nginx
# =======================
#
# ExecStop sends SIGQUIT (graceful stop) to the nginx process.
# If, after 5s (--retry QUIT/5) nginx is still running, systemd takes control
# and sends SIGTERM (fast shutdown) to the main process.
# After another 5s (TimeoutStopSec=5), and if nginx is alive, systemd sends
# SIGKILL to all the remaining processes in the process group (KillMode=mixed).
#
# nginx signals reference doc:
# http://nginx.org/en/docs/control.html
#
[Unit]
Description=A high performance web server and a reverse proxy server
Documentation=man:nginx(8)
After=network-online.target remote-fs.target nss-lookup.target
Wants=network-online.target
ConditionFileIsExecutable=/usr/sbin/nginx
[Service]
Type=forking
PIDFile=/run/nginx.pid
ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;'
ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;'
ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
ExecStop=-/sbin/start-stop-daemon --quiet --stop --retry QUIT/5 --pidfile /run/nginx.pid
TimeoutStopSec=5
KillMode=mixed
[Install]
WantedBy=multi-user.target

59
debian/nginx-common.postinst vendored Normal file
View file

@ -0,0 +1,59 @@
#!/bin/sh
set -e
. /usr/share/debconf/confmodule
case "$1" in
configure)
logdir="/var/log/nginx"
# Allow local admin to override
if ! dpkg-statoverride --list "$logdir" >/dev/null; then
chown root:adm $logdir
chmod 0755 $logdir
fi
# Secure default logfiles on fresh installations
if [ -z "$2" ]; then
access_log="$logdir/access.log"
error_log="$logdir/error.log"
if [ ! -e "$access_log" ]; then
touch "$access_log"
chmod 640 "$access_log"
chown www-data:adm "$access_log"
fi
if [ ! -e "$error_log" ]; then
touch "$error_log"
chmod 640 "$error_log"
chown www-data:adm "$error_log"
fi
fi
# If a symlink doesn't exist and can be created, then create it.
if [ -z $2 ] && [ ! -e /etc/nginx/sites-enabled/default ] &&
[ -d /etc/nginx/sites-enabled ] && [ -d /etc/nginx/sites-available ]; then
ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
fi
# Create a default index page when not already present.
if [ ! -e /var/www/html/index.nginx-debian.html ]; then
mkdir -p /var/www/html
cp /usr/share/nginx/html/index.html /var/www/html/index.nginx-debian.html
fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0

20
debian/nginx-common.postrm vendored Normal file
View file

@ -0,0 +1,20 @@
#!/bin/sh
set -e
case "$1" in
purge)
rm -rf /var/lib/nginx /var/log/nginx /etc/nginx
;;
upgrade|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0

37
debian/nginx-common.preinst vendored Normal file
View file

@ -0,0 +1,37 @@
#!/bin/sh
set -e
case "$1" in
install)
# If we are doing a fresh install, then these files are no longer needed.
# They were around for a very short time and are best simply removed.
rm -f /etc/logrotate.d/nginx-full
rm -f /etc/logrotate.d/nginx-light
rm -f /etc/logrotate.d/nginx-extras
rm -f /etc/logrotate.d/nginx-common
;;
upgrade)
# If this is an upgrade, then they might have the UFW profile in the wrong spot.
if [ -d /etc/ufw/applications.d/nginx ]; then
rm -f /etc/ufw/applications.d/nginx/ufw.profile
rmdir /etc/ufw/applications.d/nginx
fi
rm -f /etc/logrotate.d/nginx-full
rm -f /etc/logrotate.d/nginx-light
rm -f /etc/logrotate.d/nginx-extras
rm -f /etc/logrotate.d/nginx-common
;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0

13
debian/nginx-common.templates vendored Normal file
View file

@ -0,0 +1,13 @@
Template: nginx/log-symlinks
Type: note
_Description: Possible insecure nginx log files
The following log files under /var/log/nginx directory are symlinks
owned by www-data:
.
${logfiles}
.
Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result
www-data could symlink log files to sensitive locations, which in turn
could lead to privilege escalation attacks. Although /var/log/nginx
permissions are now fixed it is possible that such insecure links
already exist. So, please make sure to check the above locations.

9
debian/nginx-core.NEWS vendored Normal file
View file

@ -0,0 +1,9 @@
nginx-core (1.22.1-6) unstable; urgency=medium
The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
Packages no longer distribute the nginx binary and are replaced
by a metapackage to keep upgrades smooth.
Please simply install 'nginx' and 'libnginx-mod-...' modules You need
instead of these packages.
-- Jan Mojžíš <jan.mojzis@gmail.com> Wed, 11 Jan 2023 20:23:22 +0100

9
debian/nginx-dev.install vendored Normal file
View file

@ -0,0 +1,9 @@
debian/build-src/auto usr/share/nginx/src/
debian/build-src/src usr/share/nginx/src/
debian/build-src/conf_flags usr/share/nginx/src/
debian/build-src/configure usr/share/nginx/src/
debian/libnginx-mod.abisubstvars usr/share/nginx/src/debian/
debian/debhelper/nginx.pm usr/share/perl5/Debian/Debhelper/Sequence/
debian/debhelper/dh_nginx usr/bin/
debian/debhelper/nginx_mod.pm usr/share/perl5/Debian/Debhelper/Buildsystem/
debian/autoscripts/* usr/share/debhelper/autoscripts/

1
debian/nginx-dev.manpages vendored Normal file
View file

@ -0,0 +1 @@
debian/build-src/dh_nginx.1

2
debian/nginx-doc.docs vendored Normal file
View file

@ -0,0 +1,2 @@
README
debian/help/docs/*

1
debian/nginx-doc.examples vendored Normal file
View file

@ -0,0 +1 @@
debian/help/examples/*

9
debian/nginx-extras.NEWS vendored Normal file
View file

@ -0,0 +1,9 @@
nginx-extras (1.22.1-6) unstable; urgency=medium
The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
Packages no longer distribute the nginx binary and are replaced
by a metapackage to keep upgrades smooth.
Please simply install 'nginx' and 'libnginx-mod-...' modules You need
instead of these packages.
-- Jan Mojžíš <jan.mojzis@gmail.com> Wed, 11 Jan 2023 20:23:22 +0100

9
debian/nginx-full.NEWS vendored Normal file
View file

@ -0,0 +1,9 @@
nginx-full (1.22.1-6) unstable; urgency=medium
The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
Packages no longer distribute the nginx binary and are replaced
by a metapackage to keep upgrades smooth.
Please simply install 'nginx' and 'libnginx-mod-...' modules You need
instead of these packages.
-- Jan Mojžíš <jan.mojzis@gmail.com> Wed, 11 Jan 2023 20:23:22 +0100

9
debian/nginx-light.NEWS vendored Normal file
View file

@ -0,0 +1,9 @@
nginx-light (1.22.1-6) unstable; urgency=medium
The packages nginx-core, nginx-full, nginx-light, nginx-extras are deprecated.
Packages no longer distribute the nginx binary and are replaced
by a metapackage to keep upgrades smooth.
Please simply install 'nginx' and 'libnginx-mod-...' modules You need
instead of these packages.
-- Jan Mojžíš <jan.mojzis@gmail.com> Wed, 11 Jan 2023 20:23:22 +0100

1
debian/nginx.dirs vendored Normal file
View file

@ -0,0 +1 @@
usr/sbin

1
debian/nginx.install vendored Normal file
View file

@ -0,0 +1 @@
debian/build-bin/objs/nginx usr/sbin

1
debian/nginx.manpages vendored Normal file
View file

@ -0,0 +1 @@
debian/build-bin/objs/nginx.8

34
debian/nginx.postinst vendored Normal file
View file

@ -0,0 +1,34 @@
#!/bin/sh
set -e
case "$1" in
abort-upgrade|abort-remove|abort-deconfigure|configure)
;;
triggered)
if invoke-rc.d --quiet nginx status >/dev/null; then
echo "Triggering nginx reload ..."
invoke-rc.d nginx reload || true
fi
exit 0
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
if invoke-rc.d --quiet nginx status >/dev/null; then
invoke-rc.d nginx upgrade || invoke-rc.d nginx restart
exit $?
else
if [ -z "$(ss -nlt 'sport = 80' | grep -v ^State)" ]; then
invoke-rc.d nginx start || exit $?
else
echo "Not attempting to start NGINX, port 80 is already in use."
exit 0
fi
fi
#DEBHELPER#
exit 0

22
debian/nginx.prerm vendored Normal file
View file

@ -0,0 +1,22 @@
#!/bin/sh
set -e
case "$1" in
remove|remove-in-favour|deconfigure|deconfigure-in-favour)
if [ -x /etc/init.d/nginx ]; then
invoke-rc.d nginx stop || exit $?
fi
;;
upgrade|failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0

1
debian/nginx.triggers vendored Normal file
View file

@ -0,0 +1 @@
interest-noawait nginx-reload

104
debian/ngx-conf/README.rst vendored Normal file
View file

@ -0,0 +1,104 @@
Nginx Configuration Tool (ngx-conf)
===================================
A tool to help manage nginx confuration files.
Synopsis
--------
ngx-conf [-h] (-e | -d | -x | -l) [-f] [-r] [-v] FILE [FILES]
Description
-----------
Ngx-conf is a relatively simple tool to help manage Nginx configuration files.
It can be used to enable, disable, remove, and list configuration files. In the
case of configuration files in conf.d/\*.conf, it will handle renaming files to
an enabled/disabled state. In sites-{enabled,available}/\*, it will handle the
creation and removal of symbolic links.
**-h, --help**
show a help message and exit
**-e, --enable**
enable a configuration files
**-d, --disable**
disable a configuration files
**-x, --remove**
remove a configuration files; will prompt without -f
**-l, --list**
list configuration files
**-f, --force**
force change, even if doing so will destroy data
**-r, --reload**
reload configuration after change
**-v, --verbose**
show verbose output; default is quiet unless errors
**FILES**
a list of configuration files to update
Using --force:
* In --remove will not prompt you to delete the file(s).
* In --enable will ignore conflicts.
* In --disable will ignore conflicts.
* In --disable will also delete files from sites-enabled.
Only one action (enable|disable|remove|list) can be performed at one time.
Examples
--------
ngx-conf -e site1 site2 site3
enable "site{1,2,3}" configurations
ngx-conf -r -d site
disable "site" configuration and reload nginx
ngx-conf -f -r -x site1 site2
remove "site{1,2}" configurations without prompting and reload nginx
Configuration Files
-------------------
Three configuration files, if present, will be read. They will be read in the
following order; the next read file will always override the previous.
1. /etc/nginx/ngx.cfg
#. /etc/ngx.cfg
#. ngx.cfg
A sample configuration file with all options set to default::
[DEFAULT]
base_dir = /etc/nginx/
conf_dir = conf.d/
sites_en = sites-enabled/
sites_dis = sites-available/
conf_ext = .conf
verbose = no
reload = no
force = no
Make sure that base_dir always has a trailing slash.
Any arguments given to the command will override configuration options.
Aliases
-------
If you're interested in any sort of a2{dis,en}{conf,mod,site}, you can create
some nice aliases. Examples:
* a2ensite -- alias ngxensite='ngx-conf -e'
* a2enconf -- alias ngxenconf='ngx-conf -e'
* a2dissite -- alias ngxdissite='ngx-conf -d'
* a2disconf -- alias ngxdisconf='ngx-conf -d'
Bugs
----
If you experience bugs, the best way to report them is to the upstream bug
tracker. This can be found at https://github.com/ngx/ngx-conf.
Authors
-------
The ngx-conf tool and manual page were written by Michael Lustfield <michael@lustfield.net>.

278
debian/ngx-conf/ngx-conf vendored Executable file
View file

@ -0,0 +1,278 @@
#!/usr/bin/env python3
##
# copyright (c) 2015 Michael Lustfield <michael@lustfield.net>
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# Except as contained in this notice, the name(s) of the above copyright
# holders shall not be used in advertising or otherwise to promote the sale,
# use or other dealings in this Software without prior written authorization.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
##
import argparse
try:
import configparser as ConfigParser
except:
import ConfigParser
import glob
import os
import subprocess
# Read configuration values
config_opts = ConfigParser.ConfigParser({
'base_dir': '/etc/nginx/',
'conf_dir': 'conf.d/',
'sites_en': 'sites-enabled/',
'sites_dis': 'sites-available/',
'conf_ext': '.conf',
'verbose': 'no',
'reload': 'no',
'force': 'no'})
config_opts.read('/etc/nginx/ngx.cfg')
config_opts.read('/etc/ngx.cfg')
config_opts.read('ngx.cfg')
# Variable that we'll use a lot.
sites_en = config_opts.get('DEFAULT', 'base_dir') + config_opts.get('DEFAULT', 'sites_en')
sites_dis = config_opts.get('DEFAULT', 'base_dir') + config_opts.get('DEFAULT', 'sites_dis')
conf_dir = config_opts.get('DEFAULT', 'base_dir') + config_opts.get('DEFAULT', 'conf_dir')
conf_ext = config_opts.get('DEFAULT', 'conf_ext')
def parse_arguments():
'''Parse arguments supplied by the user.'''
parser = argparse.ArgumentParser(description='nginx configuration helper',
epilog='Only one in group (enable|disable|remove|list) is allowed.',
usage='ngx-conf [-h] (-e | -d | -x | -l) [-f] [-r] [-v] FILE [FILES]')
group = parser.add_mutually_exclusive_group(required=True)
group.add_argument('-e', '--enable', action='store_true',
help='enable a configuration files')
group.add_argument('-d', '--disable', action='store_true',
help='disable a configuration files')
group.add_argument('-x', '--remove', action='store_true',
help='remove a configuration files; will prompt without -f')
group.add_argument('-l', '--list', action='store_true',
help='list configuration files')
parser.add_argument('-f', '--force', action='store_true',
default=config_opts.getboolean('DEFAULT', 'force'),
help='force change, even if doing so will destroy data')
parser.add_argument('-r', '--reload', action='store_true',
default=config_opts.getboolean('DEFAULT', 'reload'),
help='reload configuration after change')
parser.add_argument('-v', '--verbose', action='store_true',
default=config_opts.getboolean('DEFAULT', 'verbose'),
help='show verbose output; default is quite unless errors')
parser.add_argument('FILES', nargs=argparse.REMAINDER,
help='a list of configuration files to update')
return parser.parse_args()
def main():
'''Main execution; read arguments and act accordingly.'''
args = parse_arguments()
if args.FILES == [] and not args.list:
print('No files specified. These are required.')
return False
if args.enable:
enable_configs(args.FILES, args.verbose, args.force)
elif args.disable:
disable_configs(args.FILES, args.verbose, args.force)
elif args.remove:
remove_configs(args.FILES, args.verbose, args.force)
elif args.list:
list_configs()
if args.reload and not args.list:
reload_nginx()
def enable_configs(configs, verbose, force):
'''Enable configurtion files specified.'''
if type(configs) != list:
print('Configuration list is in an incorrect format.')
return 1
for conf in configs:
if os.path.isfile(conf_dir + conf + conf_ext) or os.path.islink(sites_en + conf) or os.path.isfile(sites_en + conf):
if verbose:
print('Configuration file "{}" is already enabled.'.format(conf))
elif os.path.isfile(conf_dir + conf + conf_ext + '_disabled'):
if not force and os.path.isfile(sites_dis + conf):
print('Configuration file "{}" has conflicts.'.format(conf))
else:
try:
os.rename(conf_dir + conf + conf_ext + '_disabled', conf_dir + conf + conf_ext)
if verbose:
print('Configuration file "{}" has been enabled.'.format(conf))
except:
print('Error occured when trying to enable "{}". Permissions?'.format(conf))
elif os.path.isfile(sites_dis + conf):
try:
os.symlink(sites_dis + conf, sites_en + conf)
if verbose:
print('Configuration file "{}" has been enabled.'.format(conf))
except:
print('Error occured when trying to enable "{}". Permissions?'.format(conf))
else:
print('Configuration file for "{}" was not found.'.format(conf))
def disable_configs(configs, verbose, force):
'''Disable configurtion files specified.'''
if type(configs) != list:
print('Configuration list is in an incorrect format.')
return 1
for conf in configs:
if not force and os.path.isfile(conf_dir + conf + conf_ext) and os.path.islink(sites_en + conf):
print('Configuration file "{}" has conflicts.'.format(conf))
elif not force and os.path.isfile(conf_dir + conf + conf_ext) and os.path.isfile(sites_en + conf):
print('Configuration file "{}" has conflicts.'.format(conf))
elif os.path.isfile(conf_dir + conf + conf_ext):
if not force and os.path.isfile(conf_dir + conf + conf_ext + '_disabled'):
print('Unable to disable "{}". It appears to have a disabled version.'.format(conf))
break
elif os.path.isfile(conf_dir + conf + conf_ext + '_disabled'):
if verbose:
print('Attempting to remove disabled config for {}.'.format(conf))
try:
os.remove(conf_dir + conf + conf_ext + '_disabled')
except:
print('Error trying to remove configuration for disabled "{}".'.format(conf))
break
try:
os.rename(conf_dir + conf + conf_ext, conf_dir + conf + conf_ext + '_disabled')
if verbose:
print('Configuration file "{}" has been disabled.'.format(conf))
except:
print('Error occured when trying to disable "{}". Permissions?'.format(conf))
elif os.path.islink(sites_en + conf):
try:
os.remove(sites_en + conf)
if verbose:
print('Configuration file "{}" has been disabled.'.format(conf))
except:
print('Error occured when trying to disable "{}". Permissions?'.format(conf))
elif os.path.isfile(sites_en + conf):
if not force and os.path.isfile(sites_dis + conf):
print('Unable to disable "{}". It appears to have a disabled version.'.format(conf))
break
elif os.path.isfile(sites_dis + conf):
if verbose:
print('Attempting to remove disabled config for {}.'.format(conf))
try:
os.remove(sites_dis + conf)
except:
print('Error trying to remove configuration for disabled "{}".'.format(conf))
break
try:
os.rename(sites_en + conf, sites_dis + conf)
if verbose:
print('Configuration file "{}" has been disabled.'.format(conf))
except:
print('Error occured when trying to disable "{}". Permissions?'.format(conf))
else:
print('Configuration file for "{}" was not found.'.format(conf))
def remove_configs(configs, verbose, force):
'''Remove configurtion files specified.'''
if type(configs) != list:
print('Configuration list is in an incorrect format.')
return 1
for conf in configs:
if os.path.islink(sites_en + conf):
try:
os.remove(sites_en + conf)
if verbose:
print('Symlink for "{}" removed.'.format(conf))
except:
print('Error occured when trying to remove symlink for "{}". Permissions?'.format(conf))
files = [sites_en + conf, sites_dis + conf, conf_dir + conf + conf_ext,
conf_dir + conf + conf_ext + '_disabled']
for f in files:
if os.path.isfile(f):
if not force:
answer = str(input('Are you sure you want to delete {}? (y/N) '.format(f)))
if answer.lower() != 'y' and answer.lower() != 'yes':
break
try:
os.remove(f)
if verbose:
print('Configuration file for "{}" was removed.'.format(f))
except:
print('Error occured when trying to remove file for "{}". Permissions?'.format(f))
def list_configs():
'''List configuration files.'''
configs = get_configs()
for key, verb in [
('conf_en', 'Configs enabled in {}:'.format(config_opts.get('DEFAULT', 'conf_dir'))),
('conf_dis', 'Configs disabled in {}:'.format(config_opts.get('DEFAULT', 'conf_dir'))),
('sites_en', 'Configs enabled in {}:'.format(config_opts.get('DEFAULT', 'sites_en'))),
('sites_dis', 'Configs disabled in {}:'.format(config_opts.get('DEFAULT', 'sites_dis'))),
('sites_avail', 'All confis available in {}:'.format(config_opts.get('DEFAULT', 'sites_dis')))]:
if configs[key] == []:
print(verb + '\n\t<none>')
else:
print(verb)
for conf in configs[key]:
print('\t' + conf)
def get_configs():
'''Returns a list of configuration files.'''
cd = [os.path.basename(f).replace(conf_ext + '_disabled', '')
for f in glob.glob(conf_dir + '*' + conf_ext + '_disabled')
if os.path.isfile(f)]
ce = [os.path.basename(f).replace(conf_ext, '')
for f in glob.glob(conf_dir + '*' + conf_ext)
if os.path.isfile(f)]
se = [os.path.basename(f)
for f in glob.glob(sites_en + '*')
if os.path.isfile(f) or os.path.islink(f)]
sd = [os.path.basename(f)
for f in glob.glob(sites_dis + '*')
if os.path.isfile(f) and os.path.basename(f) not in se]
sa = [os.path.basename(f)
for f in glob.glob(sites_dis + '*')
if os.path.isfile(f)]
return {'conf_dis': cd, 'conf_en': ce, 'sites_en': se, 'sites_dis': sd, 'sites_avail': sa}
def reload_nginx():
'''Reload Nginx after configuration changes.'''
child = subprocess.Popen(
['service', 'nginx', 'reload'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = child.communicate()
if int(child.returncode) != 0:
print('Error reloading nginx configs.')
return False
elif verbose:
print('Nginx config reloaded successfully.')
return True
if __name__ == '__main__':
main()

135
debian/ngx-conf/ngx-conf.1 vendored Normal file
View file

@ -0,0 +1,135 @@
.\" Title: ngx-conf
.\" Author: Michael Lustfield <michael@lustfield.net>
.\" Date: 01/14/2015
.\" Manual: User Commands
.\"
.TH "NGX-CONF" "1" "01/14/2015" "ngx-conf" "User Commands"
.\" disable hyphenation
.NH
.\" disable justification (adjust text to left margin only)
.AD l
.SH "NAME"
ngx - a tool to help manage nginx confuration files
.SH "SYNOPSIS"
.B ngx-conf
[-h] (-e | -d | -x | -l) [-f] [-r] [-v] FILE [FILES]
.br
.SH "DESCRIPTION"
.PP
Ngx-conf is a relatively simple tool to help manage Nginx configuration files.
It can be used to enable, disable, remove, and list configuration files. In the
case of configuration files in conf.d/*.conf, it will handle renaming files to
an enabled/disabled state. In sites-{enabled,available}/*, it will handle the
creation and removal of symbolic links.
.SH "OPTIONS"
.PP
This program follows the usual command line syntax, with long options starting
with two dashes (`\-'). A summary of options is included below.
.TP
.B \-h, \-\-help
show a help message and exit
.TP
.B \-e, \-\-enable
enable a configuration files
.TP
.B \-d, \-\-disable
disable a configuration files
.TP
.B \-x, \-\-remove
remove a configuration files; will prompt without -f
.TP
.B \-l, \-\-list
list configuration files
.TP
.B \-f, \-\-force
force change, even if doing so will destroy data
.TP
.B \-r, \-\-reload
reload configuration after change
.TP
.B \-v, \-\-verbose
show verbose output; default is quiet unless errors
.B FILES
a list of configuration files to update
.PP
Using --force:
.IP
In --remove will not prompt you to delete the file(s).
.br
In --enable will ignore conflicts.
.br
In --disable will ignore conflicts.
.br
In --disable will also delete files from sites-enabled.
.PP
Only one action (enable|disable|remove|list) can be performed at one time.
.SH "EXAMPLES"
.PP
ngx-conf -e site1 site2 site3
enable "site{1,2,3}" configurations
.br
ngx-conf -r -d site
disable "site" configuration and reload nginx
.br
ngx-conf -f -r -x site1 site2
remove "site{1,2}" configurations without prompting and reload nginx
.SH "CONFIGURATION FILES"
.PP
Three configuration files, if present, will be read. They will be read in the
following order; the next read file will always override the previous.
.IP
1. /etc/nginx/ngx.cfg
.br
2. /etc/ngx.cfg
.br
3. ngx.cfg
.PP
A sample configuration file with all options set to default:
.IP
[DEFAULT]
.br
base_dir = /etc/nginx/
.br
conf_dir = conf.d/
.br
sites_en = sites-enabled/
.br
sites_dis = sites-available/
.br
conf_ext = .conf
.br
verbose = no
.br
reload = no
.br
force = no
.PP
Make sure that base_dir always has a trailing slash.
.br
Any arguments given to the command will override configuration options.
.SH "ALIASES"
.PP
If you're interested in any sort of a2{dis,en}{conf,mod,site}, you can create
some nice aliases. Examples:
.TP
.B a2ensite
alias ngxensite='ngx-conf -e'
.br
.TP
.B a2enconf
alias ngxenconf='ngx-conf -e'
.br
.TP
.B a2dissite
alias ngxdissite='ngx-conf -d'
.br
.TP
.B a2disconf
alias ngxdisconf='ngx-conf -d'
.SH "BUGS"
.PP
If you experience bugs, the best way to report them is to the upstream bug
tracker. This can be found at https://github.com/ngx/ngx-conf.
.SH "AUTHORS"
.PP
The ngx-conf tool and manual page were written by Michael Lustfield <michael@lustfield.net>.

View file

@ -0,0 +1,28 @@
Date: Sat, 16 Jul 2016 23:52:50 +0100
From: Steven Chamberlain <stevenc@debian.org>
Subject: Use _GNU_SOURCE on GNU/kFreeBSD
Forwarded: https://trac.nginx.org/nginx/ticket/2366
Define _GNU_SOURCE not only on GNU/Hurd, but also other glibc-based
platforms including GNU/kFreeBSD.
modified by jan.mojzis@gmail.com
Index: nginx/src/os/unix/ngx_posix_config.h
===================================================================
--- nginx.orig/src/os/unix/ngx_posix_config.h
+++ nginx/src/os/unix/ngx_posix_config.h
@@ -21,10 +21,13 @@
#endif
-#if (NGX_GNU_HURD)
+#if defined(NGX_GNU_HURD) || defined(__GLIBC__)
#ifndef _GNU_SOURCE
#define _GNU_SOURCE /* accept4() */
#endif
+#endif
+
+#if (NGX_GNU_HURD)
#define _FILE_OFFSET_BITS 64
#endif

85
debian/patches/nginx-fix-pidfile.patch vendored Normal file
View file

@ -0,0 +1,85 @@
Description: Fix NGINX pidfile handling
Author: Tj <ubuntu@iam.tj>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=876365
Last-Update: 2020-06-24
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -340,14 +340,21 @@
ngx_process = NGX_PROCESS_MASTER;
}
+ /* tell-tale to detect if this is parent or child process */
+ ngx_int_t child_pid = NGX_BUSY;
+
#if !(NGX_WIN32)
if (ngx_init_signals(cycle->log) != NGX_OK) {
return 1;
}
+ /* tell-tale that this code has been executed */
+ child_pid--;
+
if (!ngx_inherited && ccf->daemon) {
- if (ngx_daemon(cycle->log) != NGX_OK) {
+ child_pid = ngx_daemon(cycle->log);
+ if (child_pid == NGX_ERROR) {
return 1;
}
@@ -360,8 +367,19 @@
#endif
- if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
- return 1;
+ /* If ngx_daemon() returned the child's PID in the parent process
+ * after the fork() set ngx_pid to the child_pid, which gets
+ * written to the PID file, then exit.
+ * For NGX_WIN32 always write the PID file
+ * For others, only write it from the parent process */
+ if (child_pid < NGX_OK || child_pid > NGX_OK) {
+ ngx_pid = child_pid > NGX_OK ? child_pid : ngx_pid;
+ if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
+ return 1;
+ }
+ }
+ if (child_pid > NGX_OK) {
+ exit(0);
}
if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -7,14 +7,17 @@
#include <ngx_config.h>
#include <ngx_core.h>
+#include <unistd.h>
ngx_int_t
ngx_daemon(ngx_log_t *log)
{
int fd;
+ /* retain the return value for passing back to caller */
+ pid_t pid_child = fork();
- switch (fork()) {
+ switch (pid_child) {
case -1:
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fork() failed");
return NGX_ERROR;
@@ -23,7 +26,8 @@
break;
default:
- exit(0);
+ /* let caller do the exit() */
+ return pid_child;
}
ngx_parent = ngx_pid;

View file

@ -0,0 +1,64 @@
Origin: https://github.com/openresty/openresty/blob/master/patches/nginx-1.21.4-ssl_cert_cb_yield.patch
# HG changeset patch
# User Yichun Zhang <agentzh@openresty.org>
# Date 1451762084 28800
# Sat Jan 02 11:14:44 2016 -0800
# Node ID 449f0461859c16e95bdb18e8be6b94401545d3dd
# Parent 78b4e10b4367b31367aad3c83c9c3acdd42397c4
SSL: handled SSL_CTX_set_cert_cb() callback yielding.
OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
callbacks to serve the SSL certificiates and private keys dynamically
and lazily. The callbacks may yield for nonblocking I/O or sleeping.
Here we added support for such usage in NGINX 3rd-party modules
(like ngx_lua) in NGINX's event handlers for downstream SSL
connections.
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1914,6 +1914,23 @@
return NGX_AGAIN;
}
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
+ c->read->handler = ngx_ssl_handshake_handler;
+ c->write->handler = ngx_ssl_handshake_handler;
+
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ return NGX_AGAIN;
+ }
+#endif
+
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
c->ssl->no_wait_shutdown = 1;
@@ -2050,6 +2067,21 @@
c->read->handler = ngx_ssl_handshake_handler;
c->write->handler = ngx_ssl_handshake_handler;
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+ return NGX_ERROR;
+ }
+
+ return NGX_AGAIN;
+ }
+
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
+ c->read->handler = ngx_ssl_handshake_handler;
+ c->write->handler = ngx_ssl_handshake_handler;
+
if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
return NGX_ERROR;
}

3
debian/patches/series vendored Normal file
View file

@ -0,0 +1,3 @@
0003-define_gnu_source-on-other-glibc-based-platforms.patch
nginx-fix-pidfile.patch
nginx-ssl_cert_cb_yield.patch

1
debian/po/POTFILES.in vendored Normal file
View file

@ -0,0 +1 @@
[type: gettext/rfc822deb] nginx-common.templates

56
debian/po/ca.po vendored Normal file
View file

@ -0,0 +1,56 @@
# Nginx debconf translations
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
# Alytidae <alytidae@riseup.net>, 2017
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2017-06-19 20:26+0100\n"
"Last-Translator: Alytidae <alytidae@riseup.net>\n"
"Language-Team: catalan <dl10n-catalan@lists.debian.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "És possible que els fitxers de registre nginx siguin insegurs"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"Els següents fitxers de registre, sota el directori /var/log/nginx, són "
"enllaços simbòlics propietat de www-data:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Des de la versió 1.4.4-4 de nginx, /var/log/nginx ha estat propietat de "
"www-data. A causa d'això, www-data podria tenir enllaços simbòlics d'arxius "
"de registre a ubicacions sensibles que, al seu torn, podrien donar lloc a "
"atacs d'escalada de privilegis. Encara que els permisos de /var/log/nginx "
"estan arreglats és possible que encara existeixin alguns enllaços simbòlics "
"insegurs. Per tant, assegura't de comprovar les ubicacions esmentades."

56
debian/po/da.po vendored Normal file
View file

@ -0,0 +1,56 @@
# Nginx debconf translations
# Copyright (C) 2017 nginx og nedenstående oversættere.
# This file is distributed under the same license as the nginx package.
# Joe Hansen <joedalton2@yahoo.dk>, 2017.
#
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2017-01-10 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Nginx-logfilerne er muligvis usikre"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"De følgende logfiler under mappen /var/log/nginx er symbolske henvisninger "
"ejet af www-data:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Siden nginx 1.4.4-4 var /var/log/nginx ejet af www-data. Www-data kunne "
"derfor oprette logfiler med symbolske henvisninger til sensitive placeringer, "
"som igen kunne føre til privilegerede optrapningsangreb. Selvom "
"/var/log/nginx-rettigheder nu er rettet, så er det muligt at sådanne "
"usikre henvisninger stadig findes. Så, husk at kontrollere ovenstående "
"placeringer."

57
debian/po/de.po vendored Normal file
View file

@ -0,0 +1,57 @@
# Nginx debconf translations
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
# Copyright (C) of this file Chris Leick <c.leick@vollbio.de> 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: nginx 1.10.2-1\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2016-11-01 10:36+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Möglicherweise unsichere Nginx-Protokolldateien"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"Die folgenden Protokolldateien unterhalb des Verzeichnisses /var/log/nginx "
"sind symbolische Verweise, die »www-data« gehören:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Seit Nginx 1.4.4-4 gehörte /var/log/nginx »www-data«. Dies führte unter "
"anderem dazu, dass »www-data« auf Protokolldateien an vertraulichen Stellen "
"symbolisch verweisen konnte, was im Folgenden zu Rechteerweiterungsangriffen "
"führen konnte. Obwohl die Rechte an /var/log/nginx nun korrigiert sind, ist "
"es möglich, dass derartige unsichere Verweise bereits existieren. Prüfen Sie "
"daher bitte die oben genannten Orte."

78
debian/po/es.po vendored Normal file
View file

@ -0,0 +1,78 @@
# Nginx debconf translations
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
# Changes:
# - Initial translation
# Jonathan Bustillos <jathanblackred@openmailbox.com>, 2017.
#
# Traductores, si no conocen el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
# formato, por ejemplo ejecutando:
# info -n '(gettext)PO Files'
# info -n '(gettext)Header Entry'
#
# Equipo de traducción al español, por favor lean antes de traducir
# los siguientes documentos:
#
# - El proyecto de traducción de Debian al español
# http://www.debian.org/intl/spanish/
# especialmente las notas y normas de traducción en
# http://www.debian.org/intl/spanish/notas
#
# - La guía de traducción de po's de debconf:
# /usr/share/doc/po-debconf/README-trans
# o http://www.debian.org/intl/l10n/po-debconf/README-trans
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2017-02-07 11:07-0600\n"
"Last-Translator: Jonathan Bustillos <jathanblackred@openmailbox.com>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.6\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Posibles archivos de registro inseguros de nginx"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"Los siguientes archivos de registro en el directorio /var/log/nginx son "
"enlaces simbólicos propiedad de www-data:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Dado nginx 1.4.4-4 /var/log/nginx era propiedad de www-data. Como resultado, "
"www-data podría enlazar archivos de registro a ubicaciones sensibles, lo que "
"a su vez podría dar lugar a ataques de escalamiento de privilegios. Aunque "
"los permisos de /var/log/nginx están ahora arreglados, es posible que dichos "
"enlaces inseguros ya existan. Por lo tanto, asegúrese de comprobar las "
"ubicaciones anteriores."

58
debian/po/fr.po vendored Normal file
View file

@ -0,0 +1,58 @@
# Translation of nginx debconf templates to French
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
# Julien Patriarca <leatherface@debian.org>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2016-11-02 09:52+0100\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"X-Generator: Poedit 1.8.11\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Certains fichiers de journaux semblent non sécurisés"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"Les fichiers de journaux suivants se trouvant dans le dossier /var/log/nginx "
"sont des liens symboliques qui appartiennent à www-data :"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Depuis la version 1.4.4-4 de nginx, /var/log/nginx appartient à www-data. "
"Par conséquent www-data peut faire des liens symboliques des fichiers de "
"journaux vers des emplacements sensibles, ce qui pourrait amener à des "
"attaques par augmentation de droits. Même si désormais les droits de /var/"
"log/nginx ont été sécurisés, il est possible que de tels liens existent "
"déjà. Aussi, veuillez vous assurer d'avoir contrôlé les emplacements ci-"
"dessus."

56
debian/po/it.po vendored Normal file
View file

@ -0,0 +1,56 @@
# Nginx debconf translations
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Christos Trochalakis <ctrochalakis@debian.org>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2022-08-25 00:00+0000\n"
"Last-Translator: Ceppo <ceppo@oziosi.org>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Documenti di log di nginx potenzialmente non sicuri"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"I seguenti documenti di log nel percorso /var/log/nginx sono collegamenti "
"simbolici (symlink) posseduti da www-data:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Da nginx 1.4.4-4 /var/log/nginx era posseduto da www-data. Di conseguenza "
"www-data poteva creare collegamenti simbolici (symlink) a documenti di log "
"in percorsi sensibili, il che a sua volta poteva portare ad attacchi di "
"usurpazione di privilegi. Sebbene i permessi di /var/log/nginx siano adesso "
"corretti è possibile che questi link non sicuri esistano già. Quindi, "
"controllare i percorsi indicati sopra."

60
debian/po/nl.po vendored Normal file
View file

@ -0,0 +1,60 @@
# Nginx debconf translation to Dutch
# Copyright (C) 2016 Christos Trochalakis
# This file is distributed under the same license as the nginx package.
# Chrirtos Trochalakis <yatiohi@ideopolis.gr>, 2016.
# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: nginx\n"
"Report-Msgid-Bugs-To: nginx@packages.debian.org\n"
"POT-Creation-Date: 2016-10-04 20:03+0300\n"
"PO-Revision-Date: 2016-11-08 16:30+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.6\n"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "Possible insecure nginx log files"
msgstr "Wellicht onveilige nginx logbestanden"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"The following log files under /var/log/nginx directory are symlinks owned by "
"www-data:"
msgstr ""
"De volgende logbestanden in de map /var/log/nginx zijn symbolische "
"koppelingen met www-data als eigenaar:"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid "${logfiles}"
msgstr "${logfiles}"
#. Type: note
#. Description
#: ../nginx-common.templates:1001
msgid ""
"Since nginx 1.4.4-4 /var/log/nginx was owned by www-data. As a result www-"
"data could symlink log files to sensitive locations, which in turn could "
"lead to privilege escalation attacks. Although /var/log/nginx permissions "
"are now fixed it is possible that such insecure links already exist. So, "
"please make sure to check the above locations."
msgstr ""
"Sinds nginx 1.4.4-4 was www-data eigenaar van /var/log/nginx. Als gevolg "
"daarvan kon www-data een symbolische koppeling maken tussen logbestanden en "
"gevoelige plaatsen, hetgeen op zijn beurt kon leiden tot aanvallen van het "
"type rechtenuitbreiding (privilege escalation). De toegangsrechten voor /var/"
"log/nginx zijn nu gerepareerd, maar het is mogelijk dat er reeds dergelijke "
"onveilige koppelingen bestaan. U moet dus zeker bovenstaande locaties "
"controleren."

Some files were not shown because too many files have changed in this diff Show more