From: bapt <bapt@FreeBSD.org>
Date: Fri, 9 Oct 2015 23:57:07 +0000 (+0000)
Subject: Move ppp.conf into the ppp sources
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf3b00c72df48b3dd1c931f456e0939fd58b97fc;p=people%2Fjulieng%2Ffreebsd.git

Move ppp.conf into the ppp sources
---

diff --git a/etc/Makefile b/etc/Makefile
index ab17e1efeb2c..0112c617bc64 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -291,10 +291,6 @@ distribution:
 .endif
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-.if ${MK_PPP} != "no"
-	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
-	    ${PPPCNF} ${DESTDIR}/etc/ppp
-.endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf
deleted file mode 100644
index 2b63834839f9..000000000000
--- a/etc/ppp/ppp.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-#################################################################
-# PPP  Sample Configuration File
-# Originally written by Toshiharu OHNO
-# Simplified 5/14/1999 by wself@cdrom.com
-#
-# See /usr/share/examples/ppp/ for some examples
-#
-# $FreeBSD$
-#################################################################
-
-default:
- set log Phase Chat LCP IPCP CCP tun command
- ident user-ppp VERSION
-
- # Ensure that "device" references the correct serial port
- # for your modem. (cuau0 = COM1, cuau1 = COM2)
- #
- set device /dev/cuau1
-
- set speed 115200
- set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
-           \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
- set timeout 180			# 3 minute idle timer (the default)
- enable dns				# request DNS info (for resolv.conf)
-
-papchap:
- #
- # edit the next three lines and replace the items in caps with
- # the values which have been assigned by your ISP.
- #
-
- set phone PHONE_NUM
- set authname USERNAME
- set authkey PASSWORD
-
- set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0
- add default HISADDR			# Add a (sticky) default route
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index e0772af2e53e..6a3d8f2d1591 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -21,6 +21,9 @@ PPP_NO_PAM=
 PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
+CONFS=	ppp.conf
+CONFSDIR=	${ETCDIR}/ppp
+CONFSMODE=	600
 
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
diff --git a/usr.sbin/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf
new file mode 100644
index 000000000000..2b63834839f9
--- /dev/null
+++ b/usr.sbin/ppp/ppp.conf
@@ -0,0 +1,37 @@
+#################################################################
+# PPP  Sample Configuration File
+# Originally written by Toshiharu OHNO
+# Simplified 5/14/1999 by wself@cdrom.com
+#
+# See /usr/share/examples/ppp/ for some examples
+#
+# $FreeBSD$
+#################################################################
+
+default:
+ set log Phase Chat LCP IPCP CCP tun command
+ ident user-ppp VERSION
+
+ # Ensure that "device" references the correct serial port
+ # for your modem. (cuau0 = COM1, cuau1 = COM2)
+ #
+ set device /dev/cuau1
+
+ set speed 115200
+ set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
+           \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
+ set timeout 180			# 3 minute idle timer (the default)
+ enable dns				# request DNS info (for resolv.conf)
+
+papchap:
+ #
+ # edit the next three lines and replace the items in caps with
+ # the values which have been assigned by your ISP.
+ #
+
+ set phone PHONE_NUM
+ set authname USERNAME
+ set authkey PASSWORD
+
+ set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0
+ add default HISADDR			# Add a (sticky) default route