summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-09-25 17:40:08 +0200
committerGitHub <noreply@github.com>2022-09-25 17:40:08 +0200
commite85617ef8411ba1705b2991759dd4a0d0167c1d9 (patch)
tree6a181360dc1d577ff2f316aa1392d5c0d39e1097
parentb5d72e179c95c11feeeab271d086da8f44c64684 (diff)
parent0a564318e84a720f2139a3927e622e85583102e1 (diff)
downloadnixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar.gz
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar.bz2
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar.lz
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar.xz
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.tar.zst
nixpkgs-e85617ef8411ba1705b2991759dd4a0d0167c1d9.zip
Merge pull request #192806 from r-ryantm/auto-update/onlyoffice-documentserver
-rw-r--r--nixos/modules/services/web-apps/onlyoffice.nix5
-rw-r--r--pkgs/servers/onlyoffice-documentserver/default.nix4
2 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix
index ad0a527759c..db4a9582794 100644
--- a/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/nixos/modules/services/web-apps/onlyoffice.nix
@@ -252,7 +252,10 @@ in
               .rabbitmq.url = "${cfg.rabbitmqUrl}"
               ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json
 
-            if ! psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
+            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
+              psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql
+            else
               psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql
             fi
           '';
diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix
index 703eaecf601..8584a924f18 100644
--- a/pkgs/servers/onlyoffice-documentserver/default.nix
+++ b/pkgs/servers/onlyoffice-documentserver/default.nix
@@ -15,11 +15,11 @@ let
   # var/www/onlyoffice/documentserver/server/DocService/docservice
   onlyoffice-documentserver = stdenv.mkDerivation rec {
     pname = "onlyoffice-documentserver";
-    version = "7.1.1-23";
+    version = "7.2.0";
 
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb";
-      sha256 = "sha256-hmQx8htSjFszdSAzJgiU7Lo6ebF7TVRfK8rJbJDhX5Q=";
+      sha256 = "sha256-BaKLOOZUrTzmBlXqo6wWRAoxrTIjUqhTzgFPNVpbueM=";
     };
 
     preferLocalBuild = true;