commit eac5dfd20ff4a618b0b62262bdafcd2245f2c7ea · pyrox.dev/nixpkgs

+3 -10

nixos/modules/services/web-apps/lanraragi.nix

···

       72
       72
        
               "HOME" = "/var/lib/lanraragi";

     

       73
       73
        
             };

     

       74
       74
        
             preStart = ''

     

       75
       75
       -
               REDIS_PASS=${lib.optionalString (cfg.redis.passwordFile != null) "$(head -n1 ${cfg.redis.passwordFile})"}

     

       76
       75
        
               cat > lrr.conf <<EOF

     

       77
       76
        
               {

     

       78
       77
        
                 redis_address => "127.0.0.1:${toString cfg.redis.port}",

     

       79
       79
       -
                 redis_password => "$REDIS_PASS",

     

       78
       78
       +
                 redis_password => "${lib.optionalString (cfg.redis.passwordFile != null) ''$(head -n1 ${cfg.redis.passwordFile})''}",

     

       80
       79
        
                 redis_database => "0",

     

       81
       80
        
                 redis_database_minion => "1",

     

       82
       81
        
                 redis_database_config => "2",

     
···

       84
       83
        
               }

     

       85
       84
        
               EOF

     

       86
       85
        
             '' + lib.optionalString (cfg.passwordFile != null) ''

     

       87
       87
       -
               PASS_HASH=$(

     

       88
       88
       -
                 PASS=$(head -n1 ${cfg.passwordFile}) ${cfg.package.perlEnv}/bin/perl -I${cfg.package}/share/lanraragi/lib -e \

     

       89
       89
       -
                   'use LANraragi::Controller::Config; print LANraragi::Controller::Config::make_password_hash($ENV{PASS})' \

     

       90
       90
       -
                   2>/dev/null

     

       91
       91
       -
               )

     

       92
       92
       -
       

     

       93
       93
       -
               ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} -a "$REDIS_PASS" <<EOF

     

       86
       86
       +
               ${lib.getExe pkgs.redis} -h 127.0.0.1 -p ${toString cfg.redis.port} ${lib.optionalString (cfg.redis.passwordFile != null) ''-a "$(head -n1 ${cfg.redis.passwordFile})"''}<<EOF

     

       94
       87
        
                 SELECT 2

     

       95
       95
       -
                 HSET LRR_CONFIG password $PASS_HASH

     

       88
       88
       +
                 HSET LRR_CONFIG password $(${cfg.package}/bin/helpers/lrr-make-password-hash $(head -n1 ${cfg.passwordFile}))

     

       96
       89
        
               EOF

     

       97
       90
        
             '';

     

       98
       91
        
           };

+3 -5

nixos/tests/lanraragi.nix

···

       10
       10
        
             services.lanraragi = {

     

       11
       11
        
               enable = true;

     

       12
       12
        
               passwordFile = pkgs.writeText "lrr-test-pass" ''

     

       13
       13
       -
                 ultra-secure-password

     

       13
       13
       +
                 Ultra-secure-p@ssword-"with-spec1al\chars

     

       14
       14
        
               '';

     

       15
       15
        
               port = 4000;

     

       16
       16
        
               redis = {

     

       17
       17
        
                 port = 4001;

     

       18
       18
        
                 passwordFile = pkgs.writeText "redis-lrr-test-pass" ''

     

       19
       19
       -
                   still-a-very-secure-password

     

       19
       19
       +
                   123-redis-PASS

     

       20
       20
        
                 '';

     

       21
       21
        
               };

     

       22
       22
        
             };

     

       23
       23
        
           };

     

       24
       24
       -
       

     

       25
       25
       -
       

     

       26
       24
        
         };

     

       27
       25
        
       

     

       28
       26
        
         testScript = ''

     
