commit 0cecb3303a960266b6ac301ce8876a62159f48f0 · pyrox.dev/nixpkgs

+47

pkgs/tools/virtualization/lxd-image-server/default.nix

···

       1
       +
       { lib

     

       2
       +
       , openssl

     

       3
       +
       , rsync

     

       4
       +
       , python3

     

       5
       +
       , fetchFromGitHub

     

       6
       +
       }:

     

       7
       +
       

     

       8
       +
       python3.pkgs.buildPythonApplication rec {

     

       9
       +
         pname = "lxd-image-server";

     

       10
       +
         version = "0.0.4";

     

       11
       +
       

     

       12
       +
         src = fetchFromGitHub {

     

       13
       +
           owner = "Avature";

     

       14
       +
           repo = "lxd-image-server";

     

       15
       +
           rev = version;

     

       16
       +
           sha256 = "yx8aUmMfSzyWaM6M7+WcL6ouuWwOpqLzODWSdNgwCwo=";

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         patches = [

     

       20
       +
           ./state.patch

     

       21
       +
           ./run.patch

     

       22
       +
         ];

     

       23
       +
       

     

       24
       +
         propagatedBuildInputs = with python3.pkgs; [

     

       25
       +
           setuptools

     

       26
       +
           attrs

     

       27
       +
           click

     

       28
       +
           inotify

     

       29
       +
           cryptography

     

       30
       +
           confight

     

       31
       +
           python-pidfile

     

       32
       +
         ];

     

       33
       +
       

     

       34
       +
         makeWrapperArgs = [

     

       35
       +
           ''--prefix PATH ':' "${lib.makeBinPath [ openssl rsync ]}"''

     

       36
       +
         ];

     

       37
       +
       

     

       38
       +
         doCheck = false;

     

       39
       +
       

     

       40
       +
         meta = with lib; {

     

       41
       +
           description = "Creates and manages a simplestreams lxd image server on top of nginx";

     

       42
       +
           homepage = "https://github.com/Avature/lxd-image-server";

     

       43
       +
           license = licenses.apsl20;

     

       44
       +
           platforms = platforms.unix;

     

       45
       +
           maintainers = with maintainers; [ mkg20001 ];

     

       46
       +
         };

     

       47
       +
       }

+25

pkgs/tools/virtualization/lxd-image-server/run.patch

···

       1
       +
       From df2ce9fb48a3790407646a388e0d220a75496c52 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>

     

       3
       +
       Date: Wed, 3 Nov 2021 14:23:38 +0100

     

       4
       +
       Subject: [PATCH] /var/run -> /run

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        lxd_image_server/tools/config.py | 2 +-

     

       8
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       +
       

     

       10
       +
       diff --git a/lxd_image_server/tools/config.py b/lxd_image_server/tools/config.py

     

       11
       +
       index 60e8973..23d392a 100644

     

       12
       +
       --- a/lxd_image_server/tools/config.py

     

       13
       +
       +++ b/lxd_image_server/tools/config.py

     

       14
       +
       @@ -9,7 +9,7 @@ import confight

     

       15
       +
        class Config():

     

       16
       +
        

     

       17
       +
            _lock = Lock()

     

       18
       +
       -    pidfile = Path('/var/run/lxd-image-server/pidfile')

     

       19
       +
       +    pidfile = Path('/run/lxd-image-server/pidfile')

     

       20
       +
            data = {}

     

       21
       +
        

     

       22
       +
            @classmethod

     

       23
       +
       -- 

     

       24
       +
       2.33.0

     

       25
       +

+49

pkgs/tools/virtualization/lxd-image-server/state.patch

···

       1
       +
       From 17a1e09eaf8957174425d05200be9ee3e77229f9 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>

     

       3
       +
       Date: Thu, 21 Oct 2021 00:39:08 +0200

     

       4
       +
       Subject: [PATCH] Remove system-state changing code

     

       5
       +
       

     

       6
       +
       This is already done by the module on nixOS

     

       7
       +
       ---

     

       8
       +
        lxd_image_server/cli.py | 15 +--------------

     

       9
       +
        1 file changed, 1 insertion(+), 14 deletions(-)

     

       10
       +
       

     

       11
       +
       diff --git a/lxd_image_server/cli.py b/lxd_image_server/cli.py

     

       12
       +
       index d276e6d..f759bf2 100644

     

       13
       +
       --- a/lxd_image_server/cli.py

     

       14
       +
       +++ b/lxd_image_server/cli.py

     

       15
       +
       @@ -140,30 +140,17 @@ def reload_config():

     

       16
       +
        @cli.command()

     

       17
       +
        @click.option('--root_dir', default='/var/www/simplestreams',

     

       18
       +
                      show_default=True)

     

       19
       +
       -@click.option('--ssl_dir', default='/etc/nginx/ssl', show_default=True,

     

       20
       +
       -              callback=lambda ctx, param, val: Path(val))

     

       21
       +
        @click.pass_context

     

       22
       +
       -def init(ctx, root_dir, ssl_dir):

     

       23
       +
       +def init(ctx, root_dir):

     

       24
       +
            if not Path(root_dir).exists():

     

       25
       +
                logger.error('Root directory does not exists')

     

       26
       +
            else:

     

       27
       +
       -        if not ssl_dir.exists():

     

       28
       +
       -            os.makedirs(str(ssl_dir))

     

       29
       +
       -

     

       30
       +
       -        if not (ssl_dir / 'nginx.key').exists():

     

       31
       +
       -            generate_cert(str(ssl_dir))

     

       32
       +
       -

     

       33
       +
                img_dir = str(Path(root_dir, 'images'))

     

       34
       +
                streams_dir = str(Path(root_dir, 'streams/v1'))

     

       35
       +
                if not Path(img_dir).exists():

     

       36
       +
                    os.makedirs(img_dir)

     

       37
       +
                if not Path(streams_dir).exists():

     

       38
       +
                    os.makedirs(streams_dir)

     

       39
       +
       -        conf_path = Path('/etc/nginx/sites-enabled/simplestreams.conf')

     

       40
       +
       -        if not conf_path.exists():

     

       41
       +
       -            conf_path.symlink_to(

     

       42
       +
       -                '/etc/nginx/sites-available/simplestreams.conf')

     

       43
       +
       -            os.system('nginx -s reload')

     

       44
       +
        

     

       45
       +
                if not Path(root_dir, 'streams', 'v1', 'images.json').exists():

     

       46
       +
                    ctx.invoke(update, img_dir=Path(root_dir, 'images'),

     

       47
       +
       -- 

     

       48
       +
       2.33.0

     

       49
       +

pkgs/top-level/all-packages.nix

···

       7360
        
         lxcfs = callPackage ../os-specific/linux/lxcfs { };

     

       7361
        
         lxd = callPackage ../tools/admin/lxd { };

     

       7362
        
       

     

       0
        
       
     

       0
        
       
     

       7363
        
         lzfse = callPackage ../tools/compression/lzfse { };

     

       7364
        
       

     

       7365
        
         lzham = callPackage ../tools/compression/lzham { };

···

       7360
        
         lxcfs = callPackage ../os-specific/linux/lxcfs { };

     

       7361
        
         lxd = callPackage ../tools/admin/lxd { };

     

       7362
        
       

     

       7363
       +
         lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { };

     

       7364
       +
       

     

       7365
        
         lzfse = callPackage ../tools/compression/lzfse { };

     

       7366
        
       

     

       7367
        
         lzham = callPackage ../tools/compression/lzham { };