Merge pull request #35270 from xvapx/wip/crashplan-small-business

upgrade and clean crashplan for small business
NixOS · Feb 21, 2018 · 16210c3 · 16210c3
2 parents e3cd8a2 + 18ac3c9
commit 16210c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
@@ -23,7 +23,7 @@ with lib;
         example = "2G";
         type = types.str;
         description = ''
-          Maximum amount of that the crashplan engine should use.
+          Maximum amount of ram that the crashplan engine should use.
         '';
       };
       openPorts = mkOption {
@@ -52,28 +52,13 @@ with lib;
       after    = [ "network.target" "local-fs.target" ];
 
       preStart = ''
-        ensureDir() {
-          dir=$1
-          mode=$2
-
-          if ! test -e $dir; then
-            ${pkgs.coreutils}/bin/mkdir -m $mode -p $dir
-          elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then
-            ${pkgs.coreutils}/bin/chmod $mode $dir
-          fi
-        }
-
-        ensureDir ${crashplansb.vardir} 755
-        ensureDir ${crashplansb.vardir}/conf 700
-        ensureDir ${crashplansb.manifestdir} 700
-        ensureDir ${crashplansb.vardir}/cache 700
-        ensureDir ${crashplansb.vardir}/backupArchives 700
-        ensureDir ${crashplansb.vardir}/log 777
+        install -d -m 755 ${crashplansb.vardir}
+        install -d -m 700 ${crashplansb.vardir}/conf
+        install -d -m 700 ${crashplansb.manifestdir}
+        install -d -m 700 ${crashplansb.vardir}/cache
+        install -d -m 700 ${crashplansb.vardir}/backupArchives
+        install -d -m 777 ${crashplansb.vardir}/log
         cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf
-        #for x in bin install.vars lang lib libc42archive64.so libc42core.so libjniwrap64.so libjtux64.so libleveldb64.so libnetty-tcnative.so share upgrade; do
-        #  rm -f ${crashplansb.vardir}/$x;
-        #  ln -sf ${crashplansb}/$x ${crashplansb.vardir}/$x;
-        #done
       '';
 
       serviceConfig = {

diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -6,14 +6,14 @@
   maxRam ? "1024m" }:
 
 stdenv.mkDerivation rec {
-  version = "6.6.0";
-  rev = "1506661200660_4347";
+  version = "6.7.0";
+  rev = "1512021600670_4503";
   pname = "CrashPlanSmb";
   name = "${pname}_${version}_${rev}";
 
   src = fetchurl {
     url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
-    sha256 = "1zzx60fpmi2nlzpq80x4hfgspsrgd7ycfcvc6w391wxr0qzf2i9k";
+    sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
   };
 
   nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ];