Skip to content

Commit 1b75c0b

Browse files
committed
Add fields for TLS material to destination config
Signed-off-by: Andrew Melnick <[email protected]>
1 parent 305e9ce commit 1b75c0b

File tree

4 files changed

+35
-0
lines changed

4 files changed

+35
-0
lines changed

Diff for: docs/containers.conf.5.md

+13
Original file line numberDiff line numberDiff line change
@@ -897,11 +897,24 @@ URI to access the Podman service
897897
- **rootless remote** - ssh://[email protected]/run/user/1000/podman/podman.sock
898898
- **rootful local** - unix:///run/podman/podman.sock
899899
- **rootful remote** - ssh://[email protected]:22/run/podman/podman.sock
900+
- **tcp/tls remote** - tcp://10.10.1.136:9443
900901

901902
**identity="~/.ssh/id_rsa**
902903

903904
Path to file containing ssh identity key
904905

906+
**tls_cert_file="~/certs/podman/tls.crt"**
907+
908+
Path to PEM file containing TLS client certificate
909+
910+
**tls_key_file="~/certs/podman/tls.key"**
911+
912+
Path to PEM file containing TLS client certificate private key
913+
914+
**tls_ca_file="~/certs/podman/ca.crt"**
915+
916+
Path to PEM file containing TLS certificate authority (CA) bundle
917+
905918
**[engine.volume_plugins]**
906919

907920
A table of all the enabled volume plugins on the system. Volume plugins can be

Diff for: pkg/config/config.go

+7
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,13 @@ type Destination struct {
694694
// Identity file with ssh key, optional
695695
Identity string `json:",omitempty" toml:"identity,omitempty"`
696696

697+
// Path to TLS client certificate PEM file, optional
698+
TLSCertFile string `json:",omitempty" toml:"tls_cert_file,omitempty"`
699+
// Path to TLS client certificate private key PEM file, optional
700+
TLSKeyFile string `json:",omitempty" toml:"tls_key_file,omitempty"`
701+
// Path to TLS certificate authority PEM file, optional
702+
TLSCAFile string `json:",omitempty" toml:"tls_ca_file,omitempty"`
703+
697704
// isMachine describes if the remote destination is a machine.
698705
IsMachine bool `json:",omitempty" toml:"is_machine,omitempty"`
699706
}

Diff for: pkg/config/containers.conf

+8
Original file line numberDiff line numberDiff line change
@@ -758,10 +758,18 @@ default_sysctls = [
758758
# rootful "unix:///run/podman/podman.sock (Default)
759759
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
760760
# remote rootful ssh://[email protected]:22/run/podman/podman.sock
761+
# tcp/tls remote tcp://10.10.1.136:9443
761762
#
762763
# uri = "ssh://[email protected]/run/user/1001/podman/podman.sock"
763764
# Path to file containing ssh identity key
764765
# identity = "~/.ssh/id_rsa"
766+
# Path to PEM file containing TLS client certificate
767+
# tls_cert_file = "~/certs/podman/tls.crt"
768+
# Path to PEM file containing TLS client certificate private key
769+
# tls_key_file = "~/certs/podman/tls.key"
770+
# Path to PEM file containing TLS certificate authority (CA) bundle
771+
# tls_ca_file = "~/certs/podman/ca.crt"
772+
765773

766774
# Directory for temporary files. Must be tmpfs (wiped after reboot)
767775
#

Diff for: pkg/config/containers.conf-freebsd

+7
Original file line numberDiff line numberDiff line change
@@ -581,10 +581,17 @@ default_sysctls = [
581581
# rootful "unix:///run/podman/podman.sock (Default)
582582
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
583583
# remote rootful ssh://[email protected]:22/run/podman/podman.sock
584+
# tcp/tls remote tcp://10.10.1.136:9443
584585
#
585586
# uri = "ssh://[email protected]/run/user/1001/podman/podman.sock"
586587
# Path to file containing ssh identity key
587588
# identity = "~/.ssh/id_rsa"
589+
# Path to PEM file containing TLS client certificate
590+
# tls_cert_file = "~/certs/podman/tls.crt"
591+
# Path to PEM file containing TLS client certificate private key
592+
# tls_key_file = "~/certs/podman/tls.key"
593+
# Path to PEM file containing TLS certificate authority (CA) bundle
594+
# tls_ca_file = "~/certs/podman/ca.crt"
588595

589596
# Directory for temporary files. Must be tmpfs (wiped after reboot)
590597
#

0 commit comments

Comments
 (0)