commit 7663de114a365259f07425aa582b3c5890c00874 · pyrox.dev/nixpkgs

nixos/modules/tasks/filesystems/zfs.nix

···

       305
        
               }

     

       306
        
             ];

     

       307
        
       

     

       0
        
       
     

       0
        
       
     

       308
        
             boot = {

     

       309
        
               kernelModules = [ "spl" "zfs" ] ;

     

       310
        
               extraModulePackages = with packages; [ spl zfs ];

···

       305
        
               }

     

       306
        
             ];

     

       307
        
       

     

       308
       +
             virtualisation.lxd.zfsSupport = true;

     

       309
       +
       

     

       310
        
             boot = {

     

       311
        
               kernelModules = [ "spl" "zfs" ] ;

     

       312
        
               extraModulePackages = with packages; [ spl zfs ];

+4 -1

nixos/modules/virtualisation/lxc.nix

···

       74
        
           systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];

     

       75
        
       

     

       76
        
           security.apparmor.packages = [ pkgs.lxc ];

     

       77
       -
           security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       78
        
         };

     

       79
        
       }

···

       74
        
           systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];

     

       75
        
       

     

       76
        
           security.apparmor.packages = [ pkgs.lxc ];

     

       77
       +
           security.apparmor.profiles = [

     

       78
       +
             "${pkgs.lxc}/etc/apparmor.d/lxc-containers"

     

       79
       +
             "${pkgs.lxc}/etc/apparmor.d/usr.bin.lxc-start"

     

       80
       +
           ];

     

       81
        
         };

     

       82
        
       }

+33 -27

nixos/modules/virtualisation/lxd.nix

···

       15
        
       

     

       16
        
         options = {

     

       17
        
       

     

       18
       -
           virtualisation.lxd.enable =

     

       19
       -
             mkOption {

     

       20
        
               type = types.bool;

     

       21
        
               default = false;

     

       22
       -
               description =

     

       23
       -
                 ''

     

       24
       -
                   This option enables lxd, a daemon that manages

     

       25
       -
                   containers. Users in the "lxd" group can interact with

     

       26
       -
                   the daemon (e.g. to start or stop containers) using the

     

       27
       -
                   <command>lxc</command> command line tool, among others.

     

       28
       -
                 '';

     

       29
        
             };

     

       30
       -
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         };

     

       32
       -
       

     

       33
        
       

     

       34
        
         ###### implementation

     

       35
        
       

     

       36
        
         config = mkIf cfg.enable {

     

       37
        
       

     

       38
       -
           environment.systemPackages =

     

       39
       -
             [ pkgs.lxd ];

     

       40
        
       

     

       41
        
           security.apparmor = {

     

       42
        
             enable = true;

     
···

       47
        
             packages = [ pkgs.lxc ];

     

       48
        
           };

     

       49
        
       

     

       50
       -
           systemd.services.lxd =

     

       51
       -
             { description = "LXD Container Management Daemon";

     

       52
        
       

     

       53
       -
               wantedBy = [ "multi-user.target" ];

     

       54
       -
               after = [ "systemd-udev-settle.service" ];

     

       55
        
       

     

       56
       -
               # TODO(wkennington): Add lvm2 and thin-provisioning-tools

     

       57
       -
               path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ];

     

       58
        
       

     

       59
       -
               preStart = ''

     

       60
       -
                 mkdir -m 0755 -p /var/lib/lxc/rootfs

     

       61
       -
               '';

     

       62
        
       

     

       63
       -
               serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd";

     

       64
       -
               serviceConfig.Type = "simple";

     

       65
       -
               serviceConfig.KillMode = "process"; # when stopping, leave the containers alone

     

       0
        
       
     

       66
        
             };

     

       0
        
       
     

       0
        
       
     

       67
        
       

     

       68
        
           users.extraGroups.lxd.gid = config.ids.gids.lxd;

     

       69
        
       

     
···

       71
        
             subUidRanges = [ { startUid = 1000000; count = 65536; } ];

     

       72
        
             subGidRanges = [ { startGid = 1000000; count = 65536; } ];

     

       73
        
           };

     

       74
       -
       

     

       75
        
         };

     

       76
       -
       

     

       77
        
       }

