Skip to content

Commit

Permalink
AU: 1 updated - nginx-service
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocolatey committed Jan 10, 2019
1 parent 2bccc40 commit 24fcf66
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 82 deletions.
2 changes: 1 addition & 1 deletion nginx-service/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ service named `nginx` to manage the server.
It may be disappointing, but here's few reasons why:

* Writing inside previous `C:/ProgramData/nginx` requires editor to be opened with Administrator privileges
* Changing to new directory allow for optimistic migration from 1.6.2.1 to 1.14.1
* Changing to new directory allow for optimistic migration from 1.6.2.1 to 1.15.8
* 1.6.2.1 is a quite old and I believe most of users have already found another way for newer nginx. Those who dont, probably also wont bother updating to newer
* `C:/tools/nginx` is on par with other web-related choco packages

Expand Down
21 changes: 7 additions & 14 deletions nginx-service/nginx-service.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<metadata>
<!-- == PACKAGE SPECIFIC SECTION == -->
<id>nginx-service</id>
<version>1.14.1</version>
<version>1.15.8</version>
<packageSourceUrl>https://github.com/Pilskalns/choco-au-packages/tree/master/nginx-service</packageSourceUrl>
<owners>Andzs Pilskalns</owners>
<!-- == SOFTWARE SPECIFIC SECTION == -->
<title>nginx service</title>
<authors>Igor Sysoev</authors>
<projectUrl>http://nginx.org/</projectUrl>
<iconUrl>http://cdn.rawgit.com/Pilskalns/choco-au-packages/master/nginx-service/nginx-service.png</iconUrl>
<copyright>2018 &#169; Nginx, Inc.</copyright>
<copyright>2019 &#169; Nginx, Inc.</copyright>
<licenseUrl>http://nginx.org/LICENSE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://trac.nginx.org/nginx/browser</projectSourceUrl>
Expand All @@ -29,7 +29,7 @@ service named `nginx` to manage the server.
It may be disappointing, but here's few reasons why:
* Writing inside previous `C:/ProgramData/nginx` requires editor to be opened with Administrator privileges
* Changing to new directory allow for optimistic migration from 1.6.2.1 to 1.14.1
* Changing to new directory allow for optimistic migration from 1.6.2.1 to 1.15.8
* 1.6.2.1 is a quite old and I believe most of users have already found another way for newer nginx. Those who dont, probably also wont bother updating to newer
* `C:/tools/nginx` is on par with other web-related choco packages
Expand All @@ -41,7 +41,8 @@ C:/tools/nginx/
│ ├── nginx.conf
│ └── ...
├── conf.d
│ └── server.default.conf
│ ├── server.default.conf
│ └── server.d0n3.ws.conf.sample {Bonus file, read content}
├── html
│ └── index.html
├── logs
Expand All @@ -57,18 +58,10 @@ C:/tools/nginx/
See the [nginx.org](https://nginx.org) for more detailed documentation.
]]></description>
<releaseNotes><![CDATA[*) Security: when using HTTP/2 a client might cause excessive memory
consumption (CVE-2018-16843) and CPU usage (CVE-2018-16844).
*) Security: processing of a specially crafted mp4 file with the
ngx_http_mp4_module might result in worker process memory disclosure
(CVE-2018-16845).
*) Bugfix: working with gRPC backends might result in excessive memory
consumption.]]></releaseNotes>
<releaseNotes>Changes not found</releaseNotes>
<dependencies>
<dependency id="nssm" version="2.24.0" />
<dependency id="nginx" version="[1.14.1]" />
<dependency id="nginx" version="[1.15.8]" />
</dependencies>
</metadata>
<files>
Expand Down
27 changes: 0 additions & 27 deletions nginx-service/tools/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,27 +0,0 @@
/*
* Copyright (C) 2002-2018 Igor Sysoev
* Copyright (C) 2011-2018 Nginx, Inc.
* 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 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 THE 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.
*/

40 changes: 0 additions & 40 deletions nginx-service/tools/conf/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,3 @@
# ME ON chocolatey.org/packages/nginx-service
#

#user nobody;
worker_processes 1;

#error_log logs/error.log;
#error_log logs/error.log notice;
#error_log logs/error.log info;

#pid logs/nginx.pid;


events {
worker_connections 1024;
}


http {
include mime.types;
default_type application/octet-stream;

#log_format main '$remote_addr - $remote_user [$time_local] "$request" '
# '$status $body_bytes_sent "$http_referer" '
# '"$http_user_agent" "$http_x_forwarded_for"';

#access_log logs/access.log main;

sendfile on;
#tcp_nopush on;

#keepalive_timeout 0;
keepalive_timeout 65;

#gzip on;


# PLACE YOUR CUSTOM {server}.conf FILES INSIDE
# C:/tools/nginx/conf.d/
include ../conf.d/server*.conf;

}

0 comments on commit 24fcf66

Please sign in to comment.