[svn] r3545 - in trunk/tools/dconf: . config

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Fri Sep 2 13:13:39 CEST 2005


Author: dag
Date: 2005-09-02 13:13:38 +0200 (Fri, 02 Sep 2005)
New Revision: 3545

Modified:
   trunk/tools/dconf/ChangeLog
   trunk/tools/dconf/Makefile
   trunk/tools/dconf/TODO
   trunk/tools/dconf/config/dconf-debian.conf
   trunk/tools/dconf/config/dconf-redhat.conf
   trunk/tools/dconf/dconf
   trunk/tools/dconf/dconf.1.txt
   trunk/tools/dconf/dconf.spec
Log:
Updates

Modified: trunk/tools/dconf/ChangeLog
===================================================================
--- trunk/tools/dconf/ChangeLog	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/ChangeLog	2005-09-02 11:13:38 UTC (rev 3545)
@@ -1,8 +1,9 @@
-* 0.4.3 - Untitled - released 06/08/2005
+* 0.5.0 - Return To Hasselt - released 02/09/2005
 - Disable digests in rpmdb too. (Bert de Bruijn)
 - Removed sysctl -p from dconf.conf (Bernhard Weisshuhn)
 - Added openntpd, postgresql, shorewall, syslog-ng sections (Bernhard Weisshuhn)
 - Added axfdns, dnscache, tinydns sections (Bernhard Weisshuhn)
+- Sections are now sorted (less python-specific output, but breaks older snapshots)
 
 * 0.4.2 - Mid-Hudson Valley LUG - released 22/06/2005
 - Use 160bit SHA1 instead of 128bit MD5

Modified: trunk/tools/dconf/Makefile
===================================================================
--- trunk/tools/dconf/Makefile	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/Makefile	2005-09-02 11:13:38 UTC (rev 3545)
@@ -38,7 +38,7 @@
 %.html: %.txt
 	asciidoc -b xhtml11 -d manpage $<
 
-%: %.xml
+%.1: %.1.xml
 	xmlto man $<
 
 %.xml: %.txt

Modified: trunk/tools/dconf/TODO
===================================================================
--- trunk/tools/dconf/TODO	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/TODO	2005-09-02 11:13:38 UTC (rev 3545)
@@ -5,24 +5,41 @@
 ### Usability
 + Make mailing diffs smart (keep the headers and diff content)
 + Add support for (recursive) dirs (dirs = )
-+ Rotate snapshots or consolidate snapshots (by removing in-between snapshots)
 + Add dpkg support
-+ Use the same order in the snapshot file as the order of the sections
 + Dconf should also check time/owner/perms next to md5
 
 ### Output
 + Allow XML or HTML output (in some way)
 
 ### Query tool (dconf-diff)
-+ Add tool to smart diff between 2 dates (say: dconf-diff '1 day ago' or dconf-diff 'now')
-+ Get logged-on people directly from utmp database (based on given dates), see python-utmp
++ Add tool to smart diff between 2 dates
+  (say: dconf-diff '1 day ago' or dconf-diff 'now')
++ Get logged-on people directly from utmp database
+  (based on given dates), see python-utmp
 
 ### Restore tool (dconf-restore)
-+ Add tool to restore files from dconf log (say: dconf-restore --root /tmp /etc/sysctl.conf)
++ Add tool to restore files from dconf log
+  (say: dconf-restore --root /tmp /etc/sysctl.conf)
 
-### Sections
-+ sysctl is disabled as it performs a change. Sadly sysctl -a returns random stuff -> false positive
+### Extraction tool (dconf-cat)
++ Add a tool to extract output from commands
+  (say: dconf-cat -c 'dpkg --get-selections' dconf-hostname-timestamp.log | dpkg --set-selections)
+
+### Round Robin rotate/consolidation script
++ Rotate snapshots or consolidate snapshots (by removing in-between snapshots)
+
+### Section considerations
++ sysctl is disabled as it performs a change. Sadly sysctl -a returns
+  randomstuff -> false positive
 + netstat is disabled since it often shows different output -> false postive
 
+### Documentation
++ Add general scenarios that make use of the dconf snapshots
+
 ### Bugs
-+ Dconf needs a very recent python (2.3) with unified_diff support (for email-functionality only)
++ Dconf needs a very recent python (2.3) with unified_diff support (for
+  email-functionality only)
++ Dconf needs to check write-access to the default output-dir and/or switch
+  to another default (ie. ~/.dconf)
++ Dconf should not give a traceback if it has a permission denied condition
+  (both when trying to write or trying to read)

Modified: trunk/tools/dconf/config/dconf-debian.conf
===================================================================
--- trunk/tools/dconf/config/dconf-debian.conf	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/config/dconf-debian.conf	2005-09-02 11:13:38 UTC (rev 3545)
@@ -105,7 +105,9 @@
 	/proc/net/unix
 
 [packages]
-cmds =	dpkg -l
+cmds =
+	dpkg -l
+	dpkg --get-selections                                                                     
 
 [printer]
 files =

