ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "system: Add 'x509-certificates' field, and populate /etc/ssl/certs."

Browse source 
This reverts commit e979e6dd52.
This commit is contained in:
Mark H Weaver 2015-03-03 02:06:27 -05:00
parent bd4c47a47e
commit e33eea8ffd
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
doc/guix.texi
View file

@ -3882,19 +3882,6 @@ Configuration of libc's name service switch (NSS)---a
@code{<name-service-switch>} object. @xref{Name Service Switch}, for @code{<name-service-switch>} object. @xref{Name Service Switch}, for
details. details.
@item @code{x509-certificates} (default: @var{nss-certs})
This field's value must be a package containing X.509 certificates for
so-called ``Certification Authorities'' (CAs) that is made available in
the @file{/etc/ssl/certs} directory. Currently this directory is
accessed by applications using either the GnuTLS library or the OpenSSL
library.
By default, certificates from
@uref{https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS,
Mozilla's Network Security Services} are used. These are the
certificates shipped by Mozilla browsers and derivatives such as
GNU@tie{}IceCat.
@item @code{services} (default: @var{%base-services}) @item @code{services} (default: @var{%base-services})
A list of monadic values denoting system services. @xref{Services}. A list of monadic values denoting system services. @xref{Services}.

8
gnu/system.scm
View file

@ -42,7 +42,6 @@ (define-module (gnu system)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages firmware) #:use-module (gnu packages firmware)
#:autoload (gnu packages cryptsetup) (cryptsetup) #:autoload (gnu packages cryptsetup) (cryptsetup)
#:use-module (gnu packages certs)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services dmd) #:use-module (gnu services dmd)
#:use-module (gnu services base) #:use-module (gnu services base)
@ -78,7 +77,6 @@ (define-module (gnu system)
operating-system-locale-definitions operating-system-locale-definitions
operating-system-mapped-devices operating-system-mapped-devices
operating-system-file-systems operating-system-file-systems
operating-system-x509-certificates
operating-system-activation-script operating-system-activation-script
operating-system-derivation operating-system-derivation
@ -142,8 +140,6 @@ (define-record-type* <operating-system> operating-system
(default %default-locale-definitions)) (default %default-locale-definitions))
(name-service-switch operating-system-name-service-switch ; <name-service-switch> (name-service-switch operating-system-name-service-switch ; <name-service-switch>
(default %default-nss)) (default %default-nss))
(x509-certificates operating-system-x509-certificates ; package
(default nss-certs))
(services operating-system-user-services ; list of monadic services (services operating-system-user-services ; list of monadic services
(default %base-services)) (default %base-services))
@ -416,7 +412,6 @@ (define* (etc-directory #:key
(pam-services '()) (pam-services '())
(profile "/run/current-system/profile") (profile "/run/current-system/profile")
hosts-file nss hosts-file nss
x509-certificates
(sudoers "")) (sudoers ""))
"Return a derivation that builds the static part of the /etc directory." "Return a derivation that builds the static part of the /etc directory."
(mlet* %store-monad (mlet* %store-monad
@ -466,8 +461,6 @@ (define* (etc-directory #:key
`(("services" ,#~(string-append #$net-base "/etc/services")) `(("services" ,#~(string-append #$net-base "/etc/services"))
("protocols" ,#~(string-append #$net-base "/etc/protocols")) ("protocols" ,#~(string-append #$net-base "/etc/protocols"))
("rpc" ,#~(string-append #$net-base "/etc/rpc")) ("rpc" ,#~(string-append #$net-base "/etc/rpc"))
("ssl" ,#~(string-append #$x509-certificates
"/etc/ssl")) ;for OpenSSL & co.
("emacs" ,#~#$emacs) ("emacs" ,#~#$emacs)
("pam.d" ,#~#$pam.d) ("pam.d" ,#~#$pam.d)
("login.defs" ,#~#$login.defs) ("login.defs" ,#~#$login.defs)
@ -530,7 +523,6 @@ (define (operating-system-etc-directory os)
#:timezone (operating-system-timezone os) #:timezone (operating-system-timezone os)
#:hosts-file /etc/hosts #:hosts-file /etc/hosts
#:sudoers (operating-system-sudoers os) #:sudoers (operating-system-sudoers os)
#:x509-certificates (operating-system-x509-certificates os)
#:profile profile-drv))) #:profile profile-drv)))
(define %setuid-programs (define %setuid-programs