···

       15
        
       

     

       16
        
         options = {

     

       17
        
       

     

       18
       +
           virtualisation.lxd = {

     

       19
       +
             enable = mkOption {

     

       20
        
               type = types.bool;

     

       21
        
               default = false;

     

       22
       +
               description = ''

     

       23
       +
                 This option enables lxd, a daemon that manages

     

       24
       +
                 containers. Users in the "lxd" group can interact with

     

       25
       +
                 the daemon (e.g. to start or stop containers) using the

     

       26
       +
                 <command>lxc</command> command line tool, among others.

     

       27
       +
               '';

     

       0
        
       
     

       28
        
             };

     

       29
       +
             zfsSupport = mkOption {

     

       30
       +
               type = types.bool;

     

       31
       +
               default = false;

     

       32
       +
               description = ''

     

       33
       +
                 enables lxd to use zfs as a storage for containers.

     

       34
       +
                 This option is enabled by default if a zfs pool is configured

     

       35
       +
                 with nixos.

     

       36
       +
               '';

     

       37
       +
             };

     

       38
       +
           };

     

       39
        
         };

     

       0
        
       
     

       40
        
       

     

       41
        
         ###### implementation

     

       42
        
       

     

       43
        
         config = mkIf cfg.enable {

     

       44
        
       

     

       45
       +
           environment.systemPackages = [ pkgs.lxd ];

     

       0
        
       
     

       46
        
       

     

       47
        
           security.apparmor = {

     

       48
        
             enable = true;

     
···

       53
        
             packages = [ pkgs.lxc ];

     

       54
        
           };

     

       55
        
       

     

       56
       +
           systemd.services.lxd = {

     

       57
       +
             description = "LXD Container Management Daemon";

     

       58
        
       

     

       59
       +
             wantedBy = [ "multi-user.target" ];

     

       60
       +
             after = [ "systemd-udev-settle.service" ];

     

       61
        
       

     

       62
       +
             path = lib.optional cfg.zfsSupport pkgs.zfs;

     

       0
        
       
     

       63
        
       

     

       64
       +
             preStart = ''

     

       65
       +
               mkdir -m 0755 -p /var/lib/lxc/rootfs

     

       66
       +
             '';

     

       67
        
       

     

       68
       +
             serviceConfig = {

     

       69
       +
               ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd";

     

       70
       +
               Type = "simple";

     

       71
       +
               KillMode = "process"; # when stopping, leave the containers alone

     

       72
        
             };

     

       73
       +
       

     

       74
       +
           };

     

       75
        
       

     

       76
        
           users.extraGroups.lxd.gid = config.ids.gids.lxd;

     

       77
        
       

     
···

       79
        
             subUidRanges = [ { startUid = 1000000; count = 65536; } ];

     

       80
        
             subGidRanges = [ { startGid = 1000000; count = 65536; } ];

     

       81
        
           };

     

       0
        
       
     

       82
        
         };

     

       0
        
       
     

       83
        
       }

+26 -12

pkgs/tools/admin/lxd/default.nix

