summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-03-30 11:56:42 +0200
committerRobin Gloster <mail@glob.in>2017-03-30 12:06:09 +0200
commita79891f6b2ddeba15e3c409ff4c769b56e3ab5aa (patch)
tree344178a9ead8e91729b3d5bafab318d0779e578b
parentf87de53883a183d9d249e9a613b72a7e04dfc034 (diff)
downloadnixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar.gz
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar.bz2
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar.lz
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar.xz
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.tar.zst
nixpkgs-a79891f6b2ddeba15e3c409ff4c769b56e3ab5aa.zip
sitecopy: remove
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/backup/sitecopy-backup.nix106
-rw-r--r--pkgs/tools/networking/sitecopy/default.nix16
-rw-r--r--pkgs/tools/networking/sitecopy/neon-29.patch15
-rw-r--r--pkgs/top-level/all-packages.nix2
5 files changed, 0 insertions, 140 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4e9154f1740..9d25cc680f8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -138,7 +138,6 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/rsnapshot.nix
-  ./services/backup/sitecopy-backup.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
   ./services/cluster/fleet.nix
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
deleted file mode 100644
index 6e4721ded68..00000000000
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  inherit (pkgs) sitecopy;
-
-  stateDir = "/var/spool/sitecopy";
-
-  sitecopyCron = backup : ''
-    ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1
-  '';
-in
-
-{
-
-  options = {
-
-    services.sitecopy = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable <command>sitecopy</command> backups of specified
-          directories.
-        '';
-      };
-
-      period = mkOption {
-        default = "15 04 * * *";
-        description = ''
-          This option defines (in the format used by <command>cron</command>)
-          when the <command>sitecopy</command> backups are to be run.
-          The default is to update at 04:15 (at night) every day.
-        '';
-      };
-
-      backups = mkOption {
-        example = [
-          { name = "test";
-            local = "/tmp/backup";
-            remote = "/staff-groups/ewi/st/strategoxt/backup/test";
-            server = "webdata.tudelft.nl";
-            protocol = "webdav";
-            https = true ;
-            symlinks = "maintain" ;
-          }
-        ];
-        default = [];
-        description = ''
-           List of attribute sets describing the backups.
-
-           Username/password are extracted from
-           <filename>${stateDir}/sitecopy.secrets</filename> at activation
-           time. The secrets file lines should have the following structure:
-           <screen>
-             server username password
-           </screen>
-        '';
-      };
-
-    };
-
-  };
-
-  config = mkIf config.services.sitecopy.enable {
-    environment.systemPackages = [ sitecopy ];
-
-    services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups;
-
-    system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ]
-      ''
-        mkdir -m 0700 -p ${stateDir}
-        chown root ${stateDir}
-        touch ${stateDir}/sitecopy.secrets
-        chown root ${stateDir}/sitecopy.secrets
-
-        ${lib.concatStrings (map ( b: ''
-            unset secrets
-            unset secret
-            secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1`
-            secret=($secrets)
-            cat > ${stateDir}/${b.name}.conf << EOF
-              site ${b.name}
-              server ${b.server}
-              protocol ${b.protocol}
-              username ''${secret[1]}
-              password ''${secret[2]}
-              local ${b.local}
-              remote ${b.remote}
-              symlinks ${b.symlinks}
-              ${if b.https then "http secure" else ""}
-            EOF
-            chmod 0600 ${stateDir}/${b.name}.conf
-            if ! test -e ${stateDir}/${b.name} ; then
-              echo " * Initializing sitecopy '${b.name}'"
-              ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name}
-            else
-              echo " * Sitecopy '${b.name}' already initialized"
-            fi
-          '' ) config.services.sitecopy.backups
-        )}
-      '';
-  };
-
-}
diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix
deleted file mode 100644
index 5667744ef22..00000000000
--- a/pkgs/tools/networking/sitecopy/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  name = "sitecopy-0.16.6";
-
-  src = fetchurl {
-    url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";
-    sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
-  };
-
-  patches = [ ./neon-29.patch ];
-
-  buildInputs = [ openssl neon zlib autoreconfHook ]; 
-
-  configureFlags= "--with-ssl=openssl"; 
-}
diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch
deleted file mode 100644
index bddcbde95e1..00000000000
--- a/pkgs/tools/networking/sitecopy/neon-29.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in
---- sitecopy-0.16.6-orig/configure.in	2008-04-02 13:59:30.000000000 +0200
-+++ sitecopy-0.16.6/configure.in	2010-08-26 15:07:04.000000000 +0200
-@@ -112,8 +112,8 @@
-    AC_LIBOBJ(lib/fnmatch)
- fi
- 
--# Support neon 0.24 through 0.28
--NE_REQUIRE_VERSIONS([0], [24 25 26 27 28])
-+# Support neon 0.24 through 0.29
-+#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29])
- 
- dnl But we don't use zlib or ACL support
- NEON_WITHOUT_ZLIB
-Only in sitecopy-0.16.6/: configure.in~
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23b1c2c1c11..cdfb4e6d997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4083,8 +4083,6 @@ with pkgs;
     pythonPackages = python3Packages;
    };
 
-  sitecopy = callPackage ../tools/networking/sitecopy { };
-
   stricat = callPackage ../tools/security/stricat { };
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };