Author: dougb
Date: Mon Mar 28 19:42:21 2011
New Revision: 220113
URL: http://svn.freebsd.org/changeset/base/220113

Log:
  MFC r220020:
  
  Add a daily period script to back up /var/db/pkg
  
  MFC r220049:
  
  Hook the 220.backup-pkgdb script I added to the build unconditionally
  Hook up 610.ipf6denied based on MK_IPFILTER as 510.ipfdenied is now

Added:
  stable/7/etc/periodic/daily/220.backup-pkgdb
     - copied unchanged from r220020, head/etc/periodic/daily/220.backup-pkgdb
Modified:
  stable/7/etc/defaults/periodic.conf
  stable/7/etc/periodic/daily/Makefile
  stable/7/etc/periodic/security/Makefile
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/defaults/periodic.conf
==============================================================================
--- stable/7/etc/defaults/periodic.conf Mon Mar 28 19:39:53 2011        
(r220112)
+++ stable/7/etc/defaults/periodic.conf Mon Mar 28 19:42:21 2011        
(r220113)
@@ -74,6 +74,10 @@ daily_backup_passwd_enable="YES"                     # Bac
 # 210.backup-aliases
 daily_backup_aliases_enable="YES"                      # Backup mail aliases
 
+# 220.backup-pkgdb
+daily_backup_pkgdb_enable="YES"                                # Backup 
/var/db/pkg
+daily_backup_pkgdb_dir="/var/backups"
+
 # 300.calendar
 daily_calendar_enable="NO"                             # Run calendar -a
 

Copied: stable/7/etc/periodic/daily/220.backup-pkgdb (from r220020, 
head/etc/periodic/daily/220.backup-pkgdb)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/7/etc/periodic/daily/220.backup-pkgdb        Mon Mar 28 19:42:21 
2011        (r220113, copy of r220020, head/etc/periodic/daily/220.backup-pkgdb)
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+rc=0
+
+case "$daily_backup_pkgdb_enable" in
+    [Yy][Ee][Ss])
+       bak="${daily_backup_pkgdb_dir:-/var/backups}"
+       bak_file="${bak}/pkgdb.bak.tbz"
+
+       pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null`
+
+       if [ ! -d "$bak" ]
+       then
+           install -d -o root -g wheel -m 750 $bak || {
+               echo '$daily_backup_pkgdb_enable is enabled but' \
+                   "$daily_backup_pkgdb_dbdir doesn't exist" ;
+               exit 2 ; }
+       fi
+
+       echo ''
+       echo 'Backing up package db directory:'
+
+       new_bak_file=`mktemp ${bak_file}-XXXXX`
+
+       if tar -cjf "${new_bak_file}" "$pkg_dbdir"; then
+           chmod 644 "${new_bak_file}"
+
+           if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then
+               unlink "${bak_file}.2"
+               mv "${bak_file}" "${bak_file}.2"
+           fi
+           [ -e "${bak_file}" ] && mv "${bak_file}" "${bak_file}.2"
+           mv "${new_bak_file}" "${bak_file}"
+       else
+           rc=3
+       fi ;;
+esac
+
+exit $rc

Modified: stable/7/etc/periodic/daily/Makefile
==============================================================================
--- stable/7/etc/periodic/daily/Makefile        Mon Mar 28 19:39:53 2011        
(r220112)
+++ stable/7/etc/periodic/daily/Makefile        Mon Mar 28 19:42:21 2011        
(r220113)
@@ -6,6 +6,7 @@ FILES=  100.clean-disks \
        110.clean-tmps \
        120.clean-preserve \
        200.backup-passwd \
+       220.backup-pkgdb \
        330.news \
        400.status-disks \
        404.status-zfs \

Modified: stable/7/etc/periodic/security/Makefile
==============================================================================
--- stable/7/etc/periodic/security/Makefile     Mon Mar 28 19:39:53 2011        
(r220112)
+++ stable/7/etc/periodic/security/Makefile     Mon Mar 28 19:42:21 2011        
(r220113)
@@ -16,6 +16,7 @@ FILES=        100.chksetuid \
 
 .if ${MK_IPFILTER} != "no"
 FILES+=        510.ipfdenied
+FILES+=        610.ipf6denied
 .endif
 
 .if ${MK_IPFW} != "no"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to