···

       1
       -
       { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }:

     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       buildGoPackage rec {

     

       4
       -
         name = "lxd-${version}";

     

       5
       -
         version = "2.16";

     

       6
       -
         rev = "lxd-${version}";

     

       7
        
       

     

       8
        
         goPackagePath = "github.com/lxc/lxd";

     

       9
        
       

     

       10
       -
         src = fetchFromGitHub {

     

       11
       -
           inherit rev;

     

       12
       -
           owner = "lxc";

     

       13
       -
           repo = "lxd";

     

       14
       -
           sha256 = "0i2mq9m8k9kznwz1i0xb48plp1ffpzvbdrvqvagis4sm17yab3fn";

     

       15
        
         };

     

       16
        
       

     

       17
       -
         goDeps = ./deps.nix;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
       -
         nativeBuildInputs = [ pkgconfig ];

     

       20
       -
         buildInputs = [ lxc ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

       22
        
         meta = with stdenv.lib; {

     

       23
        
           description = "Daemon based on liblxc offering a REST API to manage containers";

···

       1
       +
       { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl

     

       2
       +
       , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables

     

       3
       +
       }:

     

       4
        
       

     

       5
        
       buildGoPackage rec {

     

       6
       +
         name = "lxd-3.0.0";

     

       0
        
       
     

       0
        
       
     

       7
        
       

     

       8
        
         goPackagePath = "github.com/lxc/lxd";

     

       9
        
       

     

       10
       +
         src = fetchurl {

     

       11
       +
           url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";

     

       12
       +
           sha256 = "0m5prdf9sk8k5bws1zva4n9ycggmy76wnjr6wb423066pszz24ww";

     

       0
        
       
     

       0
        
       
     

       13
        
         };

     

       14
        
       

     

       15
       +
         preBuild = ''

     

       16
       +
           # unpack vendor

     

       17
       +
           pushd go/src/github.com/lxc/lxd

     

       18
       +
           rm dist/src/github.com/lxc/lxd

     

       19
       +
           cp -r dist/src/* ../../..

     

       20
       +
           rm -r dist

     

       21
       +
           popd

     

       22
       +
         '';

     

       23
       +
       

     

       24
       +
         postInstall = ''

     

       25
       +
           # binaries from test/

     

       26
       +
           rm $bin/bin/{deps,macaroon-identity}

     

       27
        
       

     

       28
       +
           wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [

     

       29
       +
             acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables

     

       30
       +
           ]}

     

       31
       +
         '';

     

       32
       +
       

     

       33
       +
         nativeBuildInputs = [ pkgconfig makeWrapper ];

     

       34
       +
         buildInputs = [ lxc acl ];

     

       35
        
       

     

       36
        
         meta = with stdenv.lib; {

     

       37
        
           description = "Daemon based on liblxc offering a REST API to manage containers";

-165

pkgs/tools/admin/lxd/deps.nix

···

       1
       -
       # This file was generated by https://github.com/kamilchm/go2nix v1.2.0

     

       2
       -
       [

     

       3
       -
         {

     

       4
       -
           goPackagePath = "github.com/dustinkirkland/golang-petname";

     

       5
       -
           fetch = {

     

       6
       -
             type = "git";

     

       7
       -
             url = "https://github.com/dustinkirkland/golang-petname";

     

       8
       -
             rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14";

     

       9
       -
             sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di";

     

       10
       -
           };

     

       11
       -
         }

     

       12
       -
         {

     

       13
       -
           goPackagePath = "github.com/golang/protobuf";

     

       14
       -
           fetch = {

     

       15
       -
             type = "git";

     

       16
       -
             url = "https://github.com/golang/protobuf";

     

       17
       -
             rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";

     

       18
       -
             sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";

     

       19
       -
           };

     

       20
       -
         }

     

       21
       -
         {

     

       22
       -
           goPackagePath = "github.com/gorilla/mux";

     

       23
       -
           fetch = {

     

       24
       -
             type = "git";

     

       25
       -
             url = "https://github.com/gorilla/mux";

     

       26
       -
             rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604";

     

       27
       -
             sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz";

     

       28
       -
           };

     

       29
       -
         }

     

       30
       -
         {

     

       31
       -
           goPackagePath = "github.com/gorilla/websocket";

     

       32
       -
           fetch = {

     

       33
       -
             type = "git";

     

       34
       -
             url = "https://github.com/gorilla/websocket";

     

       35
       -
             rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";

     

       36
       -
             sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";

     

       37
       -
           };

     

       38
       -
         }

     

       39
       -
         {

     

       40
       -
           goPackagePath = "github.com/mattn/go-colorable";

     

       41
       -
           fetch = {

     

       42
       -
             type = "git";

     

       43
       -
             url = "https://github.com/mattn/go-colorable";

     

       44
       -
             rev = "ded68f7a9561c023e790de24279db7ebf473ea80";

     

       45
       -
             sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc";

     

       46
       -
           };

     

       47
       -
         }

     

       48
       -
         {

     

       49
       -
           goPackagePath = "github.com/mattn/go-sqlite3";

     

       50
       -
           fetch = {

     

       51
       -
             type = "git";

     

       52
       -
             url = "https://github.com/mattn/go-sqlite3";

     

       53
       -
             rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd";

     

       54
       -
             sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq";

     

       55
       -
           };

     

       56
       -
         }

     

       57
       -
         {

     

       58
       -
           goPackagePath = "github.com/pborman/uuid";

     

       59
       -
           fetch = {

     

       60
       -
             type = "git";

     

       61
       -
             url = "https://github.com/pborman/uuid";

     

       62
       -
             rev = "1b00554d822231195d1babd97ff4a781231955c9";

     

       63
       -
             sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";

     

       64
       -
           };

     

       65
       -
         }

     

       66
       -
         {

     

       67
       -
           goPackagePath = "github.com/syndtr/gocapability";

     

       68
       -
           fetch = {

     

       69
       -
             type = "git";

     

       70
       -
             url = "https://github.com/syndtr/gocapability";

     

       71
       -
             rev = "e7cb7fa329f456b3855136a2642b197bad7366ba";

     

       72
       -
             sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1";

     

       73
       -
           };

     

       74
       -
         }

     

       75
       -
         {

     

       76
       -
           goPackagePath = "golang.org/x/crypto";

     

       77
       -
           fetch = {

     

       78
       -
             type = "git";

     

       79
       -
             url = "https://go.googlesource.com/crypto";

     

       80
       -
             rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb";

     

       81
       -
             sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c";

     

       82
       -
           };

     

       83
       -
         }

     

       84
       -
         {

     

       85
       -
           goPackagePath = "golang.org/x/net";

     

       86
       -
           fetch = {

     

       87
       -
             type = "git";

     

       88
       -
             url = "https://go.googlesource.com/net";

     

       89
       -
             rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";

     

       90
       -
             sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";

     

       91
       -
           };

     

       92
       -
         }

     

       93
       -
         {

     

       94
       -
           goPackagePath = "gopkg.in/flosch/pongo2.v3";

     

       95
       -
           fetch = {

     

       96
       -
             type = "git";

     

       97
       -
             url = "https://gopkg.in/flosch/pongo2.v3";

     

       98
       -
             rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";

     

       99
       -
             sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";

     

       100
       -
           };

     

       101
       -
         }

     

       102
       -
         {

     

       103
       -
           goPackagePath = "gopkg.in/inconshreveable/log15.v2";

     

       104
       -
           fetch = {

     

       105
       -
             type = "git";

     

       106
       -
             url = "https://gopkg.in/inconshreveable/log15.v2";

     

       107
       -
             rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";

     

       108
       -
             sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";

     

       109
       -
           };

     

       110
       -
         }

     

       111
       -
         {

     

       112
       -
           goPackagePath = "gopkg.in/lxc/go-lxc.v2";

     

       113
       -
           fetch = {

     

       114
       -
             type = "git";

     

       115
       -
             url = "https://gopkg.in/lxc/go-lxc.v2";

     

       116
       -
             rev = "8304875cc3423823032ec93556beee076c6ba687";

     

       117
       -
             sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk";

     

       118
       -
           };

     

       119
       -
         }

     

       120
       -
         {

     

       121
       -
           goPackagePath = "gopkg.in/tomb.v2";

     

       122
       -
           fetch = {

     

       123
       -
             type = "git";

     

       124
       -
             url = "https://gopkg.in/tomb.v2";

     

       125
       -
             rev = "d5d1b5820637886def9eef33e03a27a9f166942c";

     

       126
       -
             sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10";

     

       127
       -
           };

     

       128
       -
         }

     

       129
       -
         {

     

       130
       -
           goPackagePath = "gopkg.in/yaml.v2";

     

       131
       -
           fetch = {

     

       132
       -
             type = "git";

     

       133
       -
             url = "https://gopkg.in/yaml.v2";

     

       134
       -
             rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";

     

       135
       -
             sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";

     

       136
       -
           };

     

       137
       -
         }

     

       138
       -
         {

     

       139
       -
             goPackagePath = "github.com/gosexy/gettext";

     

       140
       -
             fetch = {

     

       141
       -
               type = "git";

     

       142
       -
               url = "https://github.com/gosexy/gettext";

     

       143
       -
               rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";

     

       144
       -
               sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";

     

       145
       -
             };

     

       146
       -
         }

     

       147
       -
         {

     

       148
       -
             goPackagePath = "github.com/olekukonko/tablewriter";

     

       149
       -
             fetch = {

     

       150
       -
               type = "git";

     

       151
       -
               url = "https://github.com/olekukonko/tablewriter";

     

       152
       -
               rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb";

     

       153
       -
               sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g";

     

       154
       -
             };

     

       155
       -
         }

     

       156
       -
         {

     

       157
       -
             goPackagePath = "github.com/mattn/go-runewidth";

     

       158
       -
             fetch = {

     

       159
       -
               type = "git";

     

       160
       -
               url = "https://github.com/mattn/go-runewidth";

     

       161
       -
               rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";

     

       162
       -
               sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";

     

       163
       -
             };

     

       164
       -
         }

     

       165
       -
       ]