commit 84ad8e2e9c4c2a8546e8d27c9981bfa1defb554a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1250
       1250
        
         privoxy = runTest ./privoxy.nix;

     

       1251
       1251
        
         prometheus = import ./prometheus { inherit runTest; };

     

       1252
       1252
        
         prometheus-exporters = handleTest ./prometheus-exporters.nix { };

     

       1253
       1253
       -
         prosody = handleTest ./xmpp/prosody.nix { };

     

       1253
       1253
       +
         prosody = runTest ./xmpp/prosody.nix;

     

       1254
       1254
        
         prosody-mysql = handleTest ./xmpp/prosody-mysql.nix { };

     

       1255
       1255
        
         proxy = runTest ./proxy.nix;

     

       1256
       1256
        
         prowlarr = runTest ./prowlarr.nix;

+26 -3

nixos/tests/xmpp/ejabberd.nix

···

       2
       2
        
         cert =

     

       3
       3
        
           pkgs:

     

       4
       4
        
           pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''

     

       5
       5
       -
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com/CN=matrix.example.com' -days 36500

     

       5
       5
       +
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com/CN=matrix.example.com' -addext "subjectAltName = DNS:example.com,DNS:muc.example.com,DNS:matrix.example.com" -days 36500

     

       6
       6
        
             mkdir -p $out

     

       7
       7
        
             cp key.pem cert.pem $out

     

       8
       8
        
           '';

     
···

       14
       14
        
           maintainers = [ ];

     

       15
       15
        
         };

     

       16
       16
        
         nodes = {

     

       17
       17
       -
           client =

     

       17
       17
       +
           client-a =

     

       18
       18
       +
             { nodes, pkgs, ... }:

     

       19
       19
       +
             {

     

       20
       20
       +
               security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];

     

       21
       21
       +
               networking.extraHosts = ''

     

       22
       22
       +
                 ${nodes.server.networking.primaryIPAddress} example.com

     

       23
       23
       +
               '';

     

       24
       24
       +
       

     

       25
       25
       +
               imports = [ ./go-sendxmpp-listen.nix ];

     

       26
       26
       +
             };

     

       27
       27
       +
       

     

       28
       28
       +
           client-b =

     

       18
       29
        
             { nodes, pkgs, ... }:

     

       19
       30
        
             {

     

       20
       31
        
               security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];

     
···

       28
       39
        
                 })

     

       29
       40
        
               ];

     

       30
       41
        
             };

     

       42
       42
       +
       

     

       31
       43
        
           server =

     

       32
       44
        
             { config, pkgs, ... }:

     

       33
       45
        
             {

     
···

       310
       322
        
                 ejabberd_prefix + "register cthon98 example.com nothunter2",

     

       311
       323
        
             )

     

       312
       324
        
             server.fail(ejabberd_prefix + "register asdf wrong.domain")

     

       313
       313
       -
             client.succeed("send-message")

     

       325
       325
       +
       

     

       326
       326
       +
             for machine in client_a, client_b:

     

       327
       327
       +
               machine.systemctl("start network-online.target")

     

       328
       328
       +
               machine.wait_for_unit("network-online.target")

     

       329
       329
       +
       

     

       330
       330
       +
             client_a.wait_for_unit("go-sendxmpp-listen")

     

       331
       331
       +
             client_b.succeed("send-message")

     

       332
       332
       +
       

     

       333
       333
       +
             client_a.wait_until_succeeds(

     

       334
       334
       +
               "journalctl -o cat -u go-sendxmpp-listen.service | grep 'cthon98@example.com: Hello, this is dog.'"

     

       335
       335
       +
             )

     

       336
       336
       +
       

     

       314
       337
        
             server.succeed(

     

       315
       338
        
                 ejabberd_prefix + "unregister cthon98 example.com",

     

       316
       339
        
                 ejabberd_prefix + "unregister azurediamond example.com",

+22

nixos/tests/xmpp/go-sendxmpp-listen.nix

···

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         systemd.services.go-sendxmpp-listen = {

     

       5
       5
       +
           after = [ "network-online.target" ];

     

       6
       6
       +
           requires = [ "network-online.target" ];

     

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

     

       8
       8
       +
       

     

       9
       9
       +
           serviceConfig = {

     

       10
       10
       +
             ExecStart = ''

     

       11
       11
       +
               ${lib.getExe pkgs.go-sendxmpp} --username azurediamond@example.com --password hunter2 --listen

     

       12
       12
       +
             '';

     

       13
       13
       +
             Environment = [

     

       14
       14
       +
               "HOME=/var/lib/go-sendxmpp/"

     

       15
       15
       +
             ];

     

       16
       16
       +
             DynamicUser = true;

     

       17
       17
       +
             Restart = "on-failure";

     

       18
       18
       +
             RestartSec = "5s";

     

       19
       19
       +
             StateDirectory = "go-sendxmpp";

     

       20
       20
       +
           };

     

       21
       21
       +
         };

     

       22
       22
       +
       }

