commit da6ecbe5390cbf0e3267e6d5e0151609535de5ba · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       552
        
         freenet = runTest ./freenet.nix;

     

       553
        
         freeswitch = runTest ./freeswitch.nix;

     

       554
        
         freetube = discoverTests (import ./freetube.nix);

     

       555
       -
         freshrss = handleTest ./freshrss { };

     

       556
        
         frigate = runTest ./frigate.nix;

     

       557
        
         froide-govplan = runTest ./web-apps/froide-govplan.nix;

     

       558
        
         frp = runTest ./frp.nix;

···

       552
        
         freenet = runTest ./freenet.nix;

     

       553
        
         freeswitch = runTest ./freeswitch.nix;

     

       554
        
         freetube = discoverTests (import ./freetube.nix);

     

       555
       +
         freshrss = import ./freshrss { inherit runTest; };

     

       556
        
         frigate = runTest ./frigate.nix;

     

       557
        
         froide-govplan = runTest ./web-apps/froide-govplan.nix;

     

       558
        
         frp = runTest ./frp.nix;

+25 -27

nixos/tests/freshrss/caddy-sqlite.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-caddy-sqlite";

     

       5
       -
           meta.maintainers = with lib.maintainers; [

     

       6
       -
             etu

     

       7
       -
             stunkymonkey

     

       8
       -
           ];

     

       9
        
       

     

       10
       -
           nodes.machine =

     

       11
       -
             { pkgs, ... }:

     

       12
       -
             {

     

       13
       -
               services.freshrss = {

     

       14
       -
                 enable = true;

     

       15
       -
                 baseUrl = "http://localhost";

     

       16
       -
                 passwordFile = pkgs.writeText "password" "secret";

     

       17
       -
                 dataDir = "/srv/freshrss";

     

       18
       -
                 webserver = "caddy";

     

       19
       -
                 virtualHost = "freshrss:80";

     

       20
       -
               };

     

       21
        
             };

     

       0
        
       
     

       22
        
       

     

       23
       -
           testScript = ''

     

       24
       -
             machine.wait_for_unit("multi-user.target")

     

       25
       -
             machine.wait_for_open_port(80)

     

       26
       -
             response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       27
       -
             assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       28
       -
           '';

     

       29
       -
         }

     

       30
       -
       )

···

       1
       +
       { lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = "freshrss-caddy-sqlite";

     

       4
       +
         meta.maintainers = with lib.maintainers; [

     

       5
       +
           etu

     

       6
       +
           stunkymonkey

     

       7
       +
         ];

     

       0
        
       
     

       8
        
       

     

       9
       +
         nodes.machine =

     

       10
       +
           { pkgs, ... }:

     

       11
       +
           {

     

       12
       +
             services.freshrss = {

     

       13
       +
               enable = true;

     

       14
       +
               baseUrl = "http://localhost";

     

       15
       +
               passwordFile = pkgs.writeText "password" "secret";

     

       16
       +
               dataDir = "/srv/freshrss";

     

       17
       +
               webserver = "caddy";

     

       18
       +
               virtualHost = "freshrss:80";

     

       0
        
       
     

       19
        
             };

     

       20
       +
           };

     

       21
        
       

     

       22
       +
         testScript = ''

     

       23
       +
           machine.wait_for_unit("multi-user.target")

     

       24
       +
           machine.wait_for_open_port(80)

     

       25
       +
           response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       26
       +
           assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       27
       +
         '';

     

       28
       +
       }

     

       0

+7 -7

nixos/tests/freshrss/default.nix

···

       1
       -
       { system, pkgs, ... }:

     

       2
        
       

     

       3
        
       {

     

       4
       -
         extensions = import ./extensions.nix { inherit system pkgs; };

     

       5
       -
         http-auth = import ./http-auth.nix { inherit system pkgs; };

     

       6
       -
         none-auth = import ./none-auth.nix { inherit system pkgs; };

     

       7
       -
         pgsql = import ./pgsql.nix { inherit system pkgs; };

     

       8
       -
         nginx-sqlite = import ./nginx-sqlite.nix { inherit system pkgs; };

     

       9
       -
         caddy-sqlite = import ./caddy-sqlite.nix { inherit system pkgs; };

     

       10
        
       }

···

       1
       +
       { runTest }:

     

       2
        
       

     

       3
        
       {

     

       4
       +
         extensions = runTest ./extensions.nix;

     

       5
       +
         http-auth = runTest ./http-auth.nix;

     

       6
       +
         none-auth = runTest ./none-auth.nix;

     

       7
       +
         pgsql = runTest ./pgsql.nix;

     

       8
       +
         nginx-sqlite = runTest ./nginx-sqlite.nix;

     

       9
       +
         caddy-sqlite = runTest ./caddy-sqlite.nix;

     

       10
        
       }

