Skip to content

Commit d1b90b3

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

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
@@ -907,11 +907,24 @@ URI to access the Podman service
907907
- **rootless remote** - ssh://[email protected]/run/user/1000/podman/podman.sock
908908
- **rootful local** - unix:///run/podman/podman.sock
909909
- **rootful remote** - ssh://[email protected]:22/run/podman/podman.sock
910+
- **tcp/tls remote** - tcp://10.10.1.136:9443
910911

911912
**identity="~/.ssh/id_rsa**
912913

913914
Path to file containing ssh identity key
914915

916+
**tls_cert_file="~/certs/podman/tls.crt"**
917+
918+
Path to PEM file containing TLS client certificate
919+
920+
**tls_key_file="~/certs/podman/tls.key"**
921+
922+
Path to PEM file containing TLS client certificate private key
923+
924+
**tls_ca_file="~/certs/podman/ca.crt"**
925+
926+
Path to PEM file containing TLS certificate authority (CA) bundle
927+
915928
**[engine.volume_plugins]**
916929

917930
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
@@ -701,6 +701,13 @@ type Destination struct {
701701
// Identity file with ssh key, optional
702702
Identity string `json:",omitempty" toml:"identity,omitempty"`
703703

704+
// Path to TLS client certificate PEM file, optional
705+
TLSCertFile string `json:",omitempty" toml:"tls_cert_file,omitempty"`
706+
// Path to TLS client certificate private key PEM file, optional
707+
TLSKeyFile string `json:",omitempty" toml:"tls_key_file,omitempty"`
708+
// Path to TLS certificate authority PEM file, optional
709+
TLSCAFile string `json:",omitempty" toml:"tls_ca_file,omitempty"`
710+
704711
// isMachine describes if the remote destination is a machine.
705712
IsMachine bool `json:",omitempty" toml:"is_machine,omitempty"`
706713
}

Diff for: pkg/config/containers.conf

+8
Original file line numberDiff line numberDiff line change
@@ -766,10 +766,18 @@ default_sysctls = [
766766
# rootful "unix:///run/podman/podman.sock (Default)
767767
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
768768
# remote rootful ssh://[email protected]:22/run/podman/podman.sock
769+
# tcp/tls remote tcp://10.10.1.136:9443
769770
#
770771
# uri = "ssh://[email protected]/run/user/1001/podman/podman.sock"
771772
# Path to file containing ssh identity key
772773
# identity = "~/.ssh/id_rsa"
774+
# Path to PEM file containing TLS client certificate
775+
# tls_cert_file = "~/certs/podman/tls.crt"
776+
# Path to PEM file containing TLS client certificate private key
777+
# tls_key_file = "~/certs/podman/tls.key"
778+
# Path to PEM file containing TLS certificate authority (CA) bundle
779+
# tls_ca_file = "~/certs/podman/ca.crt"
780+
773781

774782
# Directory for temporary files. Must be tmpfs (wiped after reboot)
775783
#

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

+7
Original file line numberDiff line numberDiff line change
@@ -587,10 +587,17 @@ default_sysctls = [
587587
# rootful "unix:///run/podman/podman.sock (Default)
588588
# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
589589
# remote rootful ssh://[email protected]:22/run/podman/podman.sock
590+
# tcp/tls remote tcp://10.10.1.136:9443
590591
#
591592
# uri = "ssh://[email protected]/run/user/1001/podman/podman.sock"
592593
# Path to file containing ssh identity key
593594
# identity = "~/.ssh/id_rsa"
595+
# Path to PEM file containing TLS client certificate
596+
# tls_cert_file = "~/certs/podman/tls.crt"
597+
# Path to PEM file containing TLS client certificate private key
598+
# tls_key_file = "~/certs/podman/tls.key"
599+
# Path to PEM file containing TLS certificate authority (CA) bundle
600+
# tls_ca_file = "~/certs/podman/ca.crt"
594601

595602
# Directory for temporary files. Must be tmpfs (wiped after reboot)
596603
#

0 commit comments

Comments
 (0)