summaryrefslogtreecommitdiff
path: root/distrib/sets/lists/etc
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2015-09-13 13:49:50 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2015-09-13 13:49:50 +0000
commitd5d65f4ee177213b5b35fdf69c66654d8d35296e (patch)
tree6af2d81f693a965492e2420d86ac9c25f48f9e28 /distrib/sets/lists/etc
parenta99a075445581823fd858ba754acdc113be4ba8c (diff)
Move /etc/ssl/cert.pem from base to etc. Previously this was updated every
upgrade when untarring base sets; now it is done when sysmerge is run; if there are no local changes the update is seamless, otherwise with local changes (adding your own CAs, or removing ones which you don't want to trust) sysmerge will ask to diff as usual. ok miod deraadt
Diffstat (limited to 'distrib/sets/lists/etc')
-rw-r--r--distrib/sets/lists/etc/mi1
1 files changed, 1 insertions, 0 deletions
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 04da2ec5ea9..12e8aca55f5 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -42,6 +42,7 @@
./etc/spwd.db
./etc/ssh/ssh_config
./etc/ssh/sshd_config
+./etc/ssl/cert.pem
./etc/ssl/openssl.cnf
./etc/ssl/x509v3.cnf
./etc/syslog.conf