Unverified Commit 628a7cff authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

nixos/onlyoffice: misc cleanup (#395972)

parents 2c9a7aa0 dbb3bdb4

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

+6 −10
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ in 
            "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(document_editor_service_worker\\.js)$".extraConfig =

              ''

                expires 365d;

                # gzip_static on;

                alias ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2;

              '';

            # suppress logging the unsupported locale error in web-apps
@@ -137,13 +136,11 @@ in 
            "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(sdkjs-plugins)(\\/.*\\.json)$".extraConfig = ''

              expires 365d;

              error_log /dev/null crit;

              # gzip_static on;

              alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;

            '';

            "~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.|-][\\w]+)?\\/(web-apps|sdkjs|sdkjs-plugins|fonts|dictionaries)(\\/.*)$".extraConfig =

              ''

                expires 365d;

                # gzip_static on;

                alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;

              '';

            "~* ^(\\/cache\\/files.*)(\\/.*)".extraConfig = ''
@@ -302,9 +299,8 @@ in 
              ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json



            chmod u+w /run/onlyoffice/config/production-linux.json

            jq '

              .FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"

              ' /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json

            jq '.FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"' \

              /run/onlyoffice/config/production-linux.json | sponge /run/onlyoffice/config/production-linux.json



            if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then

              psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql

pkgs/by-name/on/onlyoffice-documentserver/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ let 
      mkdir -p var/lib/onlyoffice/ var/www/onlyoffice/documentserver/fonts/



      # see usr/bin/documentserver-flush-cache.sh

      cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js.tpl var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js

      HASH=$(basename $out | cut -d '-' -f 1)

      sed -i "s/{{HASH_POSTFIX}}/$HASH/g" var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js

      cp var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js{.tpl,}

      substituteInPlace var/www/onlyoffice/documentserver/web-apps/apps/api/documents/api.js \

        --replace-fail '{{HASH_POSTFIX}}' "$(basename $out | cut -d '-' -f 1)"



      mv * $out/

    '';