+18 -21

nixos/tests/freshrss/extensions.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-extensions";

     

       5
        
       

     

       6
       -
           nodes.machine =

     

       7
       -
             { pkgs, ... }:

     

       8
       -
             {

     

       9
       -
               services.freshrss = {

     

       10
       -
                 enable = true;

     

       11
       -
                 baseUrl = "http://localhost";

     

       12
       -
                 authType = "none";

     

       13
       -
                 extensions = [ pkgs.freshrss-extensions.youtube ];

     

       14
       -
               };

     

       15
        
             };

     

       0
        
       
     

       16
        
       

     

       17
       -
           testScript = ''

     

       18
       -
             machine.wait_for_unit("multi-user.target")

     

       19
       -
             machine.wait_for_open_port(80)

     

       20
       -
             response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")

     

       21
       -
             assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."

     

       22
       -
           '';

     

       23
       -
         }

     

       24
       -
       )

···

       1
       +
       {

     

       2
       +
         name = "freshrss-extensions";

     

       0
        
       
     

       0
        
       
     

       3
        
       

     

       4
       +
         nodes.machine =

     

       5
       +
           { pkgs, ... }:

     

       6
       +
           {

     

       7
       +
             services.freshrss = {

     

       8
       +
               enable = true;

     

       9
       +
               baseUrl = "http://localhost";

     

       10
       +
               authType = "none";

     

       11
       +
               extensions = [ pkgs.freshrss-extensions.youtube ];

     

       0
        
       
     

       12
        
             };

     

       13
       +
           };

     

       14
        
       

     

       15
       +
         testScript = ''

     

       16
       +
           machine.wait_for_unit("multi-user.target")

     

       17
       +
           machine.wait_for_open_port(80)

     

       18
       +
           response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")

     

       19
       +
           assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."

     

       20
       +
         '';

     

       21
       +
       }

     

       0

+19 -23

nixos/tests/freshrss/http-auth.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-http-auth";

     

       5
       -
           meta.maintainers = with lib.maintainers; [ mattchrist ];

     

       6
        
       

     

       7
       -
           nodes.machine =

     

       8
       -
             { pkgs, ... }:

     

       9
       -
             {

     

       10
       -
               services.freshrss = {

     

       11
       -
                 enable = true;

     

       12
       -
                 baseUrl = "http://localhost";

     

       13
       -
                 dataDir = "/srv/freshrss";

     

       14
       -
                 authType = "http_auth";

     

       15
       -
               };

     

       16
       -
             };

     

       17
        
       

     

       18
       -
           testScript = ''

     

       19
       -
             machine.wait_for_unit("multi-user.target")

     

       20
       -
             machine.wait_for_open_port(80)

     

       21
       -
             response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")

     

       22
       -
             assert 'Account: testuser' in response, "http_auth method didn't work."

     

       23
       -
           '';

     

       24
       -
         }

     

       25
       -
       )

···

       1
       +
       { lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = "freshrss-http-auth";

     

       4
       +
         meta.maintainers = with lib.maintainers; [ mattchrist ];

     

       0
        
       
     

       5
        
       

     

       6
       +
         nodes.machine = {

     

       7
       +
           services.freshrss = {

     

       8
       +
             enable = true;

     

       9
       +
             baseUrl = "http://localhost";

     

       10
       +
             dataDir = "/srv/freshrss";

     

       11
       +
             authType = "http_auth";

     

       12
       +
           };

     

       13
       +
         };

     

       0
        
       
     

       0
        
       
     

       14
        
       

     

       15
       +
         testScript = ''

     

       16
       +
           machine.wait_for_unit("multi-user.target")

     

       17
       +
           machine.wait_for_open_port(80)

     

       18
       +
           response = machine.succeed("curl -vvv -s -H 'Host: freshrss' -H 'Remote-User: testuser' http://localhost:80/i/")

     

       19
       +
           assert 'Account: testuser' in response, "http_auth method didn't work."

     

       20
       +
         '';

     

       21
       +
       }

     

       0

+23 -25

