dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #11987 from angus-g/caddy

Browse Source 
Add Caddy and its NixOS module
This commit is contained in:
joachifm 2016-04-11 09:20:21 +02:00
commit 245f200dd8
5 changed files with 121 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -260,6 +260,7 @@
hydra-www = 236;
syncthing = 237;
mfi = 238;
caddy = 239;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -491,6 +492,7 @@
radicale = 234;
syncthing = 237;
#mfi = 238; # unused
caddy = 239;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

1
nixos/modules/module-list.nix
View File

@ -434,6 +434,7 @@
./services/ttys/kmscon.nix
./services/web-apps/pump.io.nix
./services/web-servers/apache-httpd/default.nix
./services/web-servers/caddy.nix
./services/web-servers/fcgiwrap.nix
./services/web-servers/jboss/default.nix
./services/web-servers/lighttpd/cgit.nix

53
nixos/modules/services/web-servers/caddy.nix Normal file
View File

@ -0,0 +1,53 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.caddy;
configFile = pkgs.writeText "Caddyfile" cfg.config;
in
{
options.services.caddy = {
enable = mkEnableOption "Caddy web server";
config = mkOption {
description = "Verbatim Caddyfile to use";
};
email = mkOption {
default = "";
type = types.string;
description = "Email address (for Let's Encrypt certificate)";
};
dataDir = mkOption {
default = "/var/lib/caddy";
type = types.path;
description = "The data directory, for storing certificates.";
};
};
config = mkIf cfg.enable {
systemd.services.caddy = {
description = "Caddy web server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.caddy}/bin/caddy -conf=${configFile} -email=${cfg.email}";
Type = "simple";
User = "caddy";
Group = "caddy";
AmbientCapabilities = "cap_net_bind_service";
};
};
users.extraUsers.caddy = {
group = "caddy";
uid = config.ids.uids.caddy;
home = cfg.dataDir;
createHome = true;
};
users.extraGroups.caddy.gid = config.ids.uids.caddy;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -639,6 +639,8 @@ in
cabal2nix = haskellPackages.cabal2nix;
caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; };
capstone = callPackage ../development/libraries/capstone { };
catch = callPackage ../development/libraries/catch { };

70
pkgs/top-level/go-packages.nix
View File

@ -195,6 +195,16 @@ let
buildInputs = [ gohtml ];
};
acme = buildFromGitHub {
rev = "v0.3.0";
owner = "xenolf";
repo = "lego";
sha256 = "0hlnqdn793j4s43bhnmpi2lxgmjxs1ccg26alxnrcyw5x7p2vvdn";
subPackages = [ "acme" ];
propagatedBuildInputs = [ crypto dns go-jose-v1 net ];
};
adapted = buildFromGitHub {
rev = "eaea06aaff855227a71b1c58b18bc6de822e3e77";
version = "2015-06-03";
@ -401,6 +411,18 @@ let
propagatedBuildInputs = [ panicwrap revel ];
};
caddy = buildFromGitHub {
rev = "9099375b11b7b5e62b831627c2927d1c4c666071";
version = "v0.8.2";
owner = "mholt";
repo = "caddy";
sha256 = "1zdy2sxir21ngh2ird01sv4fgj6sy3wl4s6k4piklri8ps1zw0k0";
buildInputs = [
acme blackfriday crypto go-humanize go-shlex go-syslog
http-authentication lumberjack-v2 toml websocket yaml-v2
];
};
cascadia = buildGoPackage rec {
rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master
name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}";
@ -661,11 +683,11 @@ let
};
dns = buildFromGitHub {
rev = "e59f851c912767b1db587dcabee6e6652e495c75";
version = "2015-07-22";
owner = "miekg";
repo = "dns";
sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp";
rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa";
version = "2016-03-28";
owner = "miekg";
repo = "dns";
sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl";
};
docopt-go = buildFromGitHub {
@ -1561,6 +1583,16 @@ let
sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
};
go-jose-v1 = buildFromGitHub {
rev = "v1.0.1";
owner = "square";
repo = "go-jose";
sha256 = "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p";
propagatedBuildInputs = [ cli-go ];
goPackagePath = "gopkg.in/square/go-jose.v1";
goPackageAliases = [ "github.com/square/go-jose" ];
};
go-liblzma = buildFromGitHub {
rev = "e74be71c3c60411922b5424e875d7692ea638b78";
version = "2016-01-01";
@ -1770,6 +1802,13 @@ let
};
};
go-shlex = buildFromGitHub {
rev = "3f9db97f856818214da2e1057f8ad84803971cff";
owner = "flynn";
repo = "go-shlex";
sha256 = "2a6a6f8eb150260cd60881ec5f027b7d1d2946ee22c627b450773eaf3d1de4c8";
};
go-simplejson = buildFromGitHub {
rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a";
version = "2015-03-31";
@ -1996,6 +2035,13 @@ let
buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ];
};
http-authentication = buildFromGitHub {
rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012";
owner = "jimstudt";
repo = "http-authentication";
sha256 = "08601600811a172d7f806b541f05691e4bef812ed8a68f7de65fde9ee11a3cb7";
};
http2 = buildFromGitHub rec {
rev = "f8202bc903bda493ebba4aa54922d78430c2c42f";
owner = "bradfitz";
@ -2242,6 +2288,16 @@ let
sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs";
};
lumberjack-v2 = buildFromGitHub {
rev = "v2.0";
owner = "natefinch";
repo = "lumberjack";
sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82";
goPackagePath = "gopkg.in/natefinch/lumberjack.v2";
goPackageAliases = [ "github.com/natefinch/lumberjack" ];
};
lxd = buildFromGitHub {
rev = "lxd-2.0.0.rc4";
owner = "lxc";
@ -3410,10 +3466,10 @@ let
};
skydns = buildFromGitHub {
rev = "2.5.2b";
rev = "2.5.3a";
owner = "skynetservices";
repo = "skydns";
sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7";
buildInputs = [
go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang