aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rwxr-xr-xkeyringer2
-rw-r--r--share/man/keyringer.132
3 files changed, 38 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ee407c4..2805106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2025-01-04 - 0.6.0 - Silvio Rhatto <rhatto@riseup.net>
+
+ Fix: check action now exits with non-zero status if there are expiring keys
+ in the keyring.
+
+ Fix: removed shebang from the bash completion file (#9).
+
+ Feat: GitLab CI support (#10).
+
+ Feat: init: allow for non-interactive keyring creation, useful for
+ tests (#10). This is controlled by the KEYRINGER_NON_INTERACTIVE
+ environment variable: when set to "1", keyringer won't do any
+ interactive procedure related to the keyring initialization.
+
2022-08-19 - 0.5.9 - Silvio Rhatto <rhatto@riseup.net>
Fix: edit: check whether decryption suceeded
diff --git a/keyringer b/keyringer
index 75d704f..512a001 100755
--- a/keyringer
+++ b/keyringer
@@ -142,7 +142,7 @@ function keyringer_dispatch {
# Config
NAME="keyringer"
-KEYRINGER_VERSION="0.5.9"
+KEYRINGER_VERSION="0.6.0"
CONFIG_VERSION="0.1"
CONFIG_BASE="$HOME/.$NAME"
CONFIG="$CONFIG_BASE/config"
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 9e60ae0..0ef1530 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -1,5 +1,19 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 2.17.1.1
.\"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
.TH "KEYRINGER" "1" "Oct 25, 2013" "Keyringer User Manual" ""
.hy
.SH NAME
@@ -48,7 +62,7 @@ After initialization, \f[I]path\f[R] will contain a folder structure for
storing secrets and metadata (user aka recipients, groups of recipients,
etc).
.PP
-Also, an entry will be added to \f[C]$HOME/.keyringer/config\f[R]
+Also, an entry will be added to \f[V]$HOME/.keyringer/config\f[R]
allowing keyringer to find the keyring by its alias.
.RE
.TP
@@ -104,9 +118,9 @@ Run maintenance checks in a keyring.
.PP
All secret manipulation actions operate upon a \f[I]secret\f[R] which is
the pathname of an encrypted file relative to the keyring with optional
-\f[C].asc\f[R] extension.
+\f[V].asc\f[R] extension.
.PP
-If the \f[C].asc\f[R] extension is omitted, keyringer will add it at the
+If the \f[V].asc\f[R] extension is omitted, keyringer will add it at the
end of the pathname.
.PP
No spaces are allowed in the secret name.
@@ -247,7 +261,7 @@ List, edit or add \f[I]user\f[R] preferences for a given repository.
.RS
.PP
User preferences are settings which are saved in the user\[cq]s
-keyringer folder (\f[C]$HOME/.keyringer/\f[R]), and not shared with the
+keyringer folder (\f[V]$HOME/.keyringer/\f[R]), and not shared with the
other users.
.PP
Preferences are written using the \f[I]KEY=VALUE\f[R] syntax.
@@ -276,9 +290,9 @@ For instance, if a user encrypts a secret to a file in the keyring
repository\[cq]s \f[I]accounting\f[R] folder, a
\f[I]recipients-file\f[R] under \f[I]accounting\f[R] will be used.
Encrypting a secret into \f[I]accounting/bank-accounts\f[R] will result
-in a file \f[C]$KEYRING_FOLDER/keys/accounting/bank-accounts.asc\f[R]
+in a file \f[V]$KEYRING_FOLDER/keys/accounting/bank-accounts.asc\f[R]
encrypted using the public keys listed in the config
-file\f[C]$KEYRING_FOLDER/config/recipients/accounting\f[R].
+file\f[V]$KEYRING_FOLDER/config/recipients/accounting\f[R].
.PP
Each line in a recipients file has entries in the format
`john\[at]doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', where
@@ -297,11 +311,11 @@ List all existing recipients files.
Create or edit a recipients file.
.RS
.PP
-Editing happens using the editor specified by the \f[C]$EDITOR\f[R]
+Editing happens using the editor specified by the \f[V]$EDITOR\f[R]
environment variable.
.PP
The required parameter \f[I]recipients-file\f[R] is interpreted relative
-to the \f[C]$KEYRING_FOLDER/config/recipients/\f[R] folder.
+to the \f[V]$KEYRING_FOLDER/config/recipients/\f[R] folder.
.RE
.RE
.SH FILES