summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
committermiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
commitc562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch)
tree57f5496e7acbc9dfeec7f406a6857687219625d0 /tv
parentb96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff)
parent9b890750e24f43182ebf1732871a60d9e0c74c89 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/cd.nix1
-rw-r--r--tv/1systems/xu.nix1
-rw-r--r--tv/2configs/backup.nix268
-rw-r--r--tv/2configs/default.nix1
4 files changed, 29 insertions, 242 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 7cb903a44..8c2a9ae43 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -7,7 +7,6 @@ with lib;
krebs.build.target = "root@cd.internet";
imports = [
- ../2configs/backup.nix
../2configs/hw/CAC-Developer-2.nix
../2configs/fs/CAC-CentOS-7-64bit.nix
#../2configs/consul-server.nix
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index e1a9076dc..1f3e010a4 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -9,7 +9,6 @@ with lib;
"7ae05edcdd14f6ace83ead9bf0d114e97c89a83a";
imports = [
- ../2configs/backup.nix # TODO
../2configs/hw/x220.nix
#../2configs/consul-client.nix
../2configs/git.nix
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index 1cef0a6dc..51d3bb8a7 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -1,38 +1,22 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
with lib;
-let
- # Users that are allowed to connect to the backup user.
- # Note: the user must own a push plan destination otherwise no rsync.
- backup-users = [
- config.krebs.users.tv
- ];
-
- ## TODO parse.file-location admit user
- ## loc has the form <host-name>:<abs-path>
- #parse.file-location = loc: let
- # parts = splitString ":" loc;
- # host-name = head parts;
- # path = concatStringsSep ":" (tail parts);
- #in {
- # type = "types.krebs.file-location";
- # host = config.krebs.hosts.${host-name};
- # path = path;
- #};
-
- # TODO assert plan.dst.path & co
- plans = with config.krebs.users; with config.krebs.hosts; addNames {
+{
+ krebs.backup.plans = addNames {
xu-test-cd = {
method = "push";
- #src = parse.file-location xu:/tmp/xu-test;
- #dst = parse.file-location cd:/krebs/backup/xu-test;
- src = { user = tv; host = xu; path = "/tmp/xu-test"; };
- dst = { user = tv; host = cd; path = "/krebs/backup/xu-test"; };
- startAt = "0,6,12,18:00";
- retain = {
- hourly = 4; # sneakily depends on startAt
- daily = 7;
- weekly = 4;
- monthly = 3;
+
+ src = { host = config.krebs.hosts.xu; path = "/tmp/xu-test"; };
+ dst = { host = config.krebs.hosts.cd; path = "/tmp/backups/xu-test"; };
+
+ #startAt = "0,6,12,18:00";
+ startAt = "minutely";
+ snapshots = {
+ minutely = { format = "%Y-%m-%dT%H:%M"; retain = 5; };
+ hourly = { format = "%Y-%m-%dT%H"; retain = 4; };
+ daily = { format = "%Y-%m-%d"; retain = 7; };
+ weekly = { format = "%YW%W"; retain = 4; };
+ monthly = { format = "%Y-%m"; retain = 12; };
+ yearly = { format = "%Y"; };
};
};
#xu-test-wu = {
@@ -41,214 +25,18 @@ let
#};
cd-test-xu = {
method = "pull";
- #src = parse.file-location cd:/tmp/cd-test;
- #dst = parse.file-location xu:/bku/cd-test;
- src = { user = tv; host = cd; path = "/tmp/cd-test"; };
- dst = { user = tv; host = xu; path = "/bku/cd-test"; };
+ src = { host = config.krebs.hosts.cd; path = "/tmp/cd-test"; };
+ dst = { host = config.krebs.hosts.xu; path = "/tmp/backups/cd-test"; };
+ startAt = "minutely";
+ snapshots = {
+ minutely = { format = "%Y-%m-%dT%H:%M"; retain = 5; };
+ hourly = { format = "%Y-%m-%dT%H"; retain = 4; };
+ daily = { format = "%Y-%m-%d"; retain = 7; };
+ weekly = { format = "%YW%W"; retain = 4; };
+ monthly = { format = "%Y-%m"; retain = 12; };
+ yearly = { format = "%Y"; };
+ };
};
};
-
- out = {
- #options.krebs.backup = api;
- config = imp;
- };
-
- imp = {
- users.groups.backup.gid = genid "backup";
- users.users = map makeUser (filter isPushDst (attrValues plans));
- systemd.services =
- flip mapAttrs' (filterAttrs (_:isPushSrc) plans) (name: plan: {
- name = "backup.${name}";
- value = makePushService plan;
- });
- };
-
-
- # TODO getFQDN: admit hosts in other domains
- getFQDN = host: "${host.name}.${config.krebs.search-domain}";
-
- isPushSrc = plan:
- plan.method == "push" &&
- plan.src.host.name == config.krebs.build.host.name;
-
- makePushService = plan: assert isPushSrc plan; {
- startAt = plan.startAt;
- serviceConfig.ExecStart = writeSh plan "rsync" ''
- exec ${pkgs.rsync}/bin/rsync ${concatMapStringsSep " " shell.escape [
- "-a"
- "-e"
- "${pkgs.openssh}/bin/ssh -F /dev/null -i ${plan.src.host.ssh.privkey.path}"
- "${plan.src.path}"
- "${plan.name}@${getFQDN plan.dst.host}::push"
- ]}
- '';
- };
-
- isPushDst = plan:
- plan.method == "push" &&
- plan.dst.host.name == config.krebs.build.host.name;
-
- makeUser = plan: assert isPushDst plan; rec {
- name = plan.name;
- uid = genid name;
- group = config.users.groups.backup.name;
- home = plan.dst.path;
- createHome = true;
- shell = "${writeSh plan "shell" ''
- case $2 in
- 'rsync --server --daemon .')
- exec ${backup.rsync plan [ "--server" "--daemon" "." ]}
- ;;
- ''')
- echo "ERROR: no command specified" >&2
- exit 23
- ;;
- *)
- echo "ERROR: no unknown command: $SSH_ORIGINAL_COMMAND" >&2
- exit 23
- ;;
- esac
- ''}";
- openssh.authorizedKeys.keys = [ plan.src.host.ssh.pubkey ];
- };
-
- rsync = plan: args: writeSh plan "rsync" ''
- install -v -m 0700 -d ${plan.dst.path}/push >&2
- install -v -m 0700 -d ${plan.dst.path}/list >&2
-
- ${pkgs.rsync}/bin/rsync \
- --config=${backup.rsyncd-conf plan {
- post-xfer = writeSh plan "rsyncd.post-xfer" ''
- case $RSYNC_EXIT_STATUS in 0)
- exec ${backup.rsnapshot plan {
- preexec = writeSh plan "rsnapshot.preexec" ''
- touch ${plan.dst.path}/rsnapshot.$RSNAPSHOT_INTERVAL
- '';
- postexec = writeSh plan "rsnapshot.postexec" ''
- rm ${plan.dst.path}/rsnapshot.$RSNAPSHOT_INTERVAL
- '';
- }}
- esac
- '';
- }} \
- ${toString (map shell.escape args)}
-
- fail=0
- for i in monthly weekly daily hourly; do
- if test -e ${plan.dst.path}/rsnapshot.$i; then
- rm ${plan.dst.path}/rsnapshot.$i
- echo "ERROR: $i snapshot failed" >&2
- fail=1
- fi
- done
- if test $fail != 0; then
- exit -1
- fi
- '';
-
- rsyncd-conf = plan: conf: pkgs.writeText "${plan.name}.rsyncd.conf" ''
- fake super = yes
- use chroot = no
- lock file = ${plan.dst.path}/rsyncd.lock
-
- [push]
- max connections = 1
- path = ${plan.dst.path}/push
- write only = yes
- read only = no
- post-xfer exec = ${conf.post-xfer}
-
- [list]
- path = ${plan.dst.path}/list
- read only = yes
- write only = no
- '';
-
- rsnapshot = plan: conf: writeSh plan "rsnapshot" ''
- rsnapshot() {
- ${pkgs.proot}/bin/proot \
- -b /bin \
- -b /nix \
- -b /run/current-system \
- -b ${plan.dst.path} \
- -r ${plan.dst.path} \
- -w / \
- ${pkgs.rsnapshot}/bin/rsnapshot \
- -c ${pkgs.writeText "${plan.name}.rsnapshot.conf" ''
- config_version 1.2
- snapshot_root ${plan.dst.path}/list
- cmd_cp ${pkgs.coreutils}/bin/cp
- cmd_du ${pkgs.coreutils}/bin/du
- #cmd_rm ${pkgs.coreutils}/bin/rm
- cmd_rsync ${pkgs.rsync}/bin/rsync
- cmd_rsnapshot_diff ${pkgs.rsnapshot}/bin/rsnapshot-diff
- cmd_preexec ${conf.preexec}
- cmd_postexec ${conf.postexec}
- retain hourly 4
- retain daily 7
- retain weekly 4
- retain monthly 3
- lockfile ${plan.dst.path}/rsnapshot.pid
- link_dest 1
- backup /push ./
- verbose 4
- ''} \
- "$@"
- }
-
- cd ${plan.dst.path}/list/
-
- now=$(date +%s)
- is_older_than() {
- test $(expr $now - $(date +%s -r $1 2>/dev/null || echo 0)) \
- -ge $2
- }
-
- # TODO report stale snapshots
- # i.e. there are $interval.$i > $interval.$max
-
- hour_s=3600
- day_s=86400
- week_s=604800
- month_s=2419200 # 4 weeks
-
- set --
-
- if test -e weekly.3 && is_older_than monthly.0 $month_s; then
- set -- "$@" monthly
- fi
-
- if test -e daily.6 && is_older_than weekly.0 $week_s; then
- set -- "$@" weekly
- fi
-
- if test -e hourly.3 && is_older_than daily.0 $day_s; then
- set -- "$@" daily
- fi
-
- if is_older_than hourly.0 $hour_s; then
- set -- "$@" hourly
- fi
-
-
- if test $# = 0; then
- echo "taking no snapshots" >&2
- else
- echo "taking snapshots: $@" >&2
- fi
-
- export RSNAPSHOT_INTERVAL
- for RSNAPSHOT_INTERVAL; do
- rsnapshot "$RSNAPSHOT_INTERVAL"
- done
- '';
-
- writeSh = plan: name: text: pkgs.writeScript "${plan.name}.${name}" ''
- #! ${pkgs.dash}/bin/dash
- set -efu
- export PATH=${makeSearchPath "bin" (with pkgs; [ coreutils ])}
- ${text}
- '';
-
-in out
+}
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 3400c13b6..c300633bb 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -28,6 +28,7 @@ with lib;
imports = [
<secrets>
+ ./backup.nix
./vim.nix
{
# stockholm dependencies