Skip to content

Commit 82fccdb

Browse files
jamebusjamebus
authored
Restic: Add restic v16 release (#238)
1 parent 3f4e0bf commit 82fccdb

File tree

2 files changed

+159
-15
lines changed

2 files changed

+159
-15
lines changed

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ generate-restic:
185185
$(RESTIC_GEN) --install $(RESTIC_DIR)0.13.0 --version=0.13.0 --commands $(RESTIC_CMD)
186186
$(RESTIC_GEN) --install $(RESTIC_DIR)0.14.0 --version=0.14.0 --commands $(RESTIC_CMD)
187187
$(RESTIC_GEN) --install $(RESTIC_DIR)0.15.0 --version=0.15.0 --commands $(RESTIC_CMD)
188+
$(RESTIC_GEN) --install $(RESTIC_DIR)0.16.0 --version=0.16.0 --commands $(RESTIC_CMD)
188189

189190
cp $(RESTIC_CMD) restic/commands.json
190191

@@ -209,6 +210,8 @@ generate-jsonschema: build
209210
$(abspath $(BINARY)) generate --json-schema --version 0.14 v2 > $(JSONSCHEMA_DIR)/config-2-restic-0-14.json
210211
$(abspath $(BINARY)) generate --json-schema --version 0.15 v1 > $(JSONSCHEMA_DIR)/config-1-restic-0-15.json
211212
$(abspath $(BINARY)) generate --json-schema --version 0.15 v2 > $(JSONSCHEMA_DIR)/config-2-restic-0-15.json
213+
$(abspath $(BINARY)) generate --json-schema --version 0.16 v1 > $(JSONSCHEMA_DIR)/config-1-restic-0-16.json
214+
$(abspath $(BINARY)) generate --json-schema --version 0.16 v2 > $(JSONSCHEMA_DIR)/config-2-restic-0-16.json
212215

213216
generate-config-reference: build
214217
@echo "[*] $@"

‎restic/commands.json

Lines changed: 156 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,15 @@
9595
"FromVersion": "",
9696
"RemovedInVersion": ""
9797
},
98+
{
99+
"Name": "group-by",
100+
"Alias": "g",
101+
"Default": "host,paths",
102+
"Description": "group snapshots by host, paths and/or tags, separated by comma (disable grouping with '')",
103+
"Once": true,
104+
"FromVersion": "0.16.0",
105+
"RemovedInVersion": ""
106+
},
98107
{
99108
"Name": "help",
100109
"Alias": "h",
@@ -171,7 +180,7 @@
171180
"Name": "parent",
172181
"Alias": "",
173182
"Default": "\"\"",
174-
"Description": "use this parent snapshot (default: last snapshot in the repository that has the same target files/directories, and is not newer than the snapshot time)",
183+
"Description": "use this parent snapshot (default: latest snapshot in the group determined by --group-by and not newer than the timestamp determined by --time)",
175184
"Once": true,
176185
"FromVersion": "",
177186
"RemovedInVersion": ""
@@ -339,7 +348,7 @@
339348
"Name": "with-cache",
340349
"Alias": "",
341350
"Default": "false",
342-
"Description": "use the cache",
351+
"Description": "use existing cache, only read uncached data from repository",
343352
"Once": true,
344353
"FromVersion": "",
345354
"RemovedInVersion": ""
@@ -592,6 +601,15 @@
592601
"FromVersion": "",
593602
"RemovedInVersion": ""
594603
},
604+
{
605+
"Name": "human-readable",
606+
"Alias": "",
607+
"Default": "false",
608+
"Description": "print sizes in human readable format",
609+
"Once": true,
610+
"FromVersion": "0.16.0",
611+
"RemovedInVersion": ""
612+
},
595613
{
596614
"Name": "ignore-case",
597615
"Alias": "i",
@@ -711,7 +729,7 @@
711729
{
712730
"Name": "group-by",
713731
"Alias": "g",
714-
"Default": "\"host,paths\"",
732+
"Default": "host,paths",
715733
"Description": "group snapshots by host, paths and/or tags, separated by comma (disable grouping with '')",
716734
"Once": true,
717735
"FromVersion": "",
@@ -739,7 +757,7 @@
739757
"Name": "keep-daily",
740758
"Alias": "d",
741759
"Default": "0",
742-
"Description": "keep the last n daily snapshots",
760+
"Description": "keep the last n daily snapshots (use 'unlimited' to keep all daily snapshots)",
743761
"Once": true,
744762
"FromVersion": "",
745763
"RemovedInVersion": ""
@@ -748,7 +766,7 @@
748766
"Name": "keep-hourly",
749767
"Alias": "H",
750768
"Default": "0",
751-
"Description": "keep the last n hourly snapshots",
769+
"Description": "keep the last n hourly snapshots (use 'unlimited' to keep all hourly snapshots)",
752770
"Once": true,
753771
"FromVersion": "",
754772
"RemovedInVersion": ""
@@ -757,7 +775,7 @@
757775
"Name": "keep-last",
758776
"Alias": "l",
759777
"Default": "0",
760-
"Description": "keep the last n snapshots",
778+
"Description": "keep the last n snapshots (use 'unlimited' to keep all snapshots)",
761779
"Once": true,
762780
"FromVersion": "",
763781
"RemovedInVersion": ""
@@ -766,7 +784,7 @@
766784
"Name": "keep-monthly",
767785
"Alias": "m",
768786
"Default": "0",
769-
"Description": "keep the last n monthly snapshots",
787+
"Description": "keep the last n monthly snapshots (use 'unlimited' to keep all monthly snapshots)",
770788
"Once": true,
771789
"FromVersion": "",
772790
"RemovedInVersion": ""
@@ -784,7 +802,7 @@
784802
"Name": "keep-weekly",
785803
"Alias": "w",
786804
"Default": "0",
787-
"Description": "keep the last n weekly snapshots",
805+
"Description": "keep the last n weekly snapshots (use 'unlimited' to keep all weekly snapshots)",
788806
"Once": true,
789807
"FromVersion": "",
790808
"RemovedInVersion": ""
@@ -847,7 +865,7 @@
847865
"Name": "keep-yearly",
848866
"Alias": "y",
849867
"Default": "0",
850-
"Description": "keep the last n yearly snapshots",
868+
"Description": "keep the last n yearly snapshots (use 'unlimited' to keep all yearly snapshots)",
851869
"Once": true,
852870
"FromVersion": "",
853871
"RemovedInVersion": ""
@@ -1198,6 +1216,15 @@
11981216
"FromVersion": "",
11991217
"RemovedInVersion": ""
12001218
},
1219+
{
1220+
"Name": "human-readable",
1221+
"Alias": "",
1222+
"Default": "false",
1223+
"Description": "print sizes in human readable format",
1224+
"Once": true,
1225+
"FromVersion": "0.16.0",
1226+
"RemovedInVersion": ""
1227+
},
12011228
{
12021229
"Name": "long",
12031230
"Alias": "l",
@@ -1453,7 +1480,7 @@
14531480
"Name": "rebuild-index",
14541481
"Description": "The \"rebuild-index\" command creates a new index based on the pack files in the\nrepository.",
14551482
"FromVersion": "",
1456-
"RemovedInVersion": "",
1483+
"RemovedInVersion": "0.16.0",
14571484
"Options": [
14581485
{
14591486
"Name": "help",
@@ -1492,6 +1519,111 @@
14921519
}
14931520
]
14941521
},
1522+
{
1523+
"Name": "repair",
1524+
"Description": "Repair the repository",
1525+
"FromVersion": "0.16.0",
1526+
"RemovedInVersion": "",
1527+
"Options": [
1528+
{
1529+
"Name": "help",
1530+
"Alias": "h",
1531+
"Default": "false",
1532+
"Description": "help for repair",
1533+
"Once": true,
1534+
"FromVersion": "0.16.0",
1535+
"RemovedInVersion": ""
1536+
}
1537+
]
1538+
},
1539+
{
1540+
"Name": "repair-index",
1541+
"Description": "The \"repair index\" command creates a new index based on the pack files in the\nrepository.",
1542+
"FromVersion": "0.16.0",
1543+
"RemovedInVersion": "",
1544+
"Options": [
1545+
{
1546+
"Name": "help",
1547+
"Alias": "h",
1548+
"Default": "false",
1549+
"Description": "help for index",
1550+
"Once": true,
1551+
"FromVersion": "0.16.0",
1552+
"RemovedInVersion": ""
1553+
},
1554+
{
1555+
"Name": "read-all-packs",
1556+
"Alias": "",
1557+
"Default": "false",
1558+
"Description": "read all pack files to generate new index from scratch",
1559+
"Once": true,
1560+
"FromVersion": "0.16.0",
1561+
"RemovedInVersion": ""
1562+
}
1563+
]
1564+
},
1565+
{
1566+
"Name": "repair-snapshots",
1567+
"Description": "The \"repair snapshots\" command repairs broken snapshots. It scans the given\nsnapshots and generates new ones with damaged directories and file contents\nremoved. If the broken snapshots are deleted, a prune run will be able to\nclean up the repository.\n\nThe command depends on a correct index, thus make sure to run \"repair index\"\nfirst!",
1568+
"FromVersion": "0.16.0",
1569+
"RemovedInVersion": "",
1570+
"Options": [
1571+
{
1572+
"Name": "dry-run",
1573+
"Alias": "n",
1574+
"Default": "false",
1575+
"Description": "do not do anything, just print what would be done",
1576+
"Once": true,
1577+
"FromVersion": "0.16.0",
1578+
"RemovedInVersion": ""
1579+
},
1580+
{
1581+
"Name": "forget",
1582+
"Alias": "",
1583+
"Default": "false",
1584+
"Description": "remove original snapshots after creating new ones",
1585+
"Once": true,
1586+
"FromVersion": "0.16.0",
1587+
"RemovedInVersion": ""
1588+
},
1589+
{
1590+
"Name": "help",
1591+
"Alias": "h",
1592+
"Default": "false",
1593+
"Description": "help for snapshots",
1594+
"Once": true,
1595+
"FromVersion": "0.16.0",
1596+
"RemovedInVersion": ""
1597+
},
1598+
{
1599+
"Name": "host",
1600+
"Alias": "H",
1601+
"Default": "",
1602+
"Description": "only consider snapshots for this host (can be specified multiple times)",
1603+
"Once": false,
1604+
"FromVersion": "0.16.0",
1605+
"RemovedInVersion": ""
1606+
},
1607+
{
1608+
"Name": "path",
1609+
"Alias": "",
1610+
"Default": "",
1611+
"Description": "only consider snapshots including this (absolute) path (can be specified multiple times)",
1612+
"Once": false,
1613+
"FromVersion": "0.16.0",
1614+
"RemovedInVersion": ""
1615+
},
1616+
{
1617+
"Name": "tag",
1618+
"Alias": "",
1619+
"Default": "",
1620+
"Description": "only consider snapshots including tag[,tag,...] (can be specified multiple times)",
1621+
"Once": false,
1622+
"FromVersion": "0.16.0",
1623+
"RemovedInVersion": ""
1624+
}
1625+
]
1626+
},
14951627
{
14961628
"Name": "restore",
14971629
"Description": "The \"restore\" command extracts the data from a snapshot from the repository to\na directory.\n\nThe special snapshot \"latest\" can be used to restore the latest snapshot in the\nrepository.",
@@ -1741,7 +1873,7 @@
17411873
{
17421874
"Name": "group-by",
17431875
"Alias": "g",
1744-
"Default": "\"\"",
1876+
"Default": "",
17451877
"Description": "group snapshots by host, paths and/or tags, separated by comma",
17461878
"Once": true,
17471879
"FromVersion": "0.10.0",
@@ -1972,15 +2104,15 @@
19722104
},
19732105
{
19742106
"Name": "__default",
1975-
"Description": "restic is a backup program which allows saving multiple revisions of files and\ndirectories in an encrypted repository stored on different backends.",
2107+
"Description": "restic is a backup program which allows saving multiple revisions of files and\ndirectories in an encrypted repository stored on different backends.\n\nThe full documentation can be found at https://restic.readthedocs.io/ .",
19762108
"FromVersion": "",
19772109
"RemovedInVersion": "",
19782110
"Options": [
19792111
{
19802112
"Name": "cacert",
19812113
"Alias": "",
19822114
"Default": "",
1983-
"Description": "file to load root certificates from (default: use system certificates)",
2115+
"Description": "file to load root certificates from (default: use system certificates or $RESTIC_CACERT)",
19842116
"Once": false,
19852117
"FromVersion": "",
19862118
"RemovedInVersion": ""
@@ -2007,7 +2139,7 @@
20072139
"Name": "compression",
20082140
"Alias": "",
20092141
"Default": "auto",
2010-
"Description": "compression mode (only available for repository format version 2), one of (auto|off|max)",
2142+
"Description": "compression mode (only available for repository format version 2), one of (auto|off|max) (default: $RESTIC_COMPRESSION)",
20112143
"Once": true,
20122144
"FromVersion": "0.14.0",
20132145
"RemovedInVersion": ""
@@ -2147,11 +2279,20 @@
21472279
"FromVersion": "0.11.0",
21482280
"RemovedInVersion": ""
21492281
},
2282+
{
2283+
"Name": "retry-lock",
2284+
"Alias": "",
2285+
"Default": "0s",
2286+
"Description": "retry to lock the repository if it is already locked, takes a value like 5m or 2h (default: no retries)",
2287+
"Once": true,
2288+
"FromVersion": "0.16.0",
2289+
"RemovedInVersion": ""
2290+
},
21502291
{
21512292
"Name": "tls-client-cert",
21522293
"Alias": "",
21532294
"Default": "\"\"",
2154-
"Description": "path to a file containing PEM encoded TLS client certificate and private key",
2295+
"Description": "path to a file containing PEM encoded TLS client certificate and private key (default: $RESTIC_TLS_CLIENT_CERT)",
21552296
"Once": true,
21562297
"FromVersion": "",
21572298
"RemovedInVersion": ""

0 commit comments

Comments
 (0)