From: Paul Wise <pabs@debian.org>
Date: Wed, 7 Jan 2015 12:02:41 +0000 (+0800)
Subject: ca-certificates configuration is now handled by puppet
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=2dfd6bf9ef5adb6d1514d35009b3046bba5218c1

ca-certificates configuration is now handled by puppet
---

diff --git a/input/howto/new-machine.creole b/input/howto/new-machine.creole
index a8cb69c..3cf0178 100644
--- a/input/howto/new-machine.creole
+++ b/input/howto/new-machine.creole
@@ -55,10 +55,9 @@ Note: this has recently been changed to rely more on [[puppet|howto/puppet-setup
 
 * try to become root using sudo.
 
-* make ca-certificates sane:  (choose to *not* trust new certs, and we only want the spi cert activated)
+* make ca-certificates sane:  (choose to *not* trust new certs)
 {{{
     echo "ca-certificates ca-certificates/trust_new_crts  select no" | debconf-set-selections
-    sed -i -e 's/^[^#!].*/!&/; s#^!spi-inc.org/spi-cacert-2008.crt#spi-inc.org/spi-cacert-2008.crt#' /etc/ca-certificates.conf
     dpkg-reconfigure ca-certificates
 }}}