summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAugustin Borsu <a.borsu@gmail.com>2015-11-04 16:04:02 +0000
committerMatej Cotman <cotman.matej@gmail.com>2015-12-02 20:36:40 +0100
commit16fd6c1cf0d9386363c26246c2100c88fd3f2fdf (patch)
treeba390647573b42ea2070cd4449c40d151214df35 /nixos
parente08ffc472c136c36308f14b67b442f35f6516583 (diff)
downloadnixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar.gz
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar.bz2
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar.lz
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar.xz
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.tar.zst
nixlib-16fd6c1cf0d9386363c26246c2100c88fd3f2fdf.zip
owncloud: 7.0.5 -> 7.0.10 +
Commit changes default version to 7.0.10, 7.0.5 version is kept for
people reluctant to update. Needed info has also been added for
versions 8.0, 8.1 and 8.2 only the latest minor version of each
major version is included.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/owncloud.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index b3f47cddecc2..f69e21418050 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -573,7 +573,11 @@ rec {
       ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true
     fi
 
-    ${php}/bin/php ${pkgs.owncloud}/occ upgrade || true
+    if [ -e ${pkgs.owncloud}/config/ca-bundle.crt ]; then
+      cp -f ${pkgs.owncloud}/config/ca-bundle.crt ${config.dataDir}/config/
+    fi
+
+    ${php}/bin/php ${pkgs.owncloud}/occ upgrade >> ${config.dataDir}/upgrade.log || true
 
     chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true