me
/
guix
Archived
1
0
Fork 0
Code

services: ganeti: Use TLS on the remote API by default. 

* gnu/services/ganeti.scm (<ganeti-rapi-configuration>): Set SSL? to #t.
* gnu/tests/ganeti.scm (%ganeti-os): Set SSL? to #f.
* doc/guix.texi (Virtualization Services): Adjust accordingly.
master
Marius Bakke 2020-07-19 09:59:57 +02:00
parent c91c132fc4
commit 41daf12865
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -25497,7 +25497,7 @@ The maximum number of simultaneous client requests to handle. Further
connections are allowed, but no responses are sent until enough connections connections are allowed, but no responses are sent until enough connections
have closed. have closed.
@item @code{ssl?} (default: @code{#f}) @item @code{ssl?} (default: @code{#t})
Whether to use SSL/TLS encryption on the RAPI port. Whether to use SSL/TLS encryption on the RAPI port.
@item @code{ssl-key} (default: @file{"/var/lib/ganeti/server.pem"}) @item @code{ssl-key} (default: @file{"/var/lib/ganeti/server.pem"})

2
gnu/services/ganeti.scm
View File

@ -450,7 +450,7 @@ be submitted via this daemon and it schedules and starts them.")))
(max-clients ganeti-rapi-configuration-max-clients ;integer (max-clients ganeti-rapi-configuration-max-clients ;integer
(default 20)) (default 20))
(ssl? ganeti-rapi-configuration-ssl? ;Boolean (ssl? ganeti-rapi-configuration-ssl? ;Boolean
(default #f)) (default #t))
(ssl-key ganeti-rapi-configuration-ssl-key ;string (ssl-key ganeti-rapi-configuration-ssl-key ;string
(default "/var/lib/ganeti/server.pem")) (default "/var/lib/ganeti/server.pem"))
(ssl-cert ganeti-rapi-configuration-ssl-cert ;string (ssl-cert ganeti-rapi-configuration-ssl-cert ;string

5
gnu/tests/ganeti.scm
View File

@ -70,6 +70,11 @@
(service ganeti-service-type (service ganeti-service-type
(ganeti-configuration (ganeti-configuration
(file-storage-paths '("/srv/ganeti/file-storage")) (file-storage-paths '("/srv/ganeti/file-storage"))
(rapi-configuration
(ganeti-rapi-configuration
;; Disable TLS so we can test the RAPI without
;; pulling in GnuTLS.
(ssl? #f)))
(os %default-ganeti-os)))) (os %default-ganeti-os))))
%base-services)))) %base-services))))