Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caucase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vincent Pelletier
caucase
Commits
d6fd5a40
Commit
d6fd5a40
authored
Dec 13, 2018
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cli,http: Add --version support.
parent
1cac65d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
caucase/cli.py
caucase/cli.py
+9
-1
caucase/http.py
caucase/http.py
+5
-1
No files found.
caucase/cli.py
View file @
d6fd5a40
...
...
@@ -33,6 +33,7 @@ from cryptography import x509
from
cryptography.hazmat.backends
import
default_backend
from
.
import
exceptions
from
.
import
utils
from
.
import
version
from
.client
import
(
CaucaseError
,
CaucaseClient
,
...
...
@@ -337,7 +338,10 @@ def main(argv=None):
"""
Command line caucase client entry point.
"""
parser
=
argparse
.
ArgumentParser
(
description
=
'caucase'
)
parser
=
argparse
.
ArgumentParser
(
description
=
'caucase'
,
version
=
version
.
__version__
,
)
# XXX: currently, it is the server which chooses which digest is used to sign
# stuff.
# Should clients be able to tell it how to sign (and server could reject) ?
...
...
@@ -624,6 +628,7 @@ def probe(argv=None):
"""
parser
=
argparse
.
ArgumentParser
(
description
=
'caucase probe - Verify basic caucase server functionality'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'ca_url'
,
...
...
@@ -653,6 +658,7 @@ def updater(argv=None, until=utils.until):
parser
=
argparse
.
ArgumentParser
(
description
=
'caucase updater - '
'Bootstrap certificate and companion files and keep them up-to-date'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'--ca-url'
,
...
...
@@ -870,6 +876,7 @@ def rerequest(argv=None):
description
=
'caucase rerequest - '
'Produce a new private key and sign a CSR created by copying an existing, '
'well-signed CSR.'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'--template'
,
...
...
@@ -928,6 +935,7 @@ def key_id(argv=None):
description
=
'caucase key id - '
'Displays key identifier from private key, and the list of acceptable key'
'identifiers for a given backup file.'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'--private-key'
,
...
...
caucase/http.py
View file @
d6fd5a40
...
...
@@ -343,7 +343,10 @@ def main(argv=None, until=utils.until):
"""
Caucase stand-alone http server.
"""
parser
=
argparse
.
ArgumentParser
(
description
=
'caucased'
)
parser
=
argparse
.
ArgumentParser
(
description
=
'caucased'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'--db'
,
default
=
'caucase.sqlite'
,
...
...
@@ -791,6 +794,7 @@ def manage(argv=None):
"""
parser
=
argparse
.
ArgumentParser
(
description
=
'caucased caucased database management tool'
,
version
=
version
.
__version__
,
)
parser
.
add_argument
(
'--db'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment