summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2008-02-09 12:10:55 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2008-02-09 12:10:55 +0000
commitaca34d38dfb59fd0b03de1f2a0eb3507ccb2bae3 (patch)
tree5eae5b6e4942609d0cb75f2fb7dfdaf2b22cda9a /etc
parentf7dfc01b942d768a77294b25cbd6fe58538d1948 (diff)
Add .ssh and authorized keys to /etc/skel, makes setting up new
pubkey authentication users with the correct file permissions a bit easier. ok djm krw henning miod and many others
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile6
-rw-r--r--etc/mtree/4.4BSD.dist8
2 files changed, 11 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile
index bb947d767da..4a653accd00 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.259 2008/01/31 14:18:03 reyk Exp $
+# $OpenBSD: Makefile,v 1.260 2008/02/09 12:10:53 mcbride Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -110,7 +110,9 @@ distribution-etc-root-var: distrib-dirs
${INSTALL} -c -o root -g wheel -m 644 dot.mailrc \
${DESTDIR}/etc/skel/.mailrc; \
${INSTALL} -c -o root -g wheel -m 644 dot.profile \
- ${DESTDIR}/etc/skel/.profile
+ ${DESTDIR}/etc/skel/.profile; \
+ ${INSTALL} -c -o root -g wheel -m 600 /dev/null \
+ ${DESTDIR}/etc/skel/.ssh/authorized_keys
cd kerberosV; \
${INSTALL} -c -o root -g wheel -m 644 README \
${DESTDIR}/etc/kerberosV; \
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 77ba5151ddd..04d67f6fa71 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-# $OpenBSD: 4.4BSD.dist,v 1.190 2008/01/31 22:44:40 henning Exp $
+# $OpenBSD: 4.4BSD.dist,v 1.191 2008/02/09 12:10:54 mcbride Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -132,6 +132,12 @@ ppp
# ./etc/skel
skel
+
+# ./etc/skel/.ssh
+.ssh uname=root mode=0700
+# ./etc/skel/.ssh
+..
+
# ./etc/skel
..