Modified: trunk/tools/dconf/config/dconf-redhat.conf
===================================================================
--- trunk/tools/dconf/config/dconf-redhat.conf	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/config/dconf-redhat.conf	2005-09-02 11:13:38 UTC (rev 3545)
@@ -22,6 +22,7 @@
 [boot]
 files =
 	/etc/sysconfig/firstboot
+	/etc/sysconfig/i18n
 	/etc/sysconfig/init
 	/etc/grub.conf
 	/etc/initlog.conf
@@ -234,8 +235,10 @@
 	/etc/cpuspeed.conf
 	/etc/hotplug/blacklist
 	/etc/hotswaprc
+	/etc/killpower
 	/etc/modprobe.conf
 	/etc/modules.conf
+	/etc/sysconfig/bluetooth
 	/etc/sysconfig/clock
 	/etc/sysconfig/cpudynd
 	/etc/sysconfig/cpufreqd
@@ -255,6 +258,7 @@
 	/etc/sysconfig/sensors
 	/etc/sysconfig/smartmontools
 	/etc/sysconfig/ups
+	/etc/ups/upsmon.conf
 	/proc/cpuinfo
 	/proc/devices
 	/proc/dma
@@ -288,6 +292,11 @@
 	/etc/qla2300.conf
 	/proc/scsi/qla2300/? | grep -v -i -E '(number| reqs| free count) '
 
+[thinkpad]
+files =
+	/etc/sysconfig/tp-scroll
+	/etc/tpbrc
+
 ### Software tools
 [afick]
 files = /etc/afick.conf
@@ -597,6 +606,11 @@
 	/etc/ntp/step-tickers
 	/etc/sysconfig/ntpd
 
+[op]
+files =
+	/etc/op.conf
+	/etc/op.d/*.conf
+
 [openldap]
 files =
 	/etc/ldap.conf

Modified: trunk/tools/dconf/dconf
===================================================================
--- trunk/tools/dconf/dconf	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/dconf	2005-09-02 11:13:38 UTC (rev 3545)
@@ -4,7 +4,7 @@
 import ConfigParser, urlparse, pwd, grp, stat, syslog
 import difflib, smtplib, gzip, md5, sha
 
-VERSION = '0.4.3'
+VERSION = '0.5.0'
 
 enable = ('yes', 'on', 'true', '1')
 disable = ('no', 'off', 'false', '0')
@@ -364,7 +364,9 @@
 		log = dzopen(logfile, 'w')
 
 	info(2, 'Building file: %s' % logfile)
-	for section in cf.sections.keys():
+	sections = cf.sections.keys()
+	sections.sort()
+	for section in sections:
 		stitle = False
 
 		if cf.sections[section].has_key('cmds'):

Modified: trunk/tools/dconf/dconf.1.txt
===================================================================
--- trunk/tools/dconf/dconf.1.txt	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/dconf.1.txt	2005-09-02 11:13:38 UTC (rev 3545)
@@ -9,7 +9,7 @@
 
 SYNOPSIS
 --------
-dconf [-q] [-v] [-c config] [-o output] [-r root]
+dconf [-q] [-v] [-c config] [-o output]
 
 DESCRIPTION
 -----------
@@ -70,6 +70,14 @@
 For more arguments, see:::
 	http://orangecow.org/pythonet/sketches/argument.htm[]
 
+USAGE
+-----
+To create a snapshot of the current system:::
+	dconf
+
+To check the latest changes against the previous snapshot:::
+	zdiff -u /var/log/dconf/dconf-$HOSTNAME-previous.log.gz /var/log/dconf/dconf-$HOSTNAME-latest.log.gz
+
 ADDING FILES OR COMMANDS
 ------------------------
 You can add files and commands to /etc/dconf-custom.conf and include that from your /etc/dconf.conf, however I would appreciate if you send me any changes you make so that they can be include in the next version.

Modified: trunk/tools/dconf/dconf.spec
===================================================================
--- trunk/tools/dconf/dconf.spec	2005-08-31 04:55:31 UTC (rev 3544)
+++ trunk/tools/dconf/dconf.spec	2005-09-02 11:13:38 UTC (rev 3545)
@@ -4,7 +4,7 @@
 
 Summary: Create a system's hardware and software configuration snapshot
 Name: dconf
-Version: 0.4.3
+Version: 0.5.0
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -41,11 +41,8 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install install-redhat DESTDIR="%{buildroot}"
 
-### Install configfile for this distribution
-%{__install} -Dp -m0644 config/dconf-redhat.conf %{buildroot}%{_sysconfdir}/dconf.conf
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -59,8 +56,8 @@
 %{_localstatedir}/log/dconf/
 
 %changelog
-* Wed Jun 21 2005 Dag Wieers <dag at wieers.com> - 0.4.3-1
-- Updated to release 0.4.3.
+* Fri Sep 02 2005 Dag Wieers <dag at wieers.com> - 0.5.0-1
+- Updated to release 0.5.0.
 
 * Wed Jun 22 2005 Dag Wieers <dag at wieers.com> - 0.4.2-1
 - Updated to release 0.4.2.




More information about the commits mailing list