+28 -4

nixos/tests/xmpp/prosody.nix

···

       1
       1
       +
       { ... }:

     

       2
       2
       +
       

     

       1
       3
        
       let

     

       2
       4
        
         cert =

     

       3
       5
        
           pkgs:

     

       4
       6
        
           pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''

     

       5
       7
        
             openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 365 \

     

       6
       6
       -
               -subj '/C=GB/CN=example.com' -addext "subjectAltName = DNS:example.com,DNS:uploads.example.com,DNS:conference.example.com"

     

       8
       8
       +
               -subj '/C=GB/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -addext "subjectAltName = DNS:example.com,DNS:uploads.example.com,DNS:conference.example.com"

     

       7
       9
        
             mkdir -p $out

     

       8
       10
        
             cp key.pem cert.pem $out

     

       9
       11
        
           '';

     
···

       29
       31
        
             prosodyctl deluser azurediamond@example.com

     

       30
       32
        
           '';

     

       31
       33
        
       in

     

       32
       32
       -
       import ../make-test-python.nix {

     

       34
       34
       +
       {

     

       33
       35
        
         name = "prosody";

     

       34
       36
        
         nodes = {

     

       35
       35
       -
           client =

     

       37
       37
       +
           client-a =

     

       38
       38
       +
             { nodes, pkgs, ... }:

     

       39
       39
       +
             {

     

       40
       40
       +
               security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];

     

       41
       41
       +
               networking.extraHosts = ''

     

       42
       42
       +
                 ${nodes.server.networking.primaryIPAddress} example.com

     

       43
       43
       +
               '';

     

       44
       44
       +
       

     

       45
       45
       +
               imports = [ ./go-sendxmpp-listen.nix ];

     

       46
       46
       +
             };

     

       47
       47
       +
       

     

       48
       48
       +
           client-b =

     

       36
       49
        
             {

     

       37
       50
        
               nodes,

     

       38
       51
        
               pkgs,

     
···

       93
       106
        
           server.succeed('prosodyctl status | grep "Prosody is running"')

     

       94
       107
        
       

     

       95
       108
        
           server.succeed("create-prosody-users")

     

       96
       96
       -
           client.succeed("send-message")

     

       109
       109
       +
       

     

       110
       110
       +
           for machine in client_a, client_b:

     

       111
       111
       +
             machine.systemctl("start network-online.target")

     

       112
       112
       +
             machine.wait_for_unit("network-online.target")

     

       113
       113
       +
       

     

       114
       114
       +
           client_a.wait_for_unit("go-sendxmpp-listen")

     

       115
       115
       +
           client_b.succeed("send-message")

     

       116
       116
       +
       

     

       117
       117
       +
           client_a.wait_until_succeeds(

     

       118
       118
       +
             "journalctl -o cat -u go-sendxmpp-listen.service | grep 'cthon98@example.com: Hello, this is dog.'"

     

       119
       119
       +
           )

     

       120
       120
       +
       

     

       97
       121
        
           server.succeed("delete-prosody-users")

     

       98
       122
        
         '';

     

       99
       123
        
       }

+39

pkgs/by-name/go/go-sendxmpp/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildGoModule,

     

       3
       3
       +
         fetchFromGitLab,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         nix-update-script,

     

       6
       6
       +
         testers,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildGoModule (finalAttrs: {

     

       10
       10
       +
         pname = "go-sendxmpp";

     

       11
       11
       +
         version = "0.14.1";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitLab {

     

       14
       14
       +
           domain = "salsa.debian.org";

     

       15
       15
       +
           owner = "mdosch";

     

       16
       16
       +
           repo = "go-sendxmpp";

     

       17
       17
       +
           tag = "v${finalAttrs.version}";

     

       18
       18
       +
           hash = "sha256-nQ2URhkOp0mb4u4IG3wzGIdhP6svDVMctbu2CHQXj2Y=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         vendorHash = "sha256-aMhUsYsQvnhEVkWbjbh84bbStQ4b/0ZHEvzEhXSlFyw=";

     

       22
       22
       +
       

     

       23
       23
       +
         passthru = {

     

       24
       24
       +
           tests.version = testers.testVersion {

     

       25
       25
       +
             package = finalAttrs.finalPackage;

     

       26
       26
       +
           };

     

       27
       27
       +
           updateScript = nix-update-script { };

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         meta = {

     

       31
       31
       +
           description = "Tool to send messages or files to an XMPP contact or MUC";

     

       32
       32
       +
           homepage = "https://salsa.debian.org/mdosch/go-sendxmpp";

     

       33
       33
       +
           license = lib.licenses.bsd2;

     

       34
       34
       +
           maintainers = with lib.maintainers; [

     

       35
       35
       +
             jpds

     

       36
       36
       +
           ];

     

       37
       37
       +
           mainProgram = "go-sendxmpp";

     

       38
       38
       +
         };

     

       39
       39
       +
       })