···

       34
       32
        
       

     

       35
       33
        
           machine2.wait_for_unit("lanraragi.service")

     

       36
       34
        
           machine2.wait_until_succeeds("curl -f localhost:4000")

     

       37
       37
       -
           machine2.succeed("[ $(curl -o /dev/null -X post 'http://localhost:4000/login' --data-raw 'password=ultra-secure-password' -w '%{http_code}') -eq 302 ]")

     

       35
       35
       +
           machine2.succeed("[ $(curl -o /dev/null -X post 'http://localhost:4000/login' --data-raw 'password=Ultra-secure-p@ssword-\"with-spec1al\\chars' -w '%{http_code}') -eq 302 ]")

     

       38
       36
        
         '';

     

       39
       37
        
       })

     

       40
       38

-34

pkgs/by-name/la/lanraragi/fix-minion-redis-password.patch

···

       1
       1
       -
       diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm

     

       2
       2
       -
       index e6b833c4..d677030b 100644

     

       3
       3
       -
       --- a/lib/LANraragi.pm

     

       4
       4
       -
       +++ b/lib/LANraragi.pm

     

       5
       5
       -
       @@ -144,8 +144,13 @@ sub startup {

     

       6
       6
       -
            shutdown_from_pid( get_temp . "/minion.pid" );

     

       7
       7
       -
        

     

       8
       8
       -
            my $miniondb = $self->LRR_CONF->get_redisad . "/" . $self->LRR_CONF->get_miniondb;

     

       9
       9
       -
       +    my $redispassword = $self->LRR_CONF->get_redispassword;

     

       10
       10
       -
       +

     

       11
       11
       -
       +    # If the password is non-empty, add the required delimiters

     

       12
       12
       -
       +    if ($redispassword) { $redispassword = "x:" . $redispassword . "@"; }

     

       13
       13
       -
       +

     

       14
       14
       -
            say "Minion will use the Redis database at $miniondb";

     

       15
       15
       -
       -    $self->plugin( 'Minion' => { Redis => "redis://$miniondb" } );

     

       16
       16
       -
       +    $self->plugin( 'Minion' => { Redis => "redis://$redispassword$miniondb" } );

     

       17
       17
       -
            $self->LRR_LOGGER->info("Successfully connected to Minion database.");

     

       18
       18
       -
            $self->minion->missing_after(5);    # Clean up older workers after 5 seconds of unavailability

     

       19
       19
       -
        

     

       20
       20
       -
       diff --git a/lib/LANraragi/Model/Config.pm b/lib/LANraragi/Model/Config.pm

     

       21
       21
       -
       index f52056d4..63e1f5d3 100644

     

       22
       22
       -
       --- a/lib/LANraragi/Model/Config.pm

     

       23
       23
       -
       +++ b/lib/LANraragi/Model/Config.pm

     

       24
       24
       -
       @@ -42,8 +42,8 @@ sub get_minion {

     

       25
       25
       -
            my $miniondb = get_redisad . "/" . get_miniondb;

     

       26
       26
       -
            my $password = get_redispassword;

     

       27
       27
       -
        

     

       28
       28
       -
       -    # If the password is non-empty, add the required @

     

       29
       29
       -
       -    if ($password) { $password = $password . "@"; }

     

       30
       30
       -
       +    # If the password is non-empty, add the required delimiters

     

       31
       31
       -
       +    if ($password) { $password = "x:" . $password . "@"; }

     

       32
       32
       -
        

     

       33
       33
       -
            return Minion->new( Redis => "redis://$password$miniondb" );

     

       34
       34
       -
        }

+57 -18

pkgs/by-name/la/lanraragi/install.patch

···

       1
       1
       -
       diff --git a/tools/cpanfile b/tools/cpanfile

     

       2
       2
       -
       index 359c61fe..ca3b7ec7 100755

     

       3
       3
       -
       --- a/tools/cpanfile

     

       4
       4
       -
       +++ b/tools/cpanfile

     

       5
       5
       -
       @@ -20,7 +20,7 @@ requires 'Sort::Naturally',     1.03;

     

       6
       6
       -
        requires 'Authen::Passphrase',  0.008;

     

       7
       7
       -
        requires 'File::ReadBackwards', 1.05;

     

       8
       8
       -
        requires 'URI::Escape',         1.74;

     

       9
       9
       -
       -requires 'URI',                 5.09;

     

       10
       10
       -
       +requires 'URI',                 5.05;

     

       11
       11
       -
        

     

       12
       12
       -
        # Used by Installer

     

       13
       13
       -
        requires 'IPC::Cmd', 1.02;

     

       14
       1
        
       diff --git a/tools/install.pl b/tools/install.pl

     

       15
       15
       -
       index 0cbb847d..1bd61fa0 100755

     

       2
       2
       +
       index dbeb7c11..06e4c675 100755

     

       16
       3
        
       --- a/tools/install.pl

     

       17
       4
        
       +++ b/tools/install.pl

     

       18
       18
       -
       @@ -91,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {

     

       5
       5
       +
       @@ -9,6 +9,7 @@ use Config;

     

       6
       6
       +
        

     

       7
       7
       +
        use feature    qw(say);

     

       8
       8
       +
        use File::Path qw(make_path);

     

       9
       9
       +
       +use File::Copy qw(copy);

     

       10
       10
       +
        

     

       11
       11
       +
        #Vendor dependencies

     

       12
       12
       +
        my @vendor_css = (

     

       13
       13
       +
       @@ -91,32 +92,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {

     

       19
       14
        
            $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec";

     

       20
       15
        
        }

     

       21
       16
        
        

     
···

       48
       43
        
        #Check for PerlMagick

     

       49
       44
        
        say("Checking for ImageMagick/PerlMagick...");

     

       50
       45
        
        my $imgk;

     

       51
       51
       -
       @@ -154,12 +128,6 @@ if ( $back || $full ) {

     

       46
       46
       +
       @@ -136,36 +111,11 @@ if ($@) {

     

       47
       47
       +
            say("OK!");

     

       48
       48
       +
        }

     

       49
       49
       +
        

     

       50
       50
       +
       -#Build & Install CPAN Dependencies

     

       51
       51
       +
       -if ( $back || $full ) {

     

       52
       52
       +
       -    say("\r\nInstalling Perl modules... This might take a while.\r\n");

     

       53
       53
       +
       -

     

       54
       54
       +
       -    if ( $Config{"osname"} ne "darwin" ) {

     

       55
       55
       +
       -        say("Installing Linux::Inotify2 for non-macOS systems... (This will do nothing if the package is there already)");

     

       56
       56
       +
       -

     

       57
       57
       +
       -        install_package( "Linux::Inotify2", $cpanopt );

     

       58
       58
       +
       -    }

     

       59
       59
       +
       -

     

       60
       60
       +
       -    if ( system( "cpanm --installdeps ./tools/. --notest" . $cpanopt ) != 0 ) {

     

       61
       61
       +
       -        die "Something went wrong while installing Perl modules - Bailing out.";

     

       62
       62
       +
       -    }

     

       63
       63
       +
       -}

     

       64
       64
       +
       -

     

       52
       65
        
        #Clientside Dependencies with Provisioning

     

       53
       66
        
        if ( $front || $full ) {

     

       54
       67
        
        

     

       55
       68
        
       -    say("\r\nObtaining remote Web dependencies...\r\n");

     

       56
       69
        
       -

     

       57
       57
       -
       -    if ( system("npm install") != 0 ) {

     

       70
       70
       +
       -    if ( system("npm ci") != 0 ) {

     

       58
       71
        
       -        die "Something went wrong while obtaining node modules - Bailing out.";

     

       59
       72
        
       -    }

     

       60
       73
        
       -

     

       61
       74
        
            say("\r\nProvisioning...\r\n");

     

       62
       75
        
        

     

       63
       63
       -
            #Load File::Copy

     

       76
       76
       +
       -    #Load File::Copy

     

       77
       77
       +
       -    install_package( "File::Copy", $cpanopt );

     

       78
       78
       +
       -    File::Copy->import("copy");

     

       79
       79
       +
       -

     

       80
       80
       +
            make_path getcwd . "/public/css/vendor";

     

       81
       81
       +
            make_path getcwd . "/public/css/webfonts";

     

       82
       82
       +
            make_path getcwd . "/public/js/vendor";

     

       83
       83
       +
       @@ -212,19 +162,3 @@ sub cp_node_module {

     

       84
       84
       +
        

     

       85
       85
       +
        }

     

       86
       86
       +
        

     

       87
       87
       +
       -sub install_package {

     

       88
       88
       +
       -

     

       89
       89
       +
       -    my $package = $_[0];

     

       90
       90
       +
       -    my $cpanopt = $_[1];

     

       91
       91
       +
       -

     

       92
       92
       +
       -    ## no critic

     

       93
       93
       +
       -    eval "require $package";    #Run-time evals are needed here to check if the package has been properly installed.

     

       94
       94
       +
       -    ## use critic

     

       95
       95
       +
       -

     

       96
       96
       +
       -    if ($@) {

     

       97
       97
       +
       -        say("$package not installed! Trying to install now using cpanm$cpanopt");

     

       98
       98
       +
       -        system("cpanm $package $cpanopt");

     

       99
       99
       +
       -    } else {

     

       100
       100
       +
       -        say("$package package installed, proceeding...");

     

       101
       101
       +
       -    }

     

       102
       102
       +
       -}

+13

pkgs/by-name/la/lanraragi/loosen-dep-reqs.patch

···

       1
       1
       +
       diff --git a/tools/cpanfile b/tools/cpanfile

     

       2
       2
       +
       index 7385aea7..22f9b069 100755

     

       3
       3
       +
       --- a/tools/cpanfile

     

       4
       4
       +
       +++ b/tools/cpanfile

     

       5
       5
       +
       @@ -20,7 +20,7 @@ requires 'Sort::Naturally',     1.03;

     

       6
       6
       +
        requires 'Authen::Passphrase',  0.008;

     

       7
       7
       +
        requires 'File::ReadBackwards', 1.05;

     

       8
       8
       +
        requires 'URI::Escape',         1.74;

     

       9
       9
       +
       -requires 'URI',                 5.09;

     

       10
       10
       +
       +requires 'URI',                 5.05;

     

       11
       11
       +
        

     

       12
       12
       +
        # Used by Installer

     

       13
       13
       +
        requires 'IPC::Cmd', 1.02;

+58 -49

pkgs/by-name/la/lanraragi/package.nix

···

       9
       9
        
       , nixosTests

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
       -
       let

     

       13
       13
       -
         perlEnv = perl.withPackages (_: cpanDeps);

     

       12
       12
       +
       buildNpmPackage rec {

     

       13
       13
       +
         pname = "lanraragi";

     

       14
       14
       +
         version = "0.9.0";

     

       14
       15
        
       

     

       15
       15
       -
         cpanDeps = with perl.pkgs; [

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "Difegue";

     

       18
       18
       +
           repo = "LANraragi";

     

       19
       19
       +
           rev = "v.${version}";

     

       20
       20
       +
           hash = "sha256-euZotpXTUSmxlA5rbTUhHpHH0Ojd3AZjGasxYZ+L7NY=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           (fetchpatch {

     

       25
       25
       +
             name = "fix-redis-auth.patch";

     

       26
       26
       +
             url = "https://github.com/Difegue/LANraragi/commit/1711b39759ad02ab2a8863ce1f35f6479c9a2917.patch";

     

       27
       27
       +
             hash = "sha256-WfKeieysIlS64qgVEc75JFKjxXuvZN85M6US/gwjTzw=";

     

       28
       28
       +
           })

     

       29
       29
       +
           (fetchpatch {

     

       30
       30
       +
             name = "fix-ghostscript-device.patch";

     

       31
       31
       +
             url = "https://github.com/Difegue/LANraragi/commit/087d63b11c89fda8cb3a30cdb2e86ecd6be66bb7.patch";

     

       32
       32
       +
             hash = "sha256-Cu9d/dDlO0yuFCTKOyg5A0gIuiA+FcWD9PjexB/BK0U=";

     

       33
       33
       +
           })

     

       34
       34
       +
           ./install.patch

     

       35
       35
       +
           ./loosen-dep-reqs.patch # Can be removed once perl.pkgs.URI is updated

     

       36
       36
       +
           ./fix-paths.patch

     

       37
       37
       +
           ./expose-password-hashing.patch # Used by the NixOS module

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       40
       40
       +
         npmDepsHash = "sha256-/F/lhQIVGbbFxFuQXXwHUVlV2jhHt0hFf94v0FrTKt8=";

     

       41
       41
       +
       

     

       42
       42
       +
         nativeBuildInputs = [ perl makeBinaryWrapper ];

     

       43
       43
       +
       

     

       44
       44
       +
         buildInputs = with perl.pkgs; [

     

       45
       45
       +
           perl

     

       16
       46
        
           ImageMagick

     

       17
       47
        
           locallib

     

       18
       48
        
           Redis

     

       19
       49
        
           Encode

     

       20
       50
        
           ArchiveLibarchiveExtract

     

       21
       51
        
           ArchiveLibarchivePeek

     

       52
       52
       +
           ListMoreUtils

     

       22
       53
        
           NetDNSNative

     

       23
       54
        
           SortNaturally

     

       24
       55
        
           AuthenPassphrase

     
···

       39
       70
        
           FileChangeNotify

     

       40
       71
        
           ModulePluggable

     

       41
       72
        
           TimeLocal

     

       73
       73
       +
           YAMLSyck

     

       74
       74
       +
           StringSimilarity

     

       42
       75
        
         ] ++ lib.optional stdenv.isLinux LinuxInotify2;

     

       43
       43
       -
       in

     

       44
       44
       -
       buildNpmPackage rec {

     

       45
       45
       -
         pname = "lanraragi";

     

       46
       46
       -
         version = "0.8.90";

     

       47
       76
        
       

     

       48
       48
       -
         src = fetchFromGitHub {

     

       49
       49
       -
           owner = "Difegue";

     

       50
       50
       -
           repo = "LANraragi";

     

       51
       51
       -
           rev = "v.${version}";

     

       52
       52
       -
           hash = "sha256-ljnREUGCKvUJvcQ+aJ6XqiMTkVmfjt/0oC47w3PCj/k=";

     

       53
       53
       -
         };

     

       77
       77
       +
         buildPhase = ''

     

       78
       78
       +
           runHook preBuild

     

       54
       79
        
       

     

       55
       55
       -
         patches = [

     

       56
       56
       -
           (fetchpatch {

     

       57
       57
       -
             name = "add-package-lock-json.patch"; # Can be removed when updating to 0.9.0

     

       58
       58
       -
             url = "https://github.com/Difegue/LANraragi/commit/c5cd8641795bf7e40deef4ae955ea848dde44050.patch";

     

       59
       59
       -
             hash = "sha256-XKxRzeugkIe6N4XRN6+O1wEZpxo6OzU0OaG0ywKFv38=";

     

       60
       60
       -
           })

     

       61
       61
       -
           ./install.patch

     

       62
       62
       -
           ./fix-paths.patch

     

       63
       63
       -
           ./expose-password-hashing.patch

     

       64
       64
       -
           ./fix-minion-redis-password.patch # Should be upstreamed

     

       65
       65
       -
         ];

     

       80
       80
       +
           # Check if every perl dependency was installed

     

       81
       81
       +
           # explicitly call cpanm with perl because the shebang is broken on darwin

     

       82
       82
       +
           perl ${perl.pkgs.Appcpanminus}/bin/cpanm --installdeps ./tools --notest

     

       66
       83
        
       

     

       67
       67
       -
         npmFlags = [ "--legacy-peer-deps" ];

     

       84
       84
       +
           perl ./tools/install.pl install-full

     

       85
       85
       +
           rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map

     

       68
       86
        
       

     

       69
       69
       -
         npmDepsHash = "sha256-UQsChPU5b4+r5Kv6P/3rJCGUzssiUNSKo3w4axNyJew=";

     

       87
       87
       +
           runHook postBuild

     

       88
       88
       +
         '';

     

       70
       89
        
       

     

       71
       71
       -
         nativeBuildInputs = [

     

       72
       72
       -
           perl

     

       73
       73
       -
           makeBinaryWrapper

     

       74
       74
       -
           perl.pkgs.Appcpanminus

     

       75
       75
       -
         ] ++ cpanDeps;

     

       90
       90
       +
         doCheck = true;

     

       76
       91
        
       

     

       77
       92
        
         nativeCheckInputs = with perl.pkgs; [

     

       78
       93
        
           TestMockObject

     
···

       80
       95
        
           TestDeep

     

       81
       96
        
         ];

     

       82
       97
        
       

     

       83
       83
       -
         buildPhase = ''

     

       84
       84
       -
           runHook preBuild

     

       85
       85
       -
       

     

       86
       86
       -
           perl ./tools/install.pl install-full

     

       87
       87
       -
           rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map

     

       88
       88
       -
       

     

       89
       89
       -
           runHook postBuild

     

       90
       90
       -
         '';

     

       91
       91
       -
       

     

       92
       92
       -
         doCheck = true;

     

       93
       93
       -
       

     

       94
       98
        
         checkPhase = ''

     

       95
       99
        
           runHook preCheck

     

       96
       100
        
       

     
···

       104
       108
        
           runHook preInstall

     

       105
       109
        
       

     

       106
       110
        
           mkdir -p $out/share/lanraragi

     

       107
       107
       -
           cp -r lib public script templates package.json $out/share/lanraragi

     

       111
       111
       +
           chmod +x script/launcher.pl

     

       112
       112
       +
           cp -r lib public script templates package.json lrr.conf $out/share/lanraragi

     

       108
       113
        
       

     

       109
       109
       -
           makeWrapper ${perlEnv}/bin/perl $out/bin/lanraragi \

     

       114
       114
       +
           makeWrapper $out/share/lanraragi/script/launcher.pl $out/bin/lanraragi \

     

       115
       115
       +
             --prefix PERL5LIB : $PERL5LIB \

     

       110
       116
        
             --prefix PATH : ${lib.makeBinPath [ ghostscript ]} \

     

       111
       111
       -
             --add-flags "$out/share/lanraragi/script/launcher.pl -f $out/share/lanraragi/script/lanraragi"

     

       117
       117
       +
             --run "cp -n --no-preserve=all $out/share/lanraragi/lrr.conf ./lrr.conf 2>/dev/null || true" \

     

       118
       118
       +
             --add-flags "-f $out/share/lanraragi/script/lanraragi"

     

       119
       119
       +
       

     

       120
       120
       +
           makeWrapper ${lib.getExe perl} $out/bin/helpers/lrr-make-password-hash \

     

       121
       121
       +
             --prefix PERL5LIB : $out/share/lanraragi/lib:$PERL5LIB \

     

       122
       122
       +
             --add-flags "-e 'use LANraragi::Controller::Config; print LANraragi::Controller::Config::make_password_hash(@ARGV[0])' 2>/dev/null"

     

       112
       123
        
       

     

       113
       124
        
           runHook postInstall

     

       114
       125
        
         '';

     

       115
       126
        
       

     

       116
       116
       -
         passthru = {

     

       117
       117
       -
           inherit perlEnv;

     

       118
       118
       -
           tests = { inherit (nixosTests) lanraragi; };

     

       119
       119
       -
         };

     

       127
       127
       +
         passthru.tests.module = nixosTests.lanraragi;

     

       120
       128
        
       

     

       121
       129
        
         meta = {

     

       122
       130
        
           changelog = "https://github.com/Difegue/LANraragi/releases/tag/${src.rev}";

     
···

       128
       136
        
           platforms = lib.platforms.unix;

     

       129
       137
        
         };

     

       130
       138
        
       }

     

       139
       139
       +