Unverified Commit 45ff7482 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #187270 from yayayayaka/snipe-it-add-missing-directory

parents 54bd0eaf 8ac33953

nixos/modules/services/web-apps/snipe-it.nix

+33 −15
Original line number Diff line number Diff line
@@ -454,6 +454,11 @@ in { 


          # migrate db

          ${pkgs.php}/bin/php artisan migrate --force



          # A placeholder file for invalid barcodes

          invalid_barcode_location="${cfg.dataDir}/public/uploads/barcodes/invalid_barcode.gif"

          [ ! -e "$invalid_barcode_location" ] \

              && cp ${snipe-it}/share/snipe-it/invalid_barcode.gif "$invalid_barcode_location"

        '';

    };
@@ -463,6 +468,19 @@ in { 
      "d ${cfg.dataDir}/bootstrap/cache              0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public                       0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads               0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/accessories   0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/assets        0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/avatars       0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/barcodes      0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/categories    0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/companies     0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/components    0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/consumables   0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/departments   0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/locations     0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/manufacturers 0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/models        0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/public/uploads/suppliers     0750 ${user} ${group} - -"

      "d ${cfg.dataDir}/storage                      0700 ${user} ${group} - -"

      "d ${cfg.dataDir}/storage/app                  0700 ${user} ${group} - -"

      "d ${cfg.dataDir}/storage/fonts                0700 ${user} ${group} - -"

pkgs/servers/web-apps/snipe-it/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -7,12 +7,20 @@ let 
    noDev = true; # Disable development dependencies

  }).overrideAttrs (attrs : {

    installPhase = attrs.installPhase + ''

      # Before symlinking the following directories, copy the invalid_barcode.gif

      # to a different location. The `snipe-it-setup` oneshot service will then

      # copy the file back during bootstrap.

      mkdir -p $out/share/snipe-it

      cp $out/public/uploads/barcodes/invalid_barcode.gif $out/share/snipe-it/



      rm -R $out/storage $out/public/uploads $out/bootstrap/cache

      ln -s ${dataDir}/.env $out/.env

      ln -s ${dataDir}/storage $out/

      ln -s ${dataDir}/public/uploads $out/public/uploads

      ln -s ${dataDir}/bootstrap/cache $out/bootstrap/cache



      chmod +x $out/artisan



      substituteInPlace config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')"

    '';

  });