summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2014-07-11 17:10:31 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2014-07-11 17:10:31 +0000
commit65832d985ebb99ed6b9bff11f0b72649d3754645 (patch)
treed3df392977402454da89559a818fe8afb9de5c24
parent306dac89b8f08bde410a570d6c76c27b6299ffee (diff)
my pleasure to move bgpd.conf to examples. ok theo
-rw-r--r--etc/Makefile5
-rw-r--r--etc/changelist4
-rw-r--r--etc/examples/bgpd.conf (renamed from etc/bgpd.conf)2
3 files changed, 5 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile
index dcaf0ac176b..89bcb728d27 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.358 2014/07/11 16:59:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.359 2014/07/11 17:10:30 henning Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -40,7 +40,7 @@ BIN1= changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \
etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
moduli pf.os sensorsd.conf mixerctl.conf
-EXAMPLES=chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
+EXAMPLES=bgpd.conf chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
ospf6d.conf ospfd.conf
.if ${MACHINE} != "aviion"
@@ -111,7 +111,6 @@ distribution-etc-root-var: distrib-dirs
${INSTALL} -c -o root -g crontab -m 600 crontab ${DESTDIR}/var/cron/tabs/root
${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 bgpd.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 ripd.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
diff --git a/etc/changelist b/etc/changelist
index 3bf44bc5dd7..b9fc5c90ce7 100644
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-# $OpenBSD: changelist,v 1.88 2014/07/11 16:59:03 deraadt Exp $
+# $OpenBSD: changelist,v 1.89 2014/07/11 17:10:30 henning Exp $
#
# List of files which the security script backs up and checks
# for modifications.
@@ -10,7 +10,7 @@
/etc/Distfile
/etc/adduser.conf
/etc/adduser.message
-/etc/bgpd.conf
++/etc/bgpd.conf
/etc/boot.conf
/etc/bootparams
/etc/changelist
diff --git a/etc/bgpd.conf b/etc/examples/bgpd.conf
index 3ad21b9b1d8..d5fe6672e64 100644
--- a/etc/bgpd.conf
+++ b/etc/examples/bgpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf,v 1.16 2014/02/15 00:18:07 pelikan Exp $
+# $OpenBSD: bgpd.conf,v 1.1 2014/07/11 17:10:30 henning Exp $
# sample bgpd configuration file
# see bgpd.conf(5)