public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2976 from bluescreen303/nginx

Browse Source 
nginx: fix group, statedir permissions, add echo module, fix aio
This commit is contained in:
lethalman
2014-06-17 14:23:15 +02:00
parent 6025caa92b a97bef3e8c
commit 219e992519
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-servers/nginx/default.nix
+2 -3
View File
@@ -84,8 +84,6 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ nginx ];
# TODO: test user supplied config file pases syntax test # TODO: test user supplied config file pases syntax test
systemd.services.nginx = { systemd.services.nginx = {
@@ -96,6 +94,7 @@ in
preStart = preStart =
'' ''
mkdir -p ${cfg.stateDir}/logs mkdir -p ${cfg.stateDir}/logs
chmod 700 ${cfg.stateDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
''; '';
serviceConfig = { serviceConfig = {
@@ -105,7 +104,7 @@ in
users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton users.extraUsers = optionalAttrs (cfg.user == "nginx") (singleton
{ name = "nginx"; { name = "nginx";
group = "nginx"; group = cfg.group;
uid = config.ids.uids.nginx; uid = config.ids.uids.nginx;
}); });
pkgs/servers/http/nginx/default.nix
+22 -10
View File
@@ -3,7 +3,10 @@
, rtmp ? false , rtmp ? false
, fullWebDAV ? false , fullWebDAV ? false
, syslog ? false , syslog ? false
, moreheaders ? false}: , moreheaders ? false
, echo ? false }:
with stdenv.lib;
let let
version = "1.6.0"; version = "1.6.0";
@@ -35,6 +38,12 @@ let
rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b"; rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b";
sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf"; sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf";
}; };
echo-ext = fetchgit {
url = https://github.com/openresty/echo-nginx-module.git;
rev = "refs/tags/v0.53";
sha256 = "90d4e3a49c678019f4f335bc18529aa108fcc9cfe0747ea4e2f6084a70da2868";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -43,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ openssl zlib pcre libxml2 libxslt gd geoip [ openssl zlib pcre libxml2 libxslt gd geoip
] ++ stdenv.lib.optional fullWebDAV expat; ] ++ optional fullWebDAV expat;
patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else []; patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
@@ -69,12 +78,15 @@ stdenv.mkDerivation rec {
"--with-ipv6" "--with-ipv6"
# Install destination problems # Install destination problems
# "--with-http_perl_module" # "--with-http_perl_module"
] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" ] ++ optional rtmp "--add-module=${rtmp-ext}"
++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ optional fullWebDAV "--add-module=${dav-ext}"
++ stdenv.lib.optional syslog "--add-module=${syslog-ext}" ++ optional syslog "--add-module=${syslog-ext}"
++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}"; ++ optional moreheaders "--add-module=${moreheaders-ext}"
++ optional echo "--add-module=${echo-ext}"
++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
additionalFlags = stdenv.lib.optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
@@ -87,8 +99,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A reverse proxy and lightweight webserver"; description = "A reverse proxy and lightweight webserver";
homepage = http://nginx.org; homepage = http://nginx.org;
license = stdenv.lib.licenses.bsd2; license = licenses.bsd2;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; maintainers = with maintainers; [ thoughtpolice raskin ];
}; };
} }