Author: bapt
Date: Fri Oct 9 23:57:07 2015
New Revision: 289096
URL: https://svnweb.freebsd.org/changeset/base/289096
Log:
Move ppp.conf into the ppp sources
Added:
head/usr.sbin/ppp/ppp.conf
- copied unchanged from r289057, head/etc/ppp/ppp.conf
Deleted:
head/etc/ppp/
Modified:
head/etc/Makefile
head/usr.sbin/ppp/Makefile
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Fri Oct 9 23:20:08 2015 (r289095)
+++ head/etc/Makefile Fri Oct 9 23:57:07 2015 (r289096)
@@ -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
Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile Fri Oct 9 23:20:08 2015 (r289095)
+++ head/usr.sbin/ppp/Makefile Fri Oct 9 23:57:07 2015 (r289096)
@@ -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=
Copied: head/usr.sbin/ppp/ppp.conf (from r289057, head/etc/ppp/ppp.conf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/ppp/ppp.conf Fri Oct 9 23:57:07 2015 (r289096, copy
of r289057, head/etc/ppp/ppp.conf)
@@ -0,0 +1,37 @@
+#################################################################
+# PPP Sample Configuration File
+# Originally written by Toshiharu OHNO
+# Simplified 5/14/1999 by [email protected]
+#
+# 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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
