svn commit: r337338 - in head: etc usr.sbin/freebsd-update

[Brad Davis]

Author: brd
Date: Sat Aug  4 22:25:41 2018
New Revision: 337338
URL: https://svnweb.freebsd.org/changeset/base/337338

Log:
  Move freebsd-update.conf to usr.sbin/freebsd-update.
  
  This is prep for pkgbase so that config files are tagged as such.
  
  Approved by:	will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16556

Added:
  head/usr.sbin/freebsd-update/freebsd-update.conf
     - copied unchanged from r337337, head/etc/freebsd-update.conf
Deleted:
  head/etc/freebsd-update.conf
Modified:
  head/etc/Makefile
  head/usr.sbin/freebsd-update/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sat Aug  4 22:15:59 2018	(r337337)
+++ head/etc/Makefile	Sat Aug  4 22:25:41 2018	(r337338)
@@ -74,10 +74,6 @@ BIN1+= amd.map
 BIN1+=	auto_master
 .endif
 
-.if ${MK_FREEBSD_UPDATE} != "no"
-BIN1+= freebsd-update.conf
-.endif
-
 .if ${MK_FTP} != "no"
 BIN1+= ftpusers
 .endif

Modified: head/usr.sbin/freebsd-update/Makefile
==============================================================================
--- head/usr.sbin/freebsd-update/Makefile	Sat Aug  4 22:15:59 2018	(r337337)
+++ head/usr.sbin/freebsd-update/Makefile	Sat Aug  4 22:25:41 2018	(r337338)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	freebsd-update.conf
 SCRIPTS=freebsd-update.sh
 MAN=	freebsd-update.8
 

Copied: head/usr.sbin/freebsd-update/freebsd-update.conf (from r337337, head/etc/freebsd-update.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/freebsd-update/freebsd-update.conf	Sat Aug  4 22:25:41 2018	(r337338, copy of r337337, head/etc/freebsd-update.conf)
@@ -0,0 +1,76 @@
+# $FreeBSD$
+
+# Trusted keyprint.  Changing this is a Bad Idea unless you've received
+# a PGP-signed email from <security-officer at FreeBSD.org> telling you to
+# change it and explaining why.
+KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
+
+# Server or server pool from which to fetch updates.  You can change
+# this to point at a specific server if you want, but in most cases
+# using a "nearby" server won't provide a measurable improvement in
+# performance.
+ServerName update.FreeBSD.org
+
+# Components of the base system which should be kept updated.
+Components src world kernel
+
+# Example for updating the userland and the kernel source code only:
+# Components src/base src/sys world
+
+# Paths which start with anything matching an entry in an IgnorePaths
+# statement will be ignored.
+IgnorePaths
+
+# Paths which start with anything matching an entry in an IDSIgnorePaths
+# statement will be ignored by "freebsd-update IDS".
+IDSIgnorePaths /usr/share/man/cat
+IDSIgnorePaths /usr/share/man/whatis
+IDSIgnorePaths /var/db/locate.database
+IDSIgnorePaths /var/log
+
+# Paths which start with anything matching an entry in an UpdateIfUnmodified
+# statement will only be updated if the contents of the file have not been
+# modified by the user (unless changes are merged; see below).
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
+
+# When upgrading to a new FreeBSD release, files which match MergeChanges
+# will have any local changes merged into the version from the new release.
+MergeChanges /etc/ /boot/device.hints
+
+### Default configuration options:
+
+# Directory in which to store downloaded updates and temporary
+# files used by FreeBSD Update.
+# WorkDir /var/db/freebsd-update
+
+# Destination to send output of "freebsd-update cron" if an error
+# occurs or updates have been downloaded.
+# MailTo root
+
+# Is FreeBSD Update allowed to create new files?
+# AllowAdd yes
+
+# Is FreeBSD Update allowed to delete files?
+# AllowDelete yes
+
+# If the user has modified file ownership, permissions, or flags, should
+# FreeBSD Update retain this modified metadata when installing a new version
+# of that file?
+# KeepModifiedMetadata yes
+
+# When upgrading between releases, should the list of Components be
+# read strictly (StrictComponents yes) or merely as a list of components
+# which *might* be installed of which FreeBSD Update should figure out
+# which actually are installed and upgrade those (StrictComponents no)?
+# StrictComponents no
+
+# When installing a new kernel perform a backup of the old one first
+# so it is possible to boot the old kernel in case of problems.
+# BackupKernel yes
+
+# If BackupKernel is enabled, the backup kernel is saved to this
+# directory.
+# BackupKernelDir /boot/kernel.old
+
+# When backing up a kernel also back up debug symbol files?
+# BackupKernelSymbolFiles no