diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-05-18 13:48:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-05-18 13:48:39 +0000 |
| commit | 99ee9dfef2c862303a6cf4ccf7d32dd061c7db0e (patch) | |
| tree | cc91d93503d1eeac5c134e6f57f94d3ee371cb0c /etc | |
| parent | 7adbbc5749cf91f7871775bbd84d919bb5f596c6 (diff) | |
enable ntpd by default at install time. We use pools and a reliable
constraint to keep them in check. in the worst case of being on a
dark net, nothing changes.
this is being enabled by default to allow gathering of more operational
information from users. and if the operational heuristics in ntpd can be
suitable refined, this may stay the default into the future. if not, ntpd
will become even more awesome along the way.
with reyk rpe
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/ntpd.conf | 14 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index f8b3769dbf0..afa7130e819 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.401 2015/03/27 18:49:50 schwarze Exp $ +# $OpenBSD: Makefile,v 1.402 2015/05/18 13:48:38 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -97,6 +97,7 @@ distribution-etc-root-var: distrib-dirs ${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd ${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc + ${INSTALL} -c -o root -g wheel -m 640 ntpd.conf ${DESTDIR}/etc ${INSTALL} -c -o root -g _nsd -m 640 nsd.conf ${DESTDIR}/var/nsd/etc ${INSTALL} -c -o root -g wheel -m 644 unbound.conf ${DESTDIR}/var/unbound/etc ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ diff --git a/etc/ntpd.conf b/etc/ntpd.conf new file mode 100644 index 00000000000..ec5a86e25d3 --- /dev/null +++ b/etc/ntpd.conf @@ -0,0 +1,14 @@ +# $OpenBSD: ntpd.conf,v 1.13 2015/05/18 13:48:38 deraadt Exp $ + +# Addresses to listen on (ntpd does not listen by default) +#listen on * + +# use a random selection of NTP Pool Time Servers +# see http://support.ntp.org/bin/view/Servers/NTPPoolServers +servers pool.ntp.org + +# use all detected timedelta sensors +sensor * + +# get the time constraint from a well-known HTTPS site +constraints from "https://www.google.com" diff --git a/etc/rc.conf b/etc/rc.conf index 66c687a9827..c4c7ca46bde 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,4 +1,4 @@ -# $OpenBSD: rc.conf,v 1.202 2015/05/04 22:25:17 schwarze Exp $ +# $OpenBSD: rc.conf,v 1.203 2015/05/18 13:48:38 deraadt Exp $ # DO NOT EDIT THIS FILE!! # @@ -40,7 +40,7 @@ mopd_flags=NO mrouted_flags=NO # be sure to enable multicast_router below npppd_flags=NO nsd_flags=NO -ntpd_flags=NO +ntpd_flags= ospfd_flags=NO ospf6d_flags=NO pflogd_flags= # add more flags, e.g. "-s 256" |