nixos/tests/freshrss/nginx-sqlite.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-nginx-sqlite";

     

       5
       -
           meta.maintainers = with lib.maintainers; [

     

       6
       -
             etu

     

       7
       -
             stunkymonkey

     

       8
       -
           ];

     

       9
        
       

     

       10
       -
           nodes.machine =

     

       11
       -
             { pkgs, ... }:

     

       12
       -
             {

     

       13
       -
               services.freshrss = {

     

       14
       -
                 enable = true;

     

       15
       -
                 baseUrl = "http://localhost";

     

       16
       -
                 passwordFile = pkgs.writeText "password" "secret";

     

       17
       -
                 dataDir = "/srv/freshrss";

     

       18
       -
               };

     

       19
        
             };

     

       0
        
       
     

       20
        
       

     

       21
       -
           testScript = ''

     

       22
       -
             machine.wait_for_unit("multi-user.target")

     

       23
       -
             machine.wait_for_open_port(80)

     

       24
       -
             response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       25
       -
             assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       26
       -
           '';

     

       27
       -
         }

     

       28
       -
       )

···

       1
       +
       { lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = "freshrss-nginx-sqlite";

     

       4
       +
         meta.maintainers = with lib.maintainers; [

     

       5
       +
           etu

     

       6
       +
           stunkymonkey

     

       7
       +
         ];

     

       0
        
       
     

       8
        
       

     

       9
       +
         nodes.machine =

     

       10
       +
           { pkgs, ... }:

     

       11
       +
           {

     

       12
       +
             services.freshrss = {

     

       13
       +
               enable = true;

     

       14
       +
               baseUrl = "http://localhost";

     

       15
       +
               passwordFile = pkgs.writeText "password" "secret";

     

       16
       +
               dataDir = "/srv/freshrss";

     

       0
        
       
     

       17
        
             };

     

       18
       +
           };

     

       19
        
       

     

       20
       +
         testScript = ''

     

       21
       +
           machine.wait_for_unit("multi-user.target")

     

       22
       +
           machine.wait_for_open_port(80)

     

       23
       +
           response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       24
       +
           assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       25
       +
         '';

     

       26
       +
       }

     

       0

+18 -22

nixos/tests/freshrss/none-auth.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-none-auth";

     

       5
       -
           meta.maintainers = with lib.maintainers; [ mattchrist ];

     

       6
        
       

     

       7
       -
           nodes.machine =

     

       8
       -
             { pkgs, ... }:

     

       9
       -
             {

     

       10
       -
               services.freshrss = {

     

       11
       -
                 enable = true;

     

       12
       -
                 baseUrl = "http://localhost";

     

       13
       -
                 authType = "none";

     

       14
       -
               };

     

       15
       -
             };

     

       16
        
       

     

       17
       -
           testScript = ''

     

       18
       -
             machine.wait_for_unit("multi-user.target")

     

       19
       -
             machine.wait_for_open_port(80)

     

       20
       -
             response = machine.succeed("curl -vvv -s http://localhost:80/i/")

     

       21
       -
             assert '<title> · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"

     

       22
       -
           '';

     

       23
       -
         }

     

       24
       -
       )

···

       1
       +
       { lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = "freshrss-none-auth";

     

       4
       +
         meta.maintainers = with lib.maintainers; [ mattchrist ];

     

       0
        
       
     

       5
        
       

     

       6
       +
         nodes.machine = {

     

       7
       +
           services.freshrss = {

     

       8
       +
             enable = true;

     

       9
       +
             baseUrl = "http://localhost";

     

       10
       +
             authType = "none";

     

       11
       +
           };

     

       12
       +
         };

     

       0
        
       
     

       0
        
       
     

       13
        
       

     

       14
       +
         testScript = ''

     

       15
       +
           machine.wait_for_unit("multi-user.target")

     

       16
       +
           machine.wait_for_open_port(80)

     

       17
       +
           response = machine.succeed("curl -vvv -s http://localhost:80/i/")

     

       18
       +
           assert '<title> · FreshRSS</title>' in response, "FreshRSS stream page didn't load successfully"

     

       19
       +
         '';

     

       20
       +
       }

     

       0

+46 -48

nixos/tests/freshrss/pgsql.nix

