Browse Source

- move the ntpd.conf file to examples directory

- move it from BIN1 to EXAMPLES in src/etc/Makefile
- change the installer to create the file instead of editing it
- add a '+' to the corresponding changelist entry
suggested by and OK deraadt@
OK for the installer change krw@
OPENBSD_5_6
rpe 10 years ago
parent
commit
9bc3ff3e5f
3 changed files with 7 additions and 6 deletions
  1. +4
    -3
      src/etc/Makefile
  2. +2
    -2
      src/etc/changelist
  3. +1
    -1
      src/etc/examples/ntpd.conf

+ 4
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.369 2014/07/13 13:01:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.370 2014/07/13 13:53:36 rpe Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -36,10 +36,11 @@ BIN1= changelist csh.cshrc csh.login csh.logout daily \
newsyslog.conf protocols rc rc.conf rc.local \ newsyslog.conf protocols rc rc.conf rc.local \
rc.securelevel rc.shutdown rpc services shells syslog.conf \ rc.securelevel rc.shutdown rpc services shells syslog.conf \
weekly etc.${MACHINE}/login.conf etc.${MACHINE}/disktab \ weekly etc.${MACHINE}/login.conf etc.${MACHINE}/disktab \
dhclient.conf mailer.conf ntpd.conf moduli pf.os mixerctl.conf
dhclient.conf mailer.conf moduli pf.os mixerctl.conf
EXAMPLES=chio.conf dhcpd.conf exports ftpchroot hosts.lpd ifstated.conf \ EXAMPLES=chio.conf dhcpd.conf exports ftpchroot hosts.lpd ifstated.conf \
inetd.conf mrouted.conf printcap rbootd.conf remote sensorsd.conf
inetd.conf mrouted.conf ntpd.conf printcap rbootd.conf remote \
sensorsd.conf
EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \ EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
ldapd.conf ldpd.conf ospf6d.conf ospfd.conf relayd.conf ripd.conf \ ldapd.conf ldpd.conf ospf6d.conf ospfd.conf relayd.conf ripd.conf \


+ 2
- 2
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.91 2014/07/12 03:52:39 deraadt Exp $
# $OpenBSD: changelist,v 1.92 2014/07/13 13:53:36 rpe Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -94,7 +94,7 @@
/etc/nginx/nginx.conf /etc/nginx/nginx.conf
/etc/npppd/npppd.conf /etc/npppd/npppd.conf
+/etc/npppd/npppd-users +/etc/npppd/npppd-users
/etc/ntpd.conf
+/etc/ntpd.conf
+/etc/ospf6d.conf +/etc/ospf6d.conf
+/etc/ospfd.conf +/etc/ospfd.conf
/etc/passwd /etc/passwd


src/etc/ntpd.conf → src/etc/examples/ntpd.conf View File

@ -1,4 +1,4 @@
# $OpenBSD: ntpd.conf,v 1.11 2009/05/18 16:13:48 stevesk Exp $
# $OpenBSD: ntpd.conf,v 1.1 2014/07/13 13:53:36 rpe Exp $
# sample ntpd configuration file, see ntpd.conf(5) # sample ntpd configuration file, see ntpd.conf(5)
# Addresses to listen on (ntpd does not listen by default) # Addresses to listen on (ntpd does not listen by default)

Loading…
Cancel
Save