summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Property/Restic.hs6
3 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 498cb5bc..43e3cd6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (4.0.4) UNRELEASED; urgency=medium
+
+ * Propellor.Property.Restic added for yet another backup program.
+ Thanks, FĂ©lix Sipma.
+
+ -- Joey Hess <id@joeyh.name> Thu, 27 Apr 2017 16:31:26 -0400
+
propellor (4.0.3) unstable; urgency=medium
* Added Fstab.listed, Fstab.swap, and Mount.swapOn properties.
diff --git a/propellor.cabal b/propellor.cabal
index 292bc79d..a5ed5ed9 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,6 +1,6 @@
Name: propellor
Version: 4.0.3
-Cabal-Version: >= 1.8
+Cabal-Version: >= 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>
Author: Joey Hess
diff --git a/src/Propellor/Property/Restic.hs b/src/Propellor/Property/Restic.hs
index 02b2ead0..64cd4091 100644
--- a/src/Propellor/Property/Restic.hs
+++ b/src/Propellor/Property/Restic.hs
@@ -40,7 +40,7 @@ installed = withOS desc $ \w o -> case o of
_ -> ensureProperty w $
Apt.installed ["restic"]
where
- desc = "installed restic"
+ desc = "installed restic"
repoExists :: ResticRepo -> IO Bool
repoExists repo = boolSystem "restic"
@@ -119,7 +119,7 @@ restored dir repo = go
)
-- | Installs a cron job that causes a given directory to be backed
--- up, by running borg with some parameters.
+-- up, by running restic with some parameters.
--
-- If the directory does not exist, or exists but is completely empty,
-- this Property will immediately restore it from an existing backup.
@@ -192,7 +192,7 @@ keepParam (KeepYears n) = "--keep-yearly=" ++ val n
-- | Policy for backup generations to keep. For example, KeepDays 30 will
-- keep the latest backup for each day when a backup was made, and keep the
-- last 30 such backups. When multiple KeepPolicies are combined together,
--- backups meeting any policy are kept. See borg's man page for details.
+-- backups meeting any policy are kept. See restic's man page for details.
data KeepPolicy
= KeepLast Int
| KeepHours Int