···

       1
       -
       import ../make-test-python.nix (

     

       2
       -
         { lib, pkgs, ... }:

     

       3
       -
         {

     

       4
       -
           name = "freshrss-pgsql";

     

       5
       -
           meta.maintainers = with lib.maintainers; [

     

       6
       -
             etu

     

       7
       -
             stunkymonkey

     

       8
       -
           ];

     

       9
        
       

     

       10
       -
           nodes.machine =

     

       11
       -
             { pkgs, ... }:

     

       12
       -
             {

     

       13
       -
               services.freshrss = {

     

       14
       -
                 enable = true;

     

       15
       -
                 baseUrl = "http://localhost";

     

       16
       -
                 passwordFile = pkgs.writeText "password" "secret";

     

       17
       -
                 dataDir = "/srv/freshrss";

     

       18
       -
                 database = {

     

       19
       -
                   type = "pgsql";

     

       20
       -
                   port = 5432;

     

       21
       -
                   user = "freshrss";

     

       22
       -
                   passFile = pkgs.writeText "db-password" "db-secret";

     

       23
       -
                 };

     

       24
        
               };

     

       0
        
       
     

       25
        
       

     

       26
       -
               services.postgresql = {

     

       27
       -
                 enable = true;

     

       28
       -
                 ensureDatabases = [ "freshrss" ];

     

       29
       -
                 ensureUsers = [

     

       30
       -
                   {

     

       31
       -
                     name = "freshrss";

     

       32
       -
                     ensureDBOwnership = true;

     

       33
       -
                   }

     

       34
       -
                 ];

     

       35
       -
                 initialScript = pkgs.writeText "postgresql-password" ''

     

       36
       -
                   CREATE ROLE freshrss WITH LOGIN PASSWORD 'db-secret' CREATEDB;

     

       37
       -
                 '';

     

       38
       -
               };

     

       39
        
       

     

       40
       -
               systemd.services."freshrss-config" = {

     

       41
       -
                 requires = [ "postgresql.target" ];

     

       42
       -
                 after = [ "postgresql.target" ];

     

       43
       -
               };

     

       44
        
             };

     

       0
        
       
     

       45
        
       

     

       46
       -
           testScript = ''

     

       47
       -
             machine.wait_for_unit("multi-user.target")

     

       48
       -
             machine.wait_for_open_port(5432)

     

       49
       -
             machine.wait_for_open_port(80)

     

       50
       -
             response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       51
       -
             assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       52
       -
           '';

     

       53
       -
         }

     

       54
       -
       )

···

       1
       +
       { lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = "freshrss-pgsql";

     

       4
       +
         meta.maintainers = with lib.maintainers; [

     

       5
       +
           etu

     

       6
       +
           stunkymonkey

     

       7
       +
         ];

     

       0
        
       
     

       8
        
       

     

       9
       +
         nodes.machine =

     

       10
       +
           { pkgs, ... }:

     

       11
       +
           {

     

       12
       +
             services.freshrss = {

     

       13
       +
               enable = true;

     

       14
       +
               baseUrl = "http://localhost";

     

       15
       +
               passwordFile = pkgs.writeText "password" "secret";

     

       16
       +
               dataDir = "/srv/freshrss";

     

       17
       +
               database = {

     

       18
       +
                 type = "pgsql";

     

       19
       +
                 port = 5432;

     

       20
       +
                 user = "freshrss";

     

       21
       +
                 passFile = pkgs.writeText "db-password" "db-secret";

     

       0
        
       
     

       22
        
               };

     

       23
       +
             };

     

       24
        
       

     

       25
       +
             services.postgresql = {

     

       26
       +
               enable = true;

     

       27
       +
               ensureDatabases = [ "freshrss" ];

     

       28
       +
               ensureUsers = [

     

       29
       +
                 {

     

       30
       +
                   name = "freshrss";

     

       31
       +
                   ensureDBOwnership = true;

     

       32
       +
                 }

     

       33
       +
               ];

     

       34
       +
               initialScript = pkgs.writeText "postgresql-password" ''

     

       35
       +
                 CREATE ROLE freshrss WITH LOGIN PASSWORD 'db-secret' CREATEDB;

     

       36
       +
               '';

     

       37
       +
             };

     

       38
        
       

     

       39
       +
             systemd.services."freshrss-config" = {

     

       40
       +
               requires = [ "postgresql.target" ];

     

       41
       +
               after = [ "postgresql.target" ];

     

       0
        
       
     

       42
        
             };

     

       43
       +
           };

     

       44
        
       

     

       45
       +
         testScript = ''

     

       46
       +
           machine.wait_for_unit("multi-user.target")

     

       47
       +
           machine.wait_for_open_port(5432)

     

       48
       +
           machine.wait_for_open_port(80)

     

       49
       +
           response = machine.succeed("curl -vvv -s -H 'Host: freshrss' http://localhost:80/i/")

     

       50
       +
           assert '<title>Login · FreshRSS</title>' in response, "Login page didn't load successfully"

     

       51
       +
         '';

     

       52
       +
       }

     

       0