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

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu Jan 25 20:18:58 CET 2007


Author: dag
Date: 2007-01-25 20:18:57 +0100 (Thu, 25 Jan 2007)
New Revision: 5110

Added:
   trunk/tools/dconf/config/custom.conf
   trunk/tools/dconf/config/debian.conf
   trunk/tools/dconf/config/redhat.conf
   trunk/tools/dconf/config/suse.conf
   trunk/tools/dconf/docs/
   trunk/tools/dconf/docs/Makefile
   trunk/tools/dconf/docs/dconf.1.txt
Removed:
   trunk/tools/dconf/config/dconf-custom.conf
   trunk/tools/dconf/config/dconf-debian.conf
   trunk/tools/dconf/config/dconf-redhat.conf
   trunk/tools/dconf/config/dconf-suse.conf
   trunk/tools/dconf/dconf.1.txt
Modified:
   trunk/tools/dconf/ChangeLog
   trunk/tools/dconf/Makefile
   trunk/tools/dconf/TODO
   trunk/tools/dconf/config/dconf-example.conf
   trunk/tools/dconf/dconf
   trunk/tools/dconf/dconf.spec
Log:
Restructuring and added /etc/dconf.d directory.

Modified: trunk/tools/dconf/ChangeLog
===================================================================
--- trunk/tools/dconf/ChangeLog	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/ChangeLog	2007-01-25 19:18:57 UTC (rev 5110)
@@ -4,8 +4,8 @@
 - Improvements to firewall, hardware, kerberos, php, rsync, security and xinetd sections
 - Improved amavisd-new, ipsec, postfix, proftpd, squirrelmail, yum sections (Tuomo Soini)
 - Added awstats, heartbeat, l2tpd, ldirectord, ppp, proftpd, vsftpd, x2ltpd (Tuomo Soini)
+- Added /etc/dconf.d/ to allow configuration components to reside in seperate files (Gavin Carr)
 
->>>>>>> .r5051
 * 0.5.1 - Munchkin - release 30/07/2006
 - Fixed -q option to not require argument (Stelios Bounanos)
 - Syslog now has proper tag and pid associated

Modified: trunk/tools/dconf/Makefile
===================================================================
--- trunk/tools/dconf/Makefile	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/Makefile	2007-01-25 19:18:57 UTC (rev 5110)
@@ -16,41 +16,34 @@
 all:
 	@echo "Nothing to be build."
 
-install: dconf.1
-	-@[ ! -f $(DESTDIR)$(sysconfdir)/dconf-custom.conf ] && install -D -m0644 config/dconf-custom.conf $(DESTDIR)$(sysconfdir)/dconf-custom.conf
+install: docs
+	-@[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -D -m0644 config/dconf.conf $(DESTDIR)$(sysconfdir)/dconf.conf
 
 	install -Dp -m0755 dconf $(DESTDIR)$(bindir)/dconf
-	install -Dp -m0644 dconf.1 $(DESTDIR)$(mandir)/man1/dconf.1
-
 	install -dp -m0755 $(DESTDIR)$(logdir)
+
 	@echo "Also do: make install-<dist>   (with dist: debian|redhat|suse)"
 
+	make install -C docs
+
 install-redhat: install
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-redhat.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/redhat.conf ] && install -Dp -m0644 config/redhat.conf $(DESTDIR)$(sysconfdir)/dconf.d/redhat.conf
 
 install-debian: install
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-debian.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/debian.conf ] && install -Dp -m0644 config/debian.conf $(DESTDIR)$(sysconfdir)/dconf.d/debian.conf
 
 install-suse:
-	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-suse.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.d/suse.conf ] && install -Dp -m0644 config/suse.conf $(DESTDIR)$(sysconfdir)/dconf.d/suse.conf
 
-clean:
-	rm -f dconf.1 dconf.1.html dconf.1.xml
+docs:
+	make -C docs all
 
-%.html: %.txt
-	asciidoc -b xhtml11 -d manpage $<
+dist: docs
+	make -C docs dist
+	find . ! -path '*/.svn*' | pax -d -w -x ustar -s ',^.,$(name)-$(version),' | bzip2 >../$(name)-$(version).tar.bz2
 
-%.1: %.1.xml
-	xmlto man $<
-
-%.xml: %.txt
-	asciidoc -b docbook -d manpage $<
-
-dist: clean
-	find . ! -wholename '*/.svn*' | pax -d -w -x ustar -s ,^,$(name)-$(version)/, | bzip2 >../$(name)-$(version).tar.bz2
-
 rpm: dist
 	rpmbuild -tb --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_rpmdir ../" ../$(name)-$(version).tar.bz2
 
 srpm: dist
-	rpmbuild -ts --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_srcrpmdir../" ../$(name)-$(version).tar.bz2
+	rpmbuild -ts --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_srcrpmdir ../" ../$(name)-$(version).tar.bz2

Modified: trunk/tools/dconf/TODO
===================================================================
--- trunk/tools/dconf/TODO	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/TODO	2007-01-25 19:18:57 UTC (rev 5110)
@@ -49,6 +49,7 @@
 
 ### Documentation
 + Add general scenarios that make use of the dconf snapshots
++ Comply to PEP8: http://www.python.org/dev/peps/pep-0008/
 
 ### Bugs
 + Dconf needs a very recent python (2.3) with unified_diff support (for

Copied: trunk/tools/dconf/config/custom.conf (from rev 5109, trunk/tools/dconf/config/dconf-custom.conf)
===================================================================
--- trunk/tools/dconf/config/custom.conf	                        (rev 0)
+++ trunk/tools/dconf/config/custom.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,15 @@
+### Customized configuration
+###
+### Please send general improvements to this file to:
+###	Dag Wieers <dag at wieers.com>
+
+[main]
+cron = weekly
+#mailto = root at localhost
+#smtp-server = localhost
+
+[custom]
+files =	
+	/etc/rc.d/rc.custom
+	/etc/profile.d/custom.sh
+        /etc/sysconfig/network/if-*.d/custom

Deleted: trunk/tools/dconf/config/dconf-custom.conf
===================================================================
--- trunk/tools/dconf/config/dconf-custom.conf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/config/dconf-custom.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -1,15 +0,0 @@
-### Customized configuration
-###
-### Please send general improvements to this file to:
-###	Dag Wieers <dag at wieers.com>
-
-[main]
-cron = weekly
-#mailto = root at localhost
-#smtp-server = localhost
-
-[custom]
-files =	
-	/etc/rc.d/rc.custom
-	/etc/profile.d/custom.sh
-        /etc/sysconfig/network/if-*.d/custom

Deleted: trunk/tools/dconf/config/dconf-debian.conf
===================================================================
--- trunk/tools/dconf/config/dconf-debian.conf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/config/dconf-debian.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -1,357 +0,0 @@
-### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
-
-### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
-### Initial debian version: Leo Eraly <leo at kangaroot.net>
-### Main configuration
-[main]
-logdir = /var/log/dconf
-include = /etc/dconf-custom.conf
-
-### System information
-[apm]
-files =	/etc/apm/event.d/*
-	/etc/apm/resume.d/*
-	/etc/apm/suspemd.d/*
-
-[boot]
-files =
-	/etc/grub.conf
-	/etc/inittab
-	/etc/lilo.conf
-	/etc/modules
-	/proc/cmdline
-
-[dhcp]
-files =
-	/etc/dhclient.conf
-	/etc/dhclient-script
-	/etc/dhcpd.conf
-	/etc/pump.conf
-	/etc/default/dhcp
-
-[filesystems]
-cmds =
-	fdisk -l 2>/dev/null
-	sfdisk -l
-	df -h
-	mount
-files =
-	/etc/exports
-	/etc/raidtab
-	/etc/fstab
-	/proc/filesystems
-	/proc/mounts
-
-[firewall]
-cmds =
-	ebtables -L
-	ipchains -L -xnv
-	iptables-save
-	iptables -L -t filter -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-	iptables -L -t mangle -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-	iptables -L -t nat -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-files =
-	/etc/init.d/iptables
-	/etc/default/iptables
-	/proc/net/ip_conntrack
-	/proc/sys/net/ipv4/ip_*
-
-[ipsec]
-cmds = 
-	ipsec auto --status
-	
-files =
-	/etc/ipsec.conf
-	/etc/ipsec.d/*
-	/proc/net/ipsec_version
-
-[ipvs]
-cmds =	ipvsadm -L
-files =
-	/etc/sysconfig/ipvsadm
-	/etc/ipvsadm.rules
-
-[kernel]
-cmds =
-	ipcs -l
-	sysctl -e -p
-	dmesg
-files =	/etc/sysctl.conf
-
-[network]
-cmds =
-	ip addr
-	ip route
-### Too much noise
-#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-	route -n
-files =
-	/etc/host.conf
-	/etc/hosts
-	/etc/nsswitch.conf
-	/etc/resolv.conf
-	/etc/network/interfaces
-	/etc/network/if-down.d/*
-	/etc/network/if-post-down.d/*
-	/etc/network/if-pre-up.d/*
-	/etc/network/if-up.d/
-	/etc/network/ip-down.d/*
-	/etc/network/ip-up.d/*
-	/etc/network/options
-	/proc/net/dev
-#maybe another location for unix sockets?
-	/proc/net/unix
-
-[packages]
-cmds =
-	dpkg -l
-	dpkg --get-selections                                                                     
-
-[printer]
-files =
-	/etc/cups/cupsd.conf
-	/etc/cups/printers.conf
-	/etc/cups/client.conf
-	/etc/lpd.conf
-	/etc/printcap
-
-[root user]
-files =
-	/root/.Xresources
-	/root/.bash_logout
-	/root/.bash_profile
-	/root/.bashrc
-	/root/.cshrc
-	/root/.tcshrc
-
-[security]
-files =
-	/etc/group
-	/etc/gshadow
-	/etc/hosts.allow
-	/etc/hosts.deny
-	/etc/passwd
-	/etc/shadow
-	/etc/sudoers
-
-[services]
-dirs =	/etc/security
-files =
-	/etc/inetd.conf
-[shell]
-files =
-	/etc/bashrc
-	/etc/bash.bashrc
-	/etc/bash_completion
-	/etc/profile
-
-[system]
-cmds =	uname -a
-files =	/etc/debian_version
-
-### Hardware info
-[hardware]
-cmds =
-	dmidecode
-	lspci -v
-	lsusb -vv
-#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
-files =
-	/etc/modprobe.conf
-	/etc/modules.conf
-	/proc/cpuinfo
-	/proc/devices
-	/proc/dma
-	/proc/driver/nvram
-	/proc/ide/drivers
-	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
-	/proc/ide/piix
-	/proc/ide/via
-	/proc/iomem
-	/proc/mdstat
-	/proc/misc
-	/proc/modules
-	/proc/mtrr
-	/proc/ppc64/lparcfg
-	/proc/ppc64/rtas/poweron
-	/proc/ppc64/rtas/sensors
-	/proc/scsi
-	/proc/scsi/IBMchanger
-	/proc/scsi/IBMtape
-	/proc/swaps
-	/proc/tty/drivers
-
-dirs = /etc/modutils
-
-[amavisd-new]
-files =
-	/etc/amavis/amavisd.conf
-
-[apache]
-files =
-	/etc/apache/httpd.conf
-	/etc/apache/conf.d/*
-	
-[bind]
-files =
-	/etc/bind/named.conf
-	/etc/bind/rndc.key
-
-[clamav]
-files =
-	/etc/clamav/clamd.conf
-	/etc/clamav/clamav.conf
-	/etc/clamav/freshclam.conf
-
-[cron]
-files = /etc/crontab
-cmds =	crontab -l
-#	ls -l /etc/cron.*/
-
-dirs = 	/etc/cron.daily
-	/etc/cron.weekly
-	/etc/cron.hourly
-	/etc/cron.d
-
-[dconf]
-files =
-	/etc/dconf.conf
-	/etc/dconf-custom.conf
-
-[mysql]
-files = /etc/mysql/my.cnf
-	/etc/mysql/debian.cnf
-
-[nagios]
-files =
-	/etc/nagios/*.cfg
-
-[nfs]
-cmds =
-	exportfs
-	showmount -d
-	showmount -e
-files =
-	/etc/exports
-
-[nscd]
-files =	/etc/nscd.conf
-
-[ntp]
-files =
-	/etc/ntp.conf
-	/etc/ntp/keys
-	/etc/ntp/ntpservers
-	/etc/ntp/step-tickers
-	/etc/sysconfig/ntpd
-
-[openldap]
-files =
-# this ldap.conf is used for nss
-	/etc/ldap.conf
-# this is the openldap client conf
-	/etc/ldap/ldap.conf
-	/etc/ldap.secrets
-	/etc/ldap/slapd.conf
-#maybe the schema?
-
-[openssh]
-files =
-	/etc/ssh/shosts.equiv
-	/etc/ssh/ssh_config
-	/etc/ssh/sshd_config
-	/root/.ssh/authorized_keys2
-	/root/.ssh/sshd_config
-	/root/.ssh/sshd_config
-
-[php]
-files =
-	/etc/php4/apache/php.ini
-
-
-[postfix]
-files =
-	/etc/postfix/access
-	/etc/postfix/aliases
-	/etc/postfix/canonical
-	/etc/postfix/main.cf
-	/etc/postfix/master.cf
-	/etc/postfix/pcre_table
-	/etc/postfix/regexp_table
-	/etc/postfix/relocated
-	/etc/postfix/transport
-	/etc/postfix/virtual
-
-[proftpd]
-files =
-	/etc/ftpusers
-	/etc/proftpd.conf
-	/var/ftp/welcome.msg
-
-[qmail]
-cmds =	/var/qmail/bin/qmail-showctl
-dirs =
-	/var/qmail/alias/
-	/var/qmail/popboxes/
-	/var/qmail/users/
-	/var/qmail/control
-	
-[rsync]
-files =	/etc/rsyncd.conf
-
-[samba]
-files =
-	/etc/samba/smb.conf
-	/etc/samba/smbusers
-	/etc/samba/lmhosts
-	/etc/samba/smb.conf
-	/etc/samba/smbpasswd
-	/etc/samba/smbusers
-
-[sendmail]
-files =
-	/etc/aliases
-	/etc/mail/access
-	/etc/mail/domaintable
-	/etc/mail/local-host-names
-	/etc/mail/mailertable
-	/etc/mail/sendmail.mc
-	/etc/mail/submit.mc
-	/etc/mail/trusted-users
-	/etc/mail/virtusertable
-
-[smbldap]
-files =
-	/etc/smbldap-tools/smbldap.conf
-	/etc/smbldap-tools/smbldap_bind.conf
-
-[snort]
-files =
-	/etc/snort/*.config
-	/etc/sysconfig/snort
-
-[spamassassin]
-files =
-	/etc/spamassassin/*.cf
-	/etc/default/spamassassin
-	
-[squid]
-files =
-	/etc/squid/mime.conf
-	/etc/squid/msntauth.conf
-	/etc/squid/squid.conf
-
-[syslog]
-files =
-	/etc/syslog.conf
-
-[webalizer]
-files =	/etc/webalizer.conf
-
-[apt]
-files =	/etc/apt/sources.list
-dirs =	/etc/apt/apt.conf.d
-
-### Add your own customizations to /etc/dconf-custom.conf

Modified: trunk/tools/dconf/config/dconf-example.conf
===================================================================
--- trunk/tools/dconf/config/dconf-example.conf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/config/dconf-example.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -15,21 +15,21 @@
 ### A list of excluded files
 exclude = CVS CVS.adm RCS RCSLOG SCCS TAGS cvslog.* tags .make.state .nse_depinfo *~ #* .#* ,* _$* *$ *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb *.o *.lo *.la *.obj *.so *.exe *.Z *.elc *.ln core core.[0-9]* .svn *.rpmorig *.rpmnew *.rpmsave .DS_Store
 
-### Extra config files to include
-include = /etc/dconf-custom.conf
+## The location of the extra/custom config files
+confdir = /etc/dconf.d
 
 ### The location where to logfiles are stored
 logdir = /var/log/dconf
 
-### The list of email adresses to send changes to
+## You can have dconf send out change report mails
+# mailto = user at domain.com user2 at domain2.com
 mailto =
+mailfrom = dconf at hostname
+smtp-server = localhost
 
 ### The name of the (static) output file
 output =
 
-### The SMTP server to use for sending emails
-smtpserver = localhost
-
 ### Definition of configuration sections
 [title]
 cmds =

Deleted: trunk/tools/dconf/config/dconf-redhat.conf
===================================================================
--- trunk/tools/dconf/config/dconf-redhat.conf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/config/dconf-redhat.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -1,1030 +0,0 @@
-### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
-
-### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
-
-### Main configuration
-[main]
-logdir = /var/log/dconf
-include = /etc/dconf-custom.conf
-
-### System information
-[acpi]
-files =
-	/etc/logrotate.d/acpid
-	/etc/acpi/actions/*
-	/etc/acpi/events/*
-
-[apm]
-files =
-	/etc/sysconfig/apm-scripts/*
-	/etc/sysconfig/apmd
-
-[boot]
-files =
-	/etc/sysconfig/firstboot
-	/etc/sysconfig/i18n
-	/etc/sysconfig/init
-	/etc/grub.conf
-	/etc/initlog.conf
-	/etc/inittab
-	/etc/lilo.conf
-	/etc/rc.d/rc.local
-	/proc/cmdline
-
-[dhcp]
-files =
-	/etc/dhclient-*.conf
-	/etc/dhcpd.conf
-	/etc/pump.conf
-	/etc/sysconfig/dhcpd
-	/etc/sysconfig/dhcrelay
-
-[diskdump]
-files =
-	/etc/sysconfig/diskdump
-
-[fam]
-files =
-	/etc/fam.conf
-	/etc/xinetd.d/sgi_fam
-
-[filesystems]
-cmds =
-	fdisk -l 2>/dev/null
-	sfdisk -l
-	mount
-files =
-	/etc/exports
-	/etc/fstab
-	/proc/filesystems
-
-[firewall]
-cmds =
-	ebtables -L
-	ipchains -L -n
-	iptables -L -xn -t filter
-	iptables -L -xn -t mangle
-	iptables -L -xn -t nat
-files =
-	/etc/rc.d/rc.firewall
-	/etc/sysconfig/ipchains
-	/etc/sysconfig/iptables
-	/etc/sysconfig/iptables-config
-	/etc/sysconfig/ebtables.broute
-	/etc/sysconfig/ebtables.filter
-	/etc/sysconfig/ebtables.nat
-
-[fonts]
-files =
-	/etc/fonts/fonts.conf
-	/etc/fonts/local.conf
-
-[hal]
-files =
-	/etc/dbus-1/system.d/hal.conf
-	/etc/hal/hald.conf
-
-[iproute2]
-files =
-	/etc/iproute2/ematch_map
-	/etc/iproute2/rt_dsfield
-	/etc/iproute2/rt_protos
-	/etc/iproute2/rt_realms
-	/etc/iproute2/rt_scopes
-	/etc/iproute2/rt_tables
-
-[ipsec]
-files =
-	/etc/ipsec.conf
-	/etc/ipsec.secrets
-	/etc/ipsec.d/aacerts/*
-	/etc/ipsec.d/cacerts/*
-	/etc/ipsec.d/certs/*
-	/etc/ipsec.d/crls/*
-	/etc/ipsec.d/examples/*
-	/etc/ipsec.d/ocspcerts/*
-	/etc/ipsec.d/policies/*
-	/etc/ipsec.d/private/*
-	/etc/racoon/psk.txt
-	/etc/racoon/racoon.conf
-	/proc/net/ipsec_version
-
-[ipvs]
-cmds =	ipvsadm -L
-files =
-	/etc/sysconfig/ipvsadm
-	/etc/ipvsadm.rules
-
-[kerberos]
-files =
-	/etc/krb5.conf
-	/etc/krb.conf
-	/etc/krb.realms
-	/etc/xinetd.d/eklogin
-	/etc/xinetd.d/gssftp
-	/etc/xinetd.d/klogin
-	/etc/xinetd.d/krb5-telnet
-	/etc/xinetd.d/kshell
-
-[kernel]
-cmds =
-	ipcs -l
-#	sysctl -e -p
-#	sysctl -a -e | grep -vE '^(fs\.(dentry-state|inode-nr|inode-state)|kernel\.random\.(uuid|entropy_avail)) = '
-files =	/etc/sysctl.conf
-
-[ld.so]
-files =
-	/etc/ld.so.conf
-	/etc/ld.so.conf.d/*.conf
-
-[lsb]
-cmds = lsb_release -a
-
-[lvm]
-files = /etc/lvm/lvm.conf
-cmds =
-	lvdisplay
-	lvm dumpconfig
-	lvs
-	vgdisplay
-	vgs
-
-[mouse]
-file =
-	/etc/gpm-root.conf
-	/etc/sysconfig/mouse
-
-[network]
-cmds =
-	ip addr
-	ip route
-### Too much noise
-#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-	route -n
-files =
-	/etc/ethers
-	/etc/host.conf
-	/etc/hosts
-	/etc/networks
-	/etc/nsswitch.conf
-	/etc/resolv.conf
-	/etc/sysconfig/netplugd
-	/etc/sysconfig/network
-	/etc/sysconfig/network-scripts/ifcfg-*
-	/etc/sysconfig/network-scripts/keys-*
-	/etc/sysconfig/network-scripts/route-*
-	/etc/sysconfig/static-routes
-	/proc/net/bond0/info
-	/proc/net/bonding/bond0
-
-[packages]
-cmds =	rpm -qa --nodigest --nosignature | sort
-
-[pam]
-files =
-	/etc/pam.conf
-	/etc/pam.d/*
-
-[printer]
-files =
-	/etc/cups/*.conf
-	/etc/logrotate.d/cups
-	/etc/lpd.conf
-	/etc/lpd.perms
-	/etc/printcap
-	/etc/xinetd.d/cups-lpd
-
-[raid]
-files =
-	/etc/mdadm.conf
-	/etc/raidtab
-	/proc/mdstat
-
-[root user]
-files =
-	/root/.Xresources
-	/root/.bash_logout
-	/root/.bash_profile
-	/root/.bashrc
-	/root/.cshrc
-	/root/.tcshrc
-
-[rpm]
-files =
-	/etc/cron.daily/rpm
-	/etc/logrotate.d/rpm
-	/etc/rpm/macros
-
-[sasl]
-files = /etc/sysconfig/saslauthd
-
-[security]
-dirs =	/etc/security/
-files =
-	/etc/group
-	/etc/gshadow
-	/etc/hosts.allow
-	/etc/hosts.deny
-	/etc/op.conf
-	/etc/passwd
-	/etc/shadow
-	/etc/sudoers
-	/etc/sysconfig/system-config-securitylevel
-
-[services]
-cmds =	chkconfig --list
-files =
-	/etc/inetd.conf
-	/etc/sysconfig/identd
-
-[shell]
-files =
-	/etc/bashrc
-	/etc/skel/.*
-	/etc/profile
-	/etc/profile.d/*.{csh,sh}
-
-[system]
-cmds =	uname -a
-files =
-	/etc/issue
-	/etc/issue.net
-	/etc/redhat-release
-	/etc/sysconfig/prelink
-	/etc/sysconfig/rhn/rhnsd
-	/etc/sysconfig/rhn/sources
-	/etc/sysconfig/rhn/up2date
-	/etc/sysconfig/rhn/up2date-uuid
-
-[user management]
-files =	/etc/sysconfig/system-config-users
-
-### Hardware info
-[hardware]
-cmds =
-	dmidecode
-	lspci -v
-	lsusb -vv
-#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
-files =
-	/etc/cpuspeed.conf
-	/etc/hotplug/blacklist
-	/etc/hotswaprc
-	/etc/killpower
-	/etc/makedev.d/*
-	/etc/modprobe.conf
-	/etc/modules.conf
-	/etc/smartd.conf
-	/etc/sysconfig/bluetooth
-	/etc/sysconfig/clock
-	/etc/sysconfig/cpudynd
-	/etc/sysconfig/cpufreqd
-	/etc/sysconfig/devlabel
-	/etc/sysconfig/dund
-	/etc/sysconfig/harddisks
-	/etc/sysconfig/hidd
-	/etc/sysconfig/irda
-	/etc/sysconfig/irqbalance
-	/etc/sysconfig/isdncard
-	/etc/sysconfig/kudzu
-	/etc/sysconfig/lm_sensors
-	/etc/sysconfig/netdump
-	/etc/sysconfig/noflushd
-	/etc/sysconfig/pand
-	/etc/sysconfig/pcmcia
-	/etc/sysconfig/sensors
-	/etc/sysconfig/smartmontools
-	/etc/sysconfig/ups
-	/etc/ups/upsmon.conf
-	/proc/cpuinfo
-	/proc/devices
-	/proc/dma
-	/proc/driver/nvram
-	/proc/ide/drivers
-	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
-	/proc/ide/piix
-	/proc/ide/via
-	/proc/iomem
-	/proc/misc
-	/proc/modules
-	/proc/mtrr
-	/proc/ppc64/lparcfg
-	/proc/ppc64/rtas/poweron
-	/proc/ppc64/rtas/sensors
-	/proc/scsi
-	/proc/scsi/IBMchanger
-	/proc/scsi/IBMtape
-	/proc/swaps
-	/proc/tty/drivers
-
-[mpp]
-cmds =	mppUtil -V
-files =
-	/etc/mpp.conf
-	/var/mpp/devicemapping
-
-[qlogic]
-cmds =	/root/qla-autoconf -v
-files =
-	/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
-
-[aide]
-files =	/etc/aide.conf
-
-[amanda]
-files =
-	/etc/amandates
-	/var/lib/amanda/.amandahosts
-
-[amavisd-new]
-files =
-	/etc/amavisd.conf
-	/etc/amavis/amavisd.conf
-	/etc/cron.daily/amavisd
-	/etc/logrotate.d/amavisd
-	/etc/sysconfig/amavisd
-
-[anacron]
-files =
-	/etc/anacrontab
-	/etc/cron.daily/0anacron
-	/etc/cron.monthly/0anacron
-	/etc/cron.weekly/0anacron
-
-[apache]
-files =
-	/etc/httpd/conf/httpd.conf
-	/etc/httpd/conf.d/*
-	/etc/logrotate.d/httpd
-	/etc/sysconfig/httpd
-
-[apt]
-files =
-	/etc/apt/apt.conf
-	/etc/apt/apt.conf.d/*.conf
-	/etc/apt/preferences
-	/etc/apt/rpmpriorities
-	/etc/apt/sources.list
-	/etc/apt/sources.list.d/*.list
-	/etc/apt/vendors.list
-
-[arpwatch]
-files =
-	/etc/sysconfig/arpwatch
-	/var/arpwatch/arp.dat
-
-[at]
-files = /etc/at.deny
-
-[authd]
-files = /etc/ident.key
-
-[autofs]
-files =
-	/etc/auto.master
-	/etc/auto.misc
-	/etc/auto.net
-	/etc/sysconfig/autofs
-
-[automount]
-files =
-	/etc/amd.conf
-	/etc/amd.net
-	/etc/sysconfig/amd
-
-[autoupdate]
-files =
-	/etc/autoupdate.d/autoupdate.conf
-	/etc/autoupdate.d/*.{get,dld}
-
-[awstats]
-files =
-	/etc/awstats/*.conf
-	/etc/httpd/conf.d/awstats.conf
-
-[axfrdns]
-files =
-	/etc/axfrdns/env/*
-	/etc/axfrdns/run
-	/etc/axfrdns/tcp
-
-[bind]
-files =
-	/etc/named.conf
-	/etc/rndc.conf
-	/etc/rndc.key
-	/etc/logrotate.d/named
-	/etc/sysconfig/named
-	/var/named/chroot/etc/named.conf
-
-[cdrecord]
-files = /etc/cdrecord.conf
-
-[clamav]
-files =
-	/etc/clamd.conf
-	/etc/cron.daily/freshclam
-	/etc/freshclam.conf
-	/etc/logrotate.d/clamav
-	/etc/logrotate.d/freshclam
-	/etc/sysconfig/clamav-milter
-
-[cpu]
-files = /etc/cpu.conf
-
-[cron]
-cmds =	crontab -l
-#	ls -l /etc/cron.*/
-files =
-	/etc/crontab
-	/etc/sysconfig/crond
-
-[dante]
-files =
-	/etc/logrotate.d/sockd
-	/etc/sockd.conf
-	/etc/socks.conf
-
-[dar]
-files = /etc/dar/dar.conf
-
-[dconf]
-files =
-	/etc/dconf.conf
-	/etc/dconf-custom.conf
-
-[dillo]
-files =
-	/etc/dillorc
-	/etc/dpidrc
-
-[distcache]
-files =
-	/etc/sysconfig/distcache
-
-[distcc]
-files =
-	/etc/logrotate.d/distccd
-	/etc/sysconfig/distccd
-	/etc/xinetd.d/distccd
-
-[dnscache]
-files =
-	/etc/dnscache/run
-	/etc/dnscache/env/*
-	/etc/dnscache/root/*
-
-[dnsmasq]
-files = /etc/dnsmasq.conf
-
-[dosbox]
-files = /etc/dosbox.conf
-
-[dovecot]
-files =	/etc/dovecot.conf
-
-[drbd]
-files = /etc/drbd.conf
-
-[dwall firewall]
-files =
-	/etc/dwall/alias.conf
-	/etc/dwall/chains/*
-	/etc/dwall/dwall.conf
-	/etc/dwall/firewall
-	/etc/dwall/scripts/*.sh
-	/etc/dwall/services/*
-	/etc/dwall/zone.conf
-	/etc/logrotate.d/dwall
-
-[esound]
-files = /etc/esd.conf
-
-[ettercap]
-files = /etc/etter.conf
-
-[evms]
-files = /etc/evms.conf
-
-[exim]
-files =
-	/etc/exim/exim.conf
-	/etc/logrotate.d/exim
-	/etc/sysconfig/exim
-
-[fish]
-files =
-	/etc/fish
-	/etc/fish.d/*.fish
-	/etc/fish_inputrc
-
-[fragroute]
-files =
-	/etc/fragroute.conf
-
-[gammu]
-files =
-	/etc/gammurc
-
-[gnokii]
-files =	/etc/gnokiirc
-
-[hammerhead]
-dirs = /etc/hammerhead/
-
-[heartbeat]
-files =
-	/etc/ha.d/ha.cf
-	/etc/ha.d/haresources
-	/etc/ha.d/authkeys
-	/etc/ha.d/route.d/*
-
-[ldirectord]
-files =
-	/etc/ha.d/ldirectord.cf
-	/etc/ha.d/conf/*
-
-[hercules]
-dirs = /etc/hercules/
-
-[hylafax]
-files =
-	/etc/hfaxd.conf
-	/etc/hosts.hfaxd
-	/etc/hyla.conf
-	/etc/faxmail.conf
-	/var/spool/fax/etc/dialrules
-	/var/spool/fax/etc/setup.cache
-	/var/spool/fax/etc/config.*
-
-[john]
-files = /etc/john.ini
-
-[keepalived]
-files =	/etc/keepalived/keepalived.conf
-
-[kismet]
-files =
-	/etc/kismet.conf
-	/etc/kismet_drone.conf
-	/etc/kismet_ui.conf
-
-[l2tpd]
-files =
-	/etc/l2tpd/l2tp-secrets
-	/etc/l2tpd/l2tpd.conf
-	/etc/ppp/options.l2tpd
-
-[laus]
-dirs = /etc/audit/
-
-[lftp]
-files = /etc/lftp.conf
-
-[ltsp]
-files =
-	/etc/ltsp.conf
-	/opt/ltsp/*/etc/lts.conf
-
-[mirror]
-files =	/etc/mirror.conf
-
-[mon]
-files =
-	/etc/mon/auto.cf
-	/etc/mon/mon.cf
-	/etc/mon/userfile
-
-[monit]
-files =	/etc/monit.conf
-
-[mplayerplug-in]
-files =
-	/etc/mplayerplug-in.conf
-	/etc/mplayerplug-in.types
-
-[mrtg]
-files =
-	/etc/cron.d/mrtg
-
-[mysql]
-files = /etc/my.cnf
-
-[nagios]
-files =
-	/etc/httpd/conf.d/nagios
-	/etc/nagios/*.cfg
-
-[nfs]
-cmds =
-	exportfs
-	showmount -d
-	showmount -e
-	wire-test
-files =
-	/etc/exports
-	/etc/gssapi_mech.conf
-	/etc/idmapd.conf
-	/etc/sysconfig/nfs
-
-[nscd]
-files =	/etc/nscd.conf
-
-[ntp]
-files =
-	/etc/ntp.conf
-	/etc/ntp/keys
-	/etc/ntp/ntpservers
-	/etc/ntp/step-tickers
-	/etc/sysconfig/ntpd
-
-[op]
-files =
-	/etc/op.conf
-	/etc/op.d/*.conf
-
-[openldap]
-files =
-	/etc/ldap.conf
-	/etc/ldap.secrets
-	/etc/openldap/ldap.conf
-	/etc/openldap/ldapfilter.conf
-	/etc/openldap/ldapsearchprefs.conf
-	/etc/openldap/ldaptemplates.conf
-	/etc/openldap/slapd.conf
-	/etc/openldap/ud.conf
-	/etc/sysconfig/ldap
-
-[openntpd]
-files = /etc/ntpd.conf
-
-[openssh]
-files =
-	/etc/ssh/shosts.equiv
-	/etc/ssh/ssh_config
-	/etc/ssh/sshd_config
-	/etc/sysconfig/sshd
-	/root/.ssh/authorized_keys
-	/root/.ssh/sshd_config
-	/root/.ssh/sshd_config
-
-[p0f]
-files =	/etc/sysconfig/p0f
-
-[partimaged]
-files =
-	/etc/partimaged/partimagedusers
-	/etc/sysconfig/partimaged
-
-[pearpc]
-files =	/etc/ppc.conf
-
-[pen]
-files =	/etc/httpd/conf.d/pen.conf
-
-[php]
-files =
-	/etc/httpd/conf.d/php.conf
-	/etc/pear.conf
-	/etc/php.ini
-	/etc/php.d/*.ini
-
-[pine]
-files =
-	/etc/pine.conf
-	/etc/pine.conf.fixed
-
-[portmap]
-files = /etc/sysconfig/portmap
-
-[postfix]
-files =
-	/etc/pam.d/smtp.postfix
-	/etc/postfix/access
-	/etc/postfix/aliases
-	/etc/postfix/canonical
-	/etc/postfix/generic
-	/etc/postfix/header_checks
-	/etc/postfix/main.cf
-	/etc/postfix/makedefs.out
-	/etc/postfix/master.cf
-	/etc/postfix/mx_access
-	/etc/postfix/pcre_table
-	/etc/postfix/regexp_table
-	/etc/postfix/relocated
-	/etc/postfix/sasl_passwd
-	/etc/postfix/tls_per_site
-	/etc/postfix/transport
-	/etc/postfix/virtual
-	/usr/lib/sasl/smtpd.conf
-	/usr/lib/sasl2/smtpd.conf
-
-[postgresql]
-files = 
-	/var/lib/pgsql/data/pg_hba.conf
-	/var/lib/pgsql/data/pg_ident.conf
-	/var/lib/pgsql/data/postgresql.conf
-	/var/lib/pgsql/data/postmaster.opts
-	/var/lib/pgsql/data/server.key
-	/var/lib/pgsql/data/server.crt
-	/var/lib/pgsql/data/root.crt
-
-[ppp]
-files =
-	/etc/ppp/chap-secrets
-	/etc/ppp/options
-	/etc/ppp/pap-secrets
-
-[prelink]
-files =
-	/etc/prelink.conf
-	/etc/sysconfig/prelink
-
-[proftpd]
-files =
-	/etc/ftpusers
-	/etc/logrotate.d/proftpd
-	/etc/proftpd.conf
-	/etc/proftpd.ftpusers
-	/etc/proftpd/proftpd.conf
-	/var/ftp/welcome.msg
-
-[qmail]
-cmds =	/var/qmail/bin/qmail-showctl
-dirs =
-	/var/qmail/alias/
-	/var/qmail/popboxes/
-	/var/qmail/users/
-
-[rpc]
-cmds =	pmap_dump
-files =	/etc/rpc
-
-[rsct]
-cmds =
-	lsclcfg
-	lscomg
-	for i in \\$(seq 1 9); do lscomg -i CG\\$i; done
-	lscondition
-	lsnodeid
-	lsrsrc
-	lssrc -ls cthags
-	lsrpdomain
-	lsrpnode
-	lssrc -a
-files =
-	/var/ct/cfg/clusters
-	/var/ct/cfg/ct_node_id
-	/var/ct/cfg/ctsec.nodeinfo
-	/var/ct/cfg/ctrmc.acls
-	/var/ct/cfg/current_cluster
-	
-[rsync]
-files =
-	/etc/rsyncd.conf
-	/etc/xinetd.d/rsync
-
-[samba]
-files =
-	/etc/lmhosts
-	/etc/MACHINE.SID
-	/etc/smb.conf
-	/etc/smbusers
-	/etc/samba/lmhosts
-	/etc/samba/smb.conf
-	/etc/samba/smbpasswd
-	/etc/samba/smbusers
-	/etc/sysconfig/samba
-
-[sendmail]
-files =
-	/etc/aliases
-	/etc/mail/access
-	/etc/mail/domaintable
-	/etc/mail/local-host-names
-	/etc/mail/mailertable
-	/etc/mail/sendmail.mc
-	/etc/mail/submit.mc
-	/etc/mail/trusted-users
-	/etc/mail/virtusertable
-	/etc/sysconfig/sendmail
-
-[shorewall]
-files = /etc/shorewall/*
-
-[slocate]
-files =
-	/etc/cron.daily/slocate.cron
-	/etc/updatedb.conf
-
-[smbldap]
-files =
-	/etc/smbldap-tools/smbldap.conf
-	/etc/smbldap-tools/smbldap_bind.conf
-
-[smunge]
-files =	/etc/sysconfig/smunged
-
-[snort]
-files =
-	/etc/snort/*.config
-	/etc/sysconfig/snort
-
-[spamassassin]
-files =
-	/etc/sysconfig/spamassassin
-	/etc/mail/spamassassin/*.cf
-
-[speechd]
-files =
-	/etc/speechd.sub
-	/etc/speechdrc
-
-[squid]
-files =
-	/etc/squid/mime.conf
-	/etc/squid/msntauth.conf
-	/etc/squid/squid.conf
-	/etc/sysconfig/squid
-
-[squidguard]
-dirs =	/etc/squid/local/
-files =
-	/etc/squid/squidguard.conf
-	/etc/squid/squidguard-blacklists.conf
-
-[squirrelmail]
-files =
-	/etc/httpd/conf.d/squirrelmail.conf
-	/etc/squirrelmail/config.php
-	/etc/squirrelmail/config_local.php
-
-[syslog]
-files =
-	/etc/sysconfig/syslog
-	/etc/syslog.conf
-
-[syslog-ng]
-files =
-	/etc/logrotate.d/syslog
-	/etc/syslog-ng/syslog-ng.conf
-
-[sysstat]
-files =
-	/etc/cron.d/sysstat
-	/etc/sysconfig/sysstat
-
-[tinydns]
-files =
-	/etc/tinydns/run
-	/etc/tinydns/env/*
-	/etc/tinydns/root/data
-
-[tpb]
-files =	/etc/tpbrc
-
-[tsocks]
-files =	/etc/tsocks.conf
-
-[ucarp]
-files = /etc/sysconfig/carp/*
-
-[vsftpd]
-files =
-	/etc/vsftpd.ftpusers
-	/etc/vsftpd.user_list
-	/etc/vsftpd/vsftpd.conf
-	/etc/logrotate.d/vsftpd.log
-
-[vtund]
-files =	/etc/vtund.conf
-
-[webalizer]
-files =
-	/etc/cron.daily/00webalizer
-	/etc/webalizer.conf
-
-[webmin]
-files =
-	/etc/sysconfig/daemons/webmin
-	/etc/webmin/config
-
-[wuftpd]
-files =
-	/etc/ftpaccess
-	/etc/ftpconversions
-	/etc/ftpgroups
-	/etc/ftphosts
-	/etc/ftpservers
-	/etc/ftpusers
-
-[xinetd]
-files =
-	/etc/sysconfig/xinetd
-	/etc/xinetd.conf
-	/etc/xinetd.d/chargen*
-	/etc/xinetd.d/daytime*
-	/etc/xinetd.d/echo*
-	/etc/xinetd.d/services
-	/etc/xinetd.d/time*
-
-[xl2tpd]
-files =
-	/etc/xl2tpd/l2tp-secrets
-	/etc/xl2tpd/xl2tpd.conf
-	/etc/ppp/options.xl2tpd
-
-[yam]
-files =
-	/etc/cron.daily/yam
-	/etc/httpd/conf.d/yam.conf
-	/etc/sysconfig/yam
-	/etc/yam.conf
-	/var/yam/*/systemid
-
-[yp]
-cmds =	ypwhich
-dirs =	/var/yp/
-files =
-	/etc/yp.conf
-	/var/yp/nicknames
-
-[yum]
-files =
-	/etc/yum.conf
-	/etc/yum.repos.d/*.repo
-	/etc/yum/repos.d/*.repo
-	/etc/yum/pluginconf.d/*
-
-### Proprietary software
-[gpfs]
-cmds =	
-	/usr/lpp/mmfs/bin/mmgetstate -aL
-#	/usr/lpp/mmfs/bin/mmfsadm dump config
-	/usr/lpp/mmfs/bin/mmlscluster
-	/usr/lpp/mmfs/bin/mmlsconfig
-	/usr/lpp/mmfs/bin/mmlsmgr 2>/dev/null
-	/usr/lpp/mmfs/bin/mmlsnode -a
-	/usr/lpp/mmfs/bin/mmlsnsd
-files =
-	/etc/cluster.nodes
-	/etc/profile.d/mmfs.sh
-	/proc/fs/gpfs/version
-	/var/mmfs/etc/cluster.preferences
-	/var/mmfs/etc/mmfs.cfg
-	/var/mmfs/etc/*.scr
-	/var/mmfs/etc/nsddevices
-	/var/mmfs/gen/mmfsNodeData
-	/var/mmfs/gen/mmsdrfs
-
-[netiq]
-files =
-	/etc/rc.d/init.d/nqmdaemon
-	/usr/netiq/UnixAgent/etc/mo_version.map
-	/usr/netiq/UnixAgent/etc/nqmumomapping.xml
-	/usr/netiq/UnixAgent/etc/uaconf.xml
-	/usr/netiq/UnixAgent/data/Config_1/NqmComms.xml
-	/usr/netiq/UnixAgent/log/SilentInstall.ini
-
-[powerbroker]
-files =
-	/etc/xinetd.d/pbguid
-	/etc/xinetd.d/pblocald
-	/etc/xinetd.d/pblogd
-	/etc/xinetd.d/pbmasterd
-	/etc/xinetd.d/pbsguid
-	/etc/pb.key
-	/etc/pb.settings
-
-[tsm]
-files =
-	/etc/logrotate.d/tsm
-	/etc/profile.d/tsm.sh
-	/etc/rc.d/init.d/tsm
-	/etc/sysconfig/tsm
-	/opt/tivoli/tsm/client/ba/bin/dsm.opt
-	/opt/tivoli/tsm/client/ba/bin/dsm.sys
-	/opt/tivoli/tsm/client/ba/bin/inclexcl
-
-[vas-client]
-files =
-	/etc/opt/vas/.licenses/license.txt
-	/etc/opt/vas/access.d/*
-	/etc/opt/vas/users.allow
-	/etc/opt/vas/users.deny
-	/etc/opt/vas/vas.conf
-
-### Add your own customizations to /etc/dconf-custom.conf

Deleted: trunk/tools/dconf/config/dconf-suse.conf
===================================================================
--- trunk/tools/dconf/config/dconf-suse.conf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/config/dconf-suse.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -1,639 +0,0 @@
-### Changes to this file may get lost when upgrading dconf
-### Customizations should go into /etc/dconf-custom.conf
-
-### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
-
-### Main configuration
-[main]
-logdir = /var/log/dconf
-include = /etc/dconf-custom.conf
-
-### System information
-[apm]
-files =	/etc/sysconfig/apmd
-
-[boot]
-files =
-	/boot/grub/menu.lst
-	/etc/inittab
-	/etc/lilo.conf
-	/etc/rc.d/boot.local
-	/etc/sysconfig/boot
-	/etc/sysconfig/bootloader
-	/etc/sysconfig/bootsplash
-	/proc/cmdline
-
-[dhcp]
-files =
-	/etc/dhclient-*.conf
-	/etc/dhcpd.conf
-	/etc/pump.conf
-	/etc/sysconfig/dhcpd
-
-[filesystems]
-cmds =
-	fdisk -l 2>/dev/null
-	mount
-files =
-	/etc/exports
-	/etc/fstab
-	/proc/filesystems
-
-[firewall]
-cmds =
-	ebtables -L
-	ipchains -L -xnv
-	iptables -L -t filter -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-	iptables -L -t mangle -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-	iptables -L -t nat -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
-files =
-	/etc/rc.d/rc.firewall
-	/etc/sysconfig/ipchains
-	/etc/sysconfig/iptables-config
-
-[ipsec]
-files =
-	/etc/ipsec.conf
-	/proc/net/ipsec_version
-
-[ipvs]
-cmds =	ipvsadm -L
-files =
-	/etc/sysconfig/ipvsadm
-	/etc/ipvsadm.rules
-
-[kernel]
-cmds =
-	ipcs -l
-	sysctl -e -p
-files =
-	/etc/sysctl.conf
-	/etc/sysconfig/kernel
-	/etc/sysconfig/sysctl
-
-[lsb]
-cmds =
-	lsb_release -a
-
-[network]
-cmds =
-	ip addr
-	ip route
-#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
-	route -n
-files =
-	/etc/ethers
-	/etc/host.conf
-	/etc/hosts
-	/etc/networks
-	/etc/nsswitch.conf
-	/etc/resolv.conf
-	/etc/sysconfig/network/config
-	/etc/sysconfig/network/dhcp
-	/etc/sysconfig/network/ifcfg-*
-	/etc/sysconfig/network/routes
-	/etc/sysconfig/network/wireless
-	/proc/net/bond0/info
-	/proc/net/bonding/bond0
-
-[packages]
-cmds =	rpm -qa --nodigest --nosignature | sort -f
-
-[printer]
-files =
-	/etc/cups/cupsd.conf
-	/etc/cups/printers.conf
-	/etc/lpd.conf
-	/etc/lpd.perms
-	/etc/printcap
-	/etc/sysconfig/cups
-
-[root user]
-files =
-	/root/.Xresources
-	/root/.bash_logout
-	/root/.bash_profile
-	/root/.bashrc
-	/root/.cshrc
-	/root/.tcshrc
-
-[security]
-files =
-	/etc/group
-	/etc/gshadow
-	/etc/hosts.allow
-	/etc/hosts.deny
-	/etc/op.conf
-	/etc/passwd
-	/etc/shadow
-	/etc/sudoers
-	/etc/sysconfig/system-config-securitylevel
-
-[services]
-cmds =	chkconfig --list
-dirs =	/etc/security
-files =
-	/etc/inetd.conf
-	/etc/sysconfig/identd
-	/etc/xinetd.conf
-
-[shell]
-files =
-	/etc/bashrc
-	/etc/profile
-
-[system]
-cmds =	uname -a
-files =
-	/etc/suseservers
-	/etc/sysconfig/onlineupdate
-	/etc/sysconfig/suseconfig
-	/etc/sysconfig/susehelp
-
-[user management]
-files =	/etc/sysconfig/system-config-users
-
-### Hardware info
-[hardware]
-cmds =
-	dmidecode
-	lspci -v
-	lsusb -vv
-#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
-files =
-	/etc/modprobe.conf
-	/etc/modules.conf
-	/etc/sysconfig/autofs
-	/etc/sysconfig/ide
-	/etc/sysconfig/hotplug
-	/etc/sysconfig/joystick
-	/etc/sysconfig/netdump
-	/etc/sysconfig/noflushd
-	/etc/sysconfig/pcmcia
-	/etc/sysconfig/kudzu
-	/proc/cpuinfo
-	/proc/devices
-	/proc/dma
-	/proc/driver/nvram
-	/proc/ide/drivers
-	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
-	/proc/ide/piix
-	/proc/ide/via
-	/proc/iomem
-	/proc/mdstat
-	/proc/misc
-	/proc/modules
-	/proc/mtrr
-	/proc/ppc64/lparcfg
-	/proc/ppc64/rtas/poweron
-	/proc/ppc64/rtas/sensors
-	/proc/scsi
-	/proc/scsi/IBMchanger
-	/proc/scsi/IBMtape
-	/proc/swaps
-	/proc/tty/drivers
-
-[mpp]
-cmds =	mppUtil -V
-files =
-	/etc/mpp.conf
-	/var/mpp/devicemapping
-
-[qlogic]
-cmds =	/root/qla-autoconf -v
-files =
-	/etc/qla2300.conf
-	/proc/scsi/qla2300/? | grep -v -i -E '(number| reqs| free count) '
-
-### Software tools
-[afick]
-files = /etc/afick.conf
-
-[aide]
-files =	/etc/aide.conf
-
-[amanda]
-files =
-	/etc/amandates
-	/var/lib/amanda/.amandahosts
-
-[amavisd-new]
-files =
-	/etc/amavisd.conf
-	/etc/sysconfig/amavisd
-
-[apache]
-files =
-	/etc/httpd/conf/httpd.conf
-	/etc/httpd/conf.d/*
-	/etc/sysconfig/apache
-
-[arpwatch]
-files =
-	/etc/sysconfig/arpwatch
-	/var/arpwatch/arp.dat
-
-[autofs]
-files =
-	/etc/auto.master
-	/etc/autofs.conf
-
-[bind]
-files =
-	/etc/named.conf
-	/etc/rndc.conf
-	/etc/rndc.key
-	/etc/sysconfig/named
-	/var/named/chroot/etc/named.conf
-
-[clamav]
-files =
-	/etc/clamd.conf
-	/etc/freshclam.conf
-	/etc/sysconfig/clamav-milter
-
-[cron]
-files =
-	/etc/crontab
-	/etc/sysconfig/cron
-cmds =	crontab -l
-#	ls -l /etc/cron.*/
-
-[dante]
-files =
-	/etc/sockd.conf
-	/etc/socks.conf
-
-[dar]
-files = /etc/dar/dar.conf
-
-[dconf]
-files =
-	/etc/dconf.conf
-	/etc/dconf-custom.conf
-
-[distcc]
-files = /etc/sysconfig/distccd
-
-[dnsmasq]
-files = /etc/dnsmasq.conf
-
-[dovecot]
-files =	/etc/dovecot.conf
-
-[drbd]
-files = /etc/drbd.conf
-
-[dwall firewall]
-files =
-	/etc/dwall/alias.conf
-	/etc/dwall/chains/*
-	/etc/dwall/dwall.conf
-	/etc/dwall/firewall
-	/etc/dwall/scripts/*
-	/etc/dwall/zone.conf
-
-[gnokii]
-files =	/etc/gnokiirc
-
-[gpfs]
-cmds =	
-	/usr/lpp/mmfs/bin/mmgetstate -aL
-#	/usr/lpp/mmfs/bin/mmfsadm dump config
-	/usr/lpp/mmfs/bin/mmlscluster
-	/usr/lpp/mmfs/bin/mmlsconfig
-	/usr/lpp/mmfs/bin/mmlsmgr 2>/dev/null
-	/usr/lpp/mmfs/bin/mmlsnode -a
-	/usr/lpp/mmfs/bin/mmlsnsd
-files =
-	/etc/cluster.nodes
-	/etc/profile.d/mmfs.sh
-	/proc/fs/gpfs/version
-	/var/mmfs/etc/cluster.preferences
-	/var/mmfs/etc/mmfs.cfg
-	/var/mmfs/etc/mmfsdown.scr
-	/var/mmfs/etc/mmfsup.scr
-	/var/mmfs/etc/nsddevices
-	/var/mmfs/gen/mmfsNodeData
-	/var/mmfs/gen/mmsdrfs
-
-[hammerhead]
-dirs = /etc/hammerhead/
-
-[hercules]
-dirs = /etc/hercules/
-
-[hylafax]
-files =
-	/etc/hfaxd.conf
-	/etc/hosts.hfaxd
-	/etc/hyla.conf
-	/etc/faxmail.conf
-	/var/spool/fax/etc/dialrules
-	/var/spool/fax/etc/setup.cache
-	/var/spool/fax/etc/config.*
-
-[keepalived]
-files =	/etc/keepalived/keepalived.conf
-
-[kismet]
-files =
-	/etc/kismet.conf
-	/etc/kismet_drone.conf
-	/etc/kismet_ui.conf
-
-[laus]
-dirs = /etc/audit/
-
-[lftp]
-files = /etc/lftp.conf
-
-[ltsp]
-files =
-	/etc/ltsp.conf
-	/opt/ltsp/*/etc/lts.conf
-
-[mirror]
-files =	/etc/mirror.conf
-
-[mon]
-files =
-	/etc/mon/auto.cf
-	/etc/mon/mon.cf
-	/etc/mon/userfile
-
-[monit]
-files =	/etc/monit.conf
-
-[mplayerplug-in]
-files =
-	/etc/mplayerplug-in.conf
-	/etc/mplayerplug-in.types
-
-[mysql]
-files = /etc/my.cnf
-
-[nagios]
-files =
-	/etc/httpd/conf.d/nagios
-	/etc/nagios/*.cfg
-
-[nfs]
-cmds =
-	exportfs
-	showmount -d
-	showmount -e
-files =
-	/etc/exports
-	/etc/sysconfig/nfs
-
-[nscd]
-files =	/etc/nscd.conf
-
-[ntp]
-files =
-	/etc/ntp.conf
-	/etc/sysconfig/xntp
-
-[openldap]
-files =
-	/etc/ldap.conf
-	/etc/ldap.secrets
-	/etc/openldap/ldap.conf
-	/etc/openldap/ldapfilter.conf
-	/etc/openldap/ldapsearchprefs.conf
-	/etc/openldap/ldaptemplates.conf
-	/etc/openldap/slapd.conf
-	/etc/openldap/ud.conf
-	/etc/sysconfig/ldap
-	/etc/sysconfig/openldap
-
-[openssh]
-files =
-	/etc/ssh/shosts.equiv
-	/etc/ssh/ssh_config
-	/etc/ssh/sshd_config
-	/root/.ssh/authorized_keys
-	/root/.ssh/sshd_config
-	/root/.ssh/sshd_config
-
-[p0f]
-files =	/etc/sysconfig/p0f
-
-[partimaged]
-files =
-	/etc/partimaged/partimagedusers
-	/etc/sysconfig/partimaged
-
-[pearpc]
-files =	/etc/ppc.conf
-
-[pen]
-files =	/etc/httpd/conf.d/pen.conf
-
-[php]
-files =
-	/etc/httpd/conf.d/php.conf
-	/etc/pear.conf
-	/etc/php.ini
-
-[pine]
-files =
-	/etc/pine.conf
-	/etc/pine.conf.fixed
-
-[postfix]
-files =
-	/etc/postfix/access
-	/etc/postfix/aliases
-	/etc/postfix/canonical
-	/etc/postfix/main.cf
-	/etc/postfix/master.cf
-	/etc/postfix/pcre_table
-	/etc/postfix/regexp_table
-	/etc/postfix/relocated
-	/etc/postfix/transport
-	/etc/postfix/virtual
-	/etc/sysconfig/postfix
-	/usr/lib/sasl/smtpd.conf
-	/usr/lib/sasl2/smtpd.conf
-
-[prelink]
-files =
-	/etc/prelink.conf
-	/etc/sysconfig/prelink
-
-[proftpd]
-files =
-	/etc/ftpusers
-	/etc/proftpd.conf
-	/var/ftp/welcome.msg
-
-[qmail]
-cmds =	/var/qmail/bin/qmail-showctl
-dirs =
-	/var/qmail/alias/
-	/var/qmail/popboxes/
-	/var/qmail/users/
-
-[rpc]
-files =
-	/etc/rpc
-	pmap_dump
-
-[rsct]
-cmds =
-	lsclcfg
-	lscomg
-	for i in \\$(seq 1 9); do lscomg -i CG\\$i; done
-	lscondition
-	lsnodeid
-	lsrsrc
-	lssrc -ls cthags
-	lsrpdomain
-	lsrpnode
-	lssrc -a
-files =
-	/var/ct/cfg/clusters
-	/var/ct/cfg/ct_node_id
-	/var/ct/cfg/ctsec.nodeinfo
-	/var/ct/cfg/ctrmc.acls
-	/var/ct/cfg/current_cluster
-	
-[rsync]
-files =	/etc/rsyncd.conf
-
-[samba]
-files =
-	/etc/lmhosts
-	/etc/MACHINE.SID
-	/etc/smb.conf
-	/etc/smbusers
-	/etc/samba/lmhosts
-	/etc/samba/smb.conf
-	/etc/samba/smbpasswd
-	/etc/samba/smbusers
-	/etc/sysconfig/samba
-
-[sendmail]
-files =
-	/etc/aliases
-	/etc/mail/access
-	/etc/mail/domaintable
-	/etc/mail/local-host-names
-	/etc/mail/mailertable
-	/etc/mail/sendmail.mc
-	/etc/mail/submit.mc
-	/etc/mail/trusted-users
-	/etc/mail/virtusertable
-	/etc/sysconfig/sendmail
-
-[smbldap]
-files =
-	/etc/smbldap-tools/smbldap.conf
-	/etc/smbldap-tools/smbldap_bind.conf
-
-[smunge]
-files =	/etc/sysconfig/smunged
-
-[snort]
-files =
-	/etc/snort/*.config
-	/etc/sysconfig/snort
-
-[spamassassin]
-files =
-	/etc/sysconfig/spamassassin
-	/etc/mail/spamassassin/*.cf
-
-[speechd]
-files =
-	/etc/speechd.sub
-	/etc/speechdrc
-
-[squid]
-files =
-	/etc/squid/mime.conf
-	/etc/squid/msntauth.conf
-	/etc/squid/squid.conf
-	/etc/sysconfig/squid
-
-[squidguard]
-dirs =	/etc/squid/local/
-files =
-	/etc/squid/squidguard.conf
-	/etc/squid/squidguard-blacklists.conf
-
-[squirrelmail]
-files =
-	/etc/httpd/conf.d/squirrelmail.conf
-	/etc/squirrelmail/config.php
-
-[syslog]
-files =
-	/etc/sysconfig/syslog
-	/etc/syslog.conf
-
-[sysstat]
-files =	/etc/sysconfig/sysstat
-
-[tpb]
-files =	/etc/tpbrc
-
-[tsm]
-files =
-	/etc/adsm/dsm.sys
-	/etc/adsm/dsm.opt
-	/etc/adsm/inclexcl.conf
-	/etc/adsm/inclexcl.lst
-
-[tsocks]
-files =	/etc/tsocks.conf
-
-[ucarp]
-dirs =	/etc/sysconfig/carp/
-
-[vtund]
-files =	/etc/vtund.conf
-
-[webalizer]
-files =	/etc/webalizer.conf
-
-[webmin]
-files =
-	/etc/sysconfig/daemons/webmin
-	/etc/webmin/config
-
-[wuftpd]
-files =
-	/etc/ftpaccess
-	/etc/ftpconversions
-	/etc/ftpgroups
-	/etc/ftphosts
-	/etc/ftpservers
-	/etc/ftpusers
-
-[xinetd]
-files =
-	/etc/sysconfig/xinetd
-#	/etc/xinetd.d/*
-
-[yam]
-files =
-	/etc/httpd/conf.d/yam.conf
-	/etc/yam.conf
-
-[yp]
-cmds =	ypwhich
-dirs =	/var/yp/
-files =
-	/etc/sysconfig/ypbind
-	/etc/sysconfig/ypserv
-	/etc/yp.conf
-	/var/yp/nicknames
-
-[yum]
-files =	/etc/yum.conf
-
-### Add your own customizations to /etc/dconf-custom.conf

Copied: trunk/tools/dconf/config/debian.conf (from rev 5109, trunk/tools/dconf/config/dconf-debian.conf)
===================================================================
--- trunk/tools/dconf/config/debian.conf	                        (rev 0)
+++ trunk/tools/dconf/config/debian.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,357 @@
+### Changes to this file may get lost when upgrading dconf
+### Customizations should go into /etc/dconf-custom.conf
+
+### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
+### Initial debian version: Leo Eraly <leo at kangaroot.net>
+### Main configuration
+[main]
+logdir = /var/log/dconf
+confdir = /etc/dconf.d
+
+### System information
+[apm]
+files =	/etc/apm/event.d/*
+	/etc/apm/resume.d/*
+	/etc/apm/suspemd.d/*
+
+[boot]
+files =
+	/etc/grub.conf
+	/etc/inittab
+	/etc/lilo.conf
+	/etc/modules
+	/proc/cmdline
+
+[dhcp]
+files =
+	/etc/dhclient.conf
+	/etc/dhclient-script
+	/etc/dhcpd.conf
+	/etc/pump.conf
+	/etc/default/dhcp
+
+[filesystems]
+cmds =
+	fdisk -l 2>/dev/null
+	sfdisk -l
+	df -h
+	mount
+files =
+	/etc/exports
+	/etc/raidtab
+	/etc/fstab
+	/proc/filesystems
+	/proc/mounts
+
+[firewall]
+cmds =
+	ebtables -L
+	ipchains -L -xnv
+	iptables-save
+	iptables -L -t filter -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+	iptables -L -t mangle -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+	iptables -L -t nat -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+files =
+	/etc/init.d/iptables
+	/etc/default/iptables
+	/proc/net/ip_conntrack
+	/proc/sys/net/ipv4/ip_*
+
+[ipsec]
+cmds = 
+	ipsec auto --status
+	
+files =
+	/etc/ipsec.conf
+	/etc/ipsec.d/*
+	/proc/net/ipsec_version
+
+[ipvs]
+cmds =	ipvsadm -L
+files =
+	/etc/sysconfig/ipvsadm
+	/etc/ipvsadm.rules
+
+[kernel]
+cmds =
+	ipcs -l
+	sysctl -e -p
+	dmesg
+files =	/etc/sysctl.conf
+
+[network]
+cmds =
+	ip addr
+	ip route
+### Too much noise
+#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+	route -n
+files =
+	/etc/host.conf
+	/etc/hosts
+	/etc/nsswitch.conf
+	/etc/resolv.conf
+	/etc/network/interfaces
+	/etc/network/if-down.d/*
+	/etc/network/if-post-down.d/*
+	/etc/network/if-pre-up.d/*
+	/etc/network/if-up.d/
+	/etc/network/ip-down.d/*
+	/etc/network/ip-up.d/*
+	/etc/network/options
+	/proc/net/dev
+#maybe another location for unix sockets?
+	/proc/net/unix
+
+[packages]
+cmds =
+	dpkg -l
+	dpkg --get-selections                                                                     
+
+[printer]
+files =
+	/etc/cups/cupsd.conf
+	/etc/cups/printers.conf
+	/etc/cups/client.conf
+	/etc/lpd.conf
+	/etc/printcap
+
+[root user]
+files =
+	/root/.Xresources
+	/root/.bash_logout
+	/root/.bash_profile
+	/root/.bashrc
+	/root/.cshrc
+	/root/.tcshrc
+
+[security]
+files =
+	/etc/group
+	/etc/gshadow
+	/etc/hosts.allow
+	/etc/hosts.deny
+	/etc/passwd
+	/etc/shadow
+	/etc/sudoers
+
+[services]
+dirs =	/etc/security
+files =
+	/etc/inetd.conf
+[shell]
+files =
+	/etc/bashrc
+	/etc/bash.bashrc
+	/etc/bash_completion
+	/etc/profile
+
+[system]
+cmds =	uname -a
+files =	/etc/debian_version
+
+### Hardware info
+[hardware]
+cmds =
+	dmidecode
+	lspci -v
+	lsusb -vv
+#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
+files =
+	/etc/modprobe.conf
+	/etc/modules.conf
+	/proc/cpuinfo
+	/proc/devices
+	/proc/dma
+	/proc/driver/nvram
+	/proc/ide/drivers
+	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
+	/proc/ide/piix
+	/proc/ide/via
+	/proc/iomem
+	/proc/mdstat
+	/proc/misc
+	/proc/modules
+	/proc/mtrr
+	/proc/ppc64/lparcfg
+	/proc/ppc64/rtas/poweron
+	/proc/ppc64/rtas/sensors
+	/proc/scsi
+	/proc/scsi/IBMchanger
+	/proc/scsi/IBMtape
+	/proc/swaps
+	/proc/tty/drivers
+
+dirs = /etc/modutils
+
+[amavisd-new]
+files =
+	/etc/amavis/amavisd.conf
+
+[apache]
+files =
+	/etc/apache/httpd.conf
+	/etc/apache/conf.d/*
+	
+[bind]
+files =
+	/etc/bind/named.conf
+	/etc/bind/rndc.key
+
+[clamav]
+files =
+	/etc/clamav/clamd.conf
+	/etc/clamav/clamav.conf
+	/etc/clamav/freshclam.conf
+
+[cron]
+files = /etc/crontab
+cmds =	crontab -l
+#	ls -l /etc/cron.*/
+
+dirs = 	/etc/cron.daily
+	/etc/cron.weekly
+	/etc/cron.hourly
+	/etc/cron.d
+
+[dconf]
+files =
+	/etc/dconf.conf
+	/etc/dconf-custom.conf
+
+[mysql]
+files = /etc/mysql/my.cnf
+	/etc/mysql/debian.cnf
+
+[nagios]
+files =
+	/etc/nagios/*.cfg
+
+[nfs]
+cmds =
+	exportfs
+	showmount -d
+	showmount -e
+files =
+	/etc/exports
+
+[nscd]
+files =	/etc/nscd.conf
+
+[ntp]
+files =
+	/etc/ntp.conf
+	/etc/ntp/keys
+	/etc/ntp/ntpservers
+	/etc/ntp/step-tickers
+	/etc/sysconfig/ntpd
+
+[openldap]
+files =
+# this ldap.conf is used for nss
+	/etc/ldap.conf
+# this is the openldap client conf
+	/etc/ldap/ldap.conf
+	/etc/ldap.secrets
+	/etc/ldap/slapd.conf
+#maybe the schema?
+
+[openssh]
+files =
+	/etc/ssh/shosts.equiv
+	/etc/ssh/ssh_config
+	/etc/ssh/sshd_config
+	/root/.ssh/authorized_keys2
+	/root/.ssh/sshd_config
+	/root/.ssh/sshd_config
+
+[php]
+files =
+	/etc/php4/apache/php.ini
+
+
+[postfix]
+files =
+	/etc/postfix/access
+	/etc/postfix/aliases
+	/etc/postfix/canonical
+	/etc/postfix/main.cf
+	/etc/postfix/master.cf
+	/etc/postfix/pcre_table
+	/etc/postfix/regexp_table
+	/etc/postfix/relocated
+	/etc/postfix/transport
+	/etc/postfix/virtual
+
+[proftpd]
+files =
+	/etc/ftpusers
+	/etc/proftpd.conf
+	/var/ftp/welcome.msg
+
+[qmail]
+cmds =	/var/qmail/bin/qmail-showctl
+dirs =
+	/var/qmail/alias/
+	/var/qmail/popboxes/
+	/var/qmail/users/
+	/var/qmail/control
+	
+[rsync]
+files =	/etc/rsyncd.conf
+
+[samba]
+files =
+	/etc/samba/smb.conf
+	/etc/samba/smbusers
+	/etc/samba/lmhosts
+	/etc/samba/smb.conf
+	/etc/samba/smbpasswd
+	/etc/samba/smbusers
+
+[sendmail]
+files =
+	/etc/aliases
+	/etc/mail/access
+	/etc/mail/domaintable
+	/etc/mail/local-host-names
+	/etc/mail/mailertable
+	/etc/mail/sendmail.mc
+	/etc/mail/submit.mc
+	/etc/mail/trusted-users
+	/etc/mail/virtusertable
+
+[smbldap]
+files =
+	/etc/smbldap-tools/smbldap.conf
+	/etc/smbldap-tools/smbldap_bind.conf
+
+[snort]
+files =
+	/etc/snort/*.config
+	/etc/sysconfig/snort
+
+[spamassassin]
+files =
+	/etc/spamassassin/*.cf
+	/etc/default/spamassassin
+	
+[squid]
+files =
+	/etc/squid/mime.conf
+	/etc/squid/msntauth.conf
+	/etc/squid/squid.conf
+
+[syslog]
+files =
+	/etc/syslog.conf
+
+[webalizer]
+files =	/etc/webalizer.conf
+
+[apt]
+files =	/etc/apt/sources.list
+dirs =	/etc/apt/apt.conf.d
+
+### Add your own customizations to /etc/dconf-custom.conf

Copied: trunk/tools/dconf/config/redhat.conf (from rev 5109, trunk/tools/dconf/config/dconf-redhat.conf)
===================================================================
--- trunk/tools/dconf/config/redhat.conf	                        (rev 0)
+++ trunk/tools/dconf/config/redhat.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,1031 @@
+### Changes to this file may get lost when upgrading dconf
+### Customizations should go into /etc/dconf-custom.conf
+
+### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
+
+### Main configuration
+[main]
+logdir = /var/log/dconf
+confdir = /etc/dconf.d
+
+### System information
+[acpi]
+files =
+	/etc/logrotate.d/acpid
+	/etc/acpi/actions/*
+	/etc/acpi/events/*
+
+[apm]
+files =
+	/etc/sysconfig/apm-scripts/*
+	/etc/sysconfig/apmd
+
+[boot]
+files =
+	/etc/sysconfig/firstboot
+	/etc/sysconfig/i18n
+	/etc/sysconfig/init
+	/etc/grub.conf
+	/etc/initlog.conf
+	/etc/inittab
+	/etc/lilo.conf
+	/etc/rc.d/rc.local
+	/proc/cmdline
+
+[dhcp]
+files =
+	/etc/dhclient-*.conf
+	/etc/dhcpd.conf
+	/etc/pump.conf
+	/etc/sysconfig/dhcpd
+	/etc/sysconfig/dhcrelay
+
+[diskdump]
+files =
+	/etc/sysconfig/diskdump
+
+[fam]
+files =
+	/etc/fam.conf
+	/etc/xinetd.d/sgi_fam
+
+[filesystems]
+cmds =
+	fdisk -l 2>/dev/null
+	sfdisk -l
+	mount
+files =
+	/etc/exports
+	/etc/fstab
+	/proc/filesystems
+
+[firewall]
+cmds =
+	ebtables -L
+	ipchains -L -n
+	iptables -L -xn -t filter
+	iptables -L -xn -t mangle
+	iptables -L -xn -t nat
+files =
+	/etc/rc.d/rc.firewall
+	/etc/sysconfig/ipchains
+	/etc/sysconfig/iptables
+	/etc/sysconfig/iptables-config
+	/etc/sysconfig/ebtables.broute
+	/etc/sysconfig/ebtables.filter
+	/etc/sysconfig/ebtables.nat
+
+[fonts]
+files =
+	/etc/fonts/fonts.conf
+	/etc/fonts/local.conf
+
+[hal]
+files =
+	/etc/dbus-1/system.d/hal.conf
+	/etc/hal/hald.conf
+
+[iproute2]
+files =
+	/etc/iproute2/ematch_map
+	/etc/iproute2/rt_dsfield
+	/etc/iproute2/rt_protos
+	/etc/iproute2/rt_realms
+	/etc/iproute2/rt_scopes
+	/etc/iproute2/rt_tables
+
+[ipsec]
+files =
+	/etc/ipsec.conf
+	/etc/ipsec.secrets
+	/etc/ipsec.d/aacerts/*
+	/etc/ipsec.d/cacerts/*
+	/etc/ipsec.d/certs/*
+	/etc/ipsec.d/crls/*
+	/etc/ipsec.d/examples/*
+	/etc/ipsec.d/ocspcerts/*
+	/etc/ipsec.d/policies/*
+	/etc/ipsec.d/private/*
+	/etc/racoon/psk.txt
+	/etc/racoon/racoon.conf
+	/proc/net/ipsec_version
+
+[ipvs]
+cmds =	ipvsadm -L
+files =
+	/etc/sysconfig/ipvsadm
+	/etc/ipvsadm.rules
+
+[kerberos]
+files =
+	/etc/krb5.conf
+	/etc/krb.conf
+	/etc/krb.realms
+	/etc/xinetd.d/eklogin
+	/etc/xinetd.d/gssftp
+	/etc/xinetd.d/klogin
+	/etc/xinetd.d/krb5-telnet
+	/etc/xinetd.d/kshell
+
+[kernel]
+cmds =
+	ipcs -l
+#	sysctl -e -p
+#	sysctl -a -e | grep -vE '^(fs\.(dentry-state|inode-nr|inode-state)|kernel\.random\.(uuid|entropy_avail)) = '
+files =	/etc/sysctl.conf
+
+[ld.so]
+files =
+	/etc/ld.so.conf
+	/etc/ld.so.conf.d/*.conf
+
+[lsb]
+cmds = lsb_release -a
+
+[lvm]
+files = /etc/lvm/lvm.conf
+cmds =
+	lvdisplay
+	lvm dumpconfig
+	lvs
+	vgdisplay
+	vgs
+
+[mouse]
+file =
+	/etc/gpm-root.conf
+	/etc/sysconfig/mouse
+
+[network]
+cmds =
+	ip addr
+	ip route
+### Too much noise
+#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+	route -n
+files =
+	/etc/ethers
+	/etc/host.conf
+	/etc/hosts
+	/etc/networks
+	/etc/nsswitch.conf
+	/etc/resolv.conf
+	/etc/sysconfig/netplugd
+	/etc/sysconfig/network
+	/etc/sysconfig/network-scripts/ifcfg-*
+	/etc/sysconfig/network-scripts/keys-*
+	/etc/sysconfig/network-scripts/route-*
+	/etc/sysconfig/static-routes
+	/proc/net/bond0/info
+	/proc/net/bonding/bond0
+
+[packages]
+cmds =	rpm -qa --nodigest --nosignature | sort
+
+[pam]
+files =
+	/etc/pam.conf
+	/etc/pam.d/*
+
+[printer]
+files =
+	/etc/cups/*.conf
+	/etc/logrotate.d/cups
+	/etc/lpd.conf
+	/etc/lpd.perms
+	/etc/printcap
+	/etc/xinetd.d/cups-lpd
+
+[raid]
+files =
+	/etc/mdadm.conf
+	/etc/raidtab
+	/proc/mdstat
+
+[root user]
+files =
+	/root/.Xresources
+	/root/.bash_logout
+	/root/.bash_profile
+	/root/.bashrc
+	/root/.cshrc
+	/root/.tcshrc
+
+[rpm]
+files =
+	/etc/cron.daily/rpm
+	/etc/logrotate.d/rpm
+	/etc/rpm/macros
+
+[sasl]
+files = /etc/sysconfig/saslauthd
+
+[security]
+dirs =	/etc/security/
+files =
+	/etc/group
+	/etc/gshadow
+	/etc/hosts.allow
+	/etc/hosts.deny
+	/etc/op.conf
+	/etc/passwd
+	/etc/shadow
+	/etc/sudoers
+	/etc/sysconfig/system-config-securitylevel
+
+[services]
+cmds =	chkconfig --list
+files =
+	/etc/inetd.conf
+	/etc/sysconfig/identd
+
+[shell]
+files =
+	/etc/bashrc
+	/etc/skel/.*
+	/etc/profile
+	/etc/profile.d/*.{csh,sh}
+
+[system]
+cmds =	uname -a
+files =
+	/etc/issue
+	/etc/issue.net
+	/etc/redhat-release
+	/etc/sysconfig/prelink
+	/etc/sysconfig/rhn/rhnsd
+	/etc/sysconfig/rhn/sources
+	/etc/sysconfig/rhn/up2date
+	/etc/sysconfig/rhn/up2date-uuid
+
+[user management]
+files =	/etc/sysconfig/system-config-users
+
+### Hardware info
+[hardware]
+cmds =
+	cpuid
+	dmidecode
+	lspci -v
+	lsusb -vv
+#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
+files =
+	/etc/cpuspeed.conf
+	/etc/hotplug/blacklist
+	/etc/hotswaprc
+	/etc/killpower
+	/etc/makedev.d/*
+	/etc/modprobe.conf
+	/etc/modules.conf
+	/etc/smartd.conf
+	/etc/sysconfig/bluetooth
+	/etc/sysconfig/clock
+	/etc/sysconfig/cpudynd
+	/etc/sysconfig/cpufreqd
+	/etc/sysconfig/devlabel
+	/etc/sysconfig/dund
+	/etc/sysconfig/harddisks
+	/etc/sysconfig/hidd
+	/etc/sysconfig/irda
+	/etc/sysconfig/irqbalance
+	/etc/sysconfig/isdncard
+	/etc/sysconfig/kudzu
+	/etc/sysconfig/lm_sensors
+	/etc/sysconfig/netdump
+	/etc/sysconfig/noflushd
+	/etc/sysconfig/pand
+	/etc/sysconfig/pcmcia
+	/etc/sysconfig/sensors
+	/etc/sysconfig/smartmontools
+	/etc/sysconfig/ups
+	/etc/ups/upsmon.conf
+	/proc/cpuinfo
+	/proc/devices
+	/proc/dma
+	/proc/driver/nvram
+	/proc/ide/drivers
+	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
+	/proc/ide/piix
+	/proc/ide/via
+	/proc/iomem
+	/proc/misc
+	/proc/modules
+	/proc/mtrr
+	/proc/ppc64/lparcfg
+	/proc/ppc64/rtas/poweron
+	/proc/ppc64/rtas/sensors
+	/proc/scsi
+	/proc/scsi/IBMchanger
+	/proc/scsi/IBMtape
+	/proc/swaps
+	/proc/tty/drivers
+
+[mpp]
+cmds =	mppUtil -V
+files =
+	/etc/mpp.conf
+	/var/mpp/devicemapping
+
+[qlogic]
+cmds =	/root/qla-autoconf -v
+files =
+	/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
+
+[aide]
+files =	/etc/aide.conf
+
+[amanda]
+files =
+	/etc/amandates
+	/var/lib/amanda/.amandahosts
+
+[amavisd-new]
+files =
+	/etc/amavisd.conf
+	/etc/amavis/amavisd.conf
+	/etc/cron.daily/amavisd
+	/etc/logrotate.d/amavisd
+	/etc/sysconfig/amavisd
+
+[anacron]
+files =
+	/etc/anacrontab
+	/etc/cron.daily/0anacron
+	/etc/cron.monthly/0anacron
+	/etc/cron.weekly/0anacron
+
+[apache]
+files =
+	/etc/httpd/conf/httpd.conf
+	/etc/httpd/conf.d/*
+	/etc/logrotate.d/httpd
+	/etc/sysconfig/httpd
+
+[apt]
+files =
+	/etc/apt/apt.conf
+	/etc/apt/apt.conf.d/*.conf
+	/etc/apt/preferences
+	/etc/apt/rpmpriorities
+	/etc/apt/sources.list
+	/etc/apt/sources.list.d/*.list
+	/etc/apt/vendors.list
+
+[arpwatch]
+files =
+	/etc/sysconfig/arpwatch
+	/var/arpwatch/arp.dat
+
+[at]
+files = /etc/at.deny
+
+[authd]
+files = /etc/ident.key
+
+[autofs]
+files =
+	/etc/auto.master
+	/etc/auto.misc
+	/etc/auto.net
+	/etc/sysconfig/autofs
+
+[automount]
+files =
+	/etc/amd.conf
+	/etc/amd.net
+	/etc/sysconfig/amd
+
+[autoupdate]
+files =
+	/etc/autoupdate.d/autoupdate.conf
+	/etc/autoupdate.d/*.{get,dld}
+
+[awstats]
+files =
+	/etc/awstats/*.conf
+	/etc/httpd/conf.d/awstats.conf
+
+[axfrdns]
+files =
+	/etc/axfrdns/env/*
+	/etc/axfrdns/run
+	/etc/axfrdns/tcp
+
+[bind]
+files =
+	/etc/named.conf
+	/etc/rndc.conf
+	/etc/rndc.key
+	/etc/logrotate.d/named
+	/etc/sysconfig/named
+	/var/named/chroot/etc/named.conf
+
+[cdrecord]
+files = /etc/cdrecord.conf
+
+[clamav]
+files =
+	/etc/clamd.conf
+	/etc/cron.daily/freshclam
+	/etc/freshclam.conf
+	/etc/logrotate.d/clamav
+	/etc/logrotate.d/freshclam
+	/etc/sysconfig/clamav-milter
+
+[cpu]
+files = /etc/cpu.conf
+
+[cron]
+cmds =	crontab -l
+#	ls -l /etc/cron.*/
+files =
+	/etc/crontab
+	/etc/sysconfig/crond
+
+[dante]
+files =
+	/etc/logrotate.d/sockd
+	/etc/sockd.conf
+	/etc/socks.conf
+
+[dar]
+files = /etc/dar/dar.conf
+
+[dconf]
+files =
+	/etc/dconf.conf
+	/etc/dconf-custom.conf
+
+[dillo]
+files =
+	/etc/dillorc
+	/etc/dpidrc
+
+[distcache]
+files =
+	/etc/sysconfig/distcache
+
+[distcc]
+files =
+	/etc/logrotate.d/distccd
+	/etc/sysconfig/distccd
+	/etc/xinetd.d/distccd
+
+[dnscache]
+files =
+	/etc/dnscache/run
+	/etc/dnscache/env/*
+	/etc/dnscache/root/*
+
+[dnsmasq]
+files = /etc/dnsmasq.conf
+
+[dosbox]
+files = /etc/dosbox.conf
+
+[dovecot]
+files =	/etc/dovecot.conf
+
+[drbd]
+files = /etc/drbd.conf
+
+[dwall firewall]
+files =
+	/etc/dwall/alias.conf
+	/etc/dwall/chains/*
+	/etc/dwall/dwall.conf
+	/etc/dwall/firewall
+	/etc/dwall/scripts/*.sh
+	/etc/dwall/services/*
+	/etc/dwall/zone.conf
+	/etc/logrotate.d/dwall
+
+[esound]
+files = /etc/esd.conf
+
+[ettercap]
+files = /etc/etter.conf
+
+[evms]
+files = /etc/evms.conf
+
+[exim]
+files =
+	/etc/exim/exim.conf
+	/etc/logrotate.d/exim
+	/etc/sysconfig/exim
+
+[fish]
+files =
+	/etc/fish
+	/etc/fish.d/*.fish
+	/etc/fish_inputrc
+
+[fragroute]
+files =
+	/etc/fragroute.conf
+
+[gammu]
+files =
+	/etc/gammurc
+
+[gnokii]
+files =	/etc/gnokiirc
+
+[hammerhead]
+dirs = /etc/hammerhead/
+
+[heartbeat]
+files =
+	/etc/ha.d/ha.cf
+	/etc/ha.d/haresources
+	/etc/ha.d/authkeys
+	/etc/ha.d/route.d/*
+
+[ldirectord]
+files =
+	/etc/ha.d/ldirectord.cf
+	/etc/ha.d/conf/*
+
+[hercules]
+dirs = /etc/hercules/
+
+[hylafax]
+files =
+	/etc/hfaxd.conf
+	/etc/hosts.hfaxd
+	/etc/hyla.conf
+	/etc/faxmail.conf
+	/var/spool/fax/etc/dialrules
+	/var/spool/fax/etc/setup.cache
+	/var/spool/fax/etc/config.*
+
+[john]
+files = /etc/john.ini
+
+[keepalived]
+files =	/etc/keepalived/keepalived.conf
+
+[kismet]
+files =
+	/etc/kismet.conf
+	/etc/kismet_drone.conf
+	/etc/kismet_ui.conf
+
+[l2tpd]
+files =
+	/etc/l2tpd/l2tp-secrets
+	/etc/l2tpd/l2tpd.conf
+	/etc/ppp/options.l2tpd
+
+[laus]
+dirs = /etc/audit/
+
+[lftp]
+files = /etc/lftp.conf
+
+[ltsp]
+files =
+	/etc/ltsp.conf
+	/opt/ltsp/*/etc/lts.conf
+
+[mirror]
+files =	/etc/mirror.conf
+
+[mon]
+files =
+	/etc/mon/auto.cf
+	/etc/mon/mon.cf
+	/etc/mon/userfile
+
+[monit]
+files =	/etc/monit.conf
+
+[mplayerplug-in]
+files =
+	/etc/mplayerplug-in.conf
+	/etc/mplayerplug-in.types
+
+[mrtg]
+files =
+	/etc/cron.d/mrtg
+
+[mysql]
+files = /etc/my.cnf
+
+[nagios]
+files =
+	/etc/httpd/conf.d/nagios
+	/etc/nagios/*.cfg
+
+[nfs]
+cmds =
+	exportfs
+	showmount -d
+	showmount -e
+	wire-test
+files =
+	/etc/exports
+	/etc/gssapi_mech.conf
+	/etc/idmapd.conf
+	/etc/sysconfig/nfs
+
+[nscd]
+files =	/etc/nscd.conf
+
+[ntp]
+files =
+	/etc/ntp.conf
+	/etc/ntp/keys
+	/etc/ntp/ntpservers
+	/etc/ntp/step-tickers
+	/etc/sysconfig/ntpd
+
+[op]
+files =
+	/etc/op.conf
+	/etc/op.d/*.conf
+
+[openldap]
+files =
+	/etc/ldap.conf
+	/etc/ldap.secrets
+	/etc/openldap/ldap.conf
+	/etc/openldap/ldapfilter.conf
+	/etc/openldap/ldapsearchprefs.conf
+	/etc/openldap/ldaptemplates.conf
+	/etc/openldap/slapd.conf
+	/etc/openldap/ud.conf
+	/etc/sysconfig/ldap
+
+[openntpd]
+files = /etc/ntpd.conf
+
+[openssh]
+files =
+	/etc/ssh/shosts.equiv
+	/etc/ssh/ssh_config
+	/etc/ssh/sshd_config
+	/etc/sysconfig/sshd
+	/root/.ssh/authorized_keys
+	/root/.ssh/sshd_config
+	/root/.ssh/sshd_config
+
+[p0f]
+files =	/etc/sysconfig/p0f
+
+[partimaged]
+files =
+	/etc/partimaged/partimagedusers
+	/etc/sysconfig/partimaged
+
+[pearpc]
+files =	/etc/ppc.conf
+
+[pen]
+files =	/etc/httpd/conf.d/pen.conf
+
+[php]
+files =
+	/etc/httpd/conf.d/php.conf
+	/etc/pear.conf
+	/etc/php.ini
+	/etc/php.d/*.ini
+
+[pine]
+files =
+	/etc/pine.conf
+	/etc/pine.conf.fixed
+
+[portmap]
+files = /etc/sysconfig/portmap
+
+[postfix]
+files =
+	/etc/pam.d/smtp.postfix
+	/etc/postfix/access
+	/etc/postfix/aliases
+	/etc/postfix/canonical
+	/etc/postfix/generic
+	/etc/postfix/header_checks
+	/etc/postfix/main.cf
+	/etc/postfix/makedefs.out
+	/etc/postfix/master.cf
+	/etc/postfix/mx_access
+	/etc/postfix/pcre_table
+	/etc/postfix/regexp_table
+	/etc/postfix/relocated
+	/etc/postfix/sasl_passwd
+	/etc/postfix/tls_per_site
+	/etc/postfix/transport
+	/etc/postfix/virtual
+	/usr/lib/sasl/smtpd.conf
+	/usr/lib/sasl2/smtpd.conf
+
+[postgresql]
+files = 
+	/var/lib/pgsql/data/pg_hba.conf
+	/var/lib/pgsql/data/pg_ident.conf
+	/var/lib/pgsql/data/postgresql.conf
+	/var/lib/pgsql/data/postmaster.opts
+	/var/lib/pgsql/data/server.key
+	/var/lib/pgsql/data/server.crt
+	/var/lib/pgsql/data/root.crt
+
+[ppp]
+files =
+	/etc/ppp/chap-secrets
+	/etc/ppp/options
+	/etc/ppp/pap-secrets
+
+[prelink]
+files =
+	/etc/prelink.conf
+	/etc/sysconfig/prelink
+
+[proftpd]
+files =
+	/etc/ftpusers
+	/etc/logrotate.d/proftpd
+	/etc/proftpd.conf
+	/etc/proftpd.ftpusers
+	/etc/proftpd/proftpd.conf
+	/var/ftp/welcome.msg
+
+[qmail]
+cmds =	/var/qmail/bin/qmail-showctl
+dirs =
+	/var/qmail/alias/
+	/var/qmail/popboxes/
+	/var/qmail/users/
+
+[rpc]
+cmds =	pmap_dump
+files =	/etc/rpc
+
+[rsct]
+cmds =
+	lsclcfg
+	lscomg
+	for i in \\$(seq 1 9); do lscomg -i CG\\$i; done
+	lscondition
+	lsnodeid
+	lsrsrc
+	lssrc -ls cthags
+	lsrpdomain
+	lsrpnode
+	lssrc -a
+files =
+	/var/ct/cfg/clusters
+	/var/ct/cfg/ct_node_id
+	/var/ct/cfg/ctsec.nodeinfo
+	/var/ct/cfg/ctrmc.acls
+	/var/ct/cfg/current_cluster
+	
+[rsync]
+files =
+	/etc/rsyncd.conf
+	/etc/xinetd.d/rsync
+
+[samba]
+files =
+	/etc/lmhosts
+	/etc/MACHINE.SID
+	/etc/smb.conf
+	/etc/smbusers
+	/etc/samba/lmhosts
+	/etc/samba/smb.conf
+	/etc/samba/smbpasswd
+	/etc/samba/smbusers
+	/etc/sysconfig/samba
+
+[sendmail]
+files =
+	/etc/aliases
+	/etc/mail/access
+	/etc/mail/domaintable
+	/etc/mail/local-host-names
+	/etc/mail/mailertable
+	/etc/mail/sendmail.mc
+	/etc/mail/submit.mc
+	/etc/mail/trusted-users
+	/etc/mail/virtusertable
+	/etc/sysconfig/sendmail
+
+[shorewall]
+files = /etc/shorewall/*
+
+[slocate]
+files =
+	/etc/cron.daily/slocate.cron
+	/etc/updatedb.conf
+
+[smbldap]
+files =
+	/etc/smbldap-tools/smbldap.conf
+	/etc/smbldap-tools/smbldap_bind.conf
+
+[smunge]
+files =	/etc/sysconfig/smunged
+
+[snort]
+files =
+	/etc/snort/*.config
+	/etc/sysconfig/snort
+
+[spamassassin]
+files =
+	/etc/sysconfig/spamassassin
+	/etc/mail/spamassassin/*.cf
+
+[speechd]
+files =
+	/etc/speechd.sub
+	/etc/speechdrc
+
+[squid]
+files =
+	/etc/squid/mime.conf
+	/etc/squid/msntauth.conf
+	/etc/squid/squid.conf
+	/etc/sysconfig/squid
+
+[squidguard]
+dirs =	/etc/squid/local/
+files =
+	/etc/squid/squidguard.conf
+	/etc/squid/squidguard-blacklists.conf
+
+[squirrelmail]
+files =
+	/etc/httpd/conf.d/squirrelmail.conf
+	/etc/squirrelmail/config.php
+	/etc/squirrelmail/config_local.php
+
+[syslog]
+files =
+	/etc/sysconfig/syslog
+	/etc/syslog.conf
+
+[syslog-ng]
+files =
+	/etc/logrotate.d/syslog
+	/etc/syslog-ng/syslog-ng.conf
+
+[sysstat]
+files =
+	/etc/cron.d/sysstat
+	/etc/sysconfig/sysstat
+
+[tinydns]
+files =
+	/etc/tinydns/run
+	/etc/tinydns/env/*
+	/etc/tinydns/root/data
+
+[tpb]
+files =	/etc/tpbrc
+
+[tsocks]
+files =	/etc/tsocks.conf
+
+[ucarp]
+files = /etc/sysconfig/carp/*
+
+[vsftpd]
+files =
+	/etc/vsftpd.ftpusers
+	/etc/vsftpd.user_list
+	/etc/vsftpd/vsftpd.conf
+	/etc/logrotate.d/vsftpd.log
+
+[vtund]
+files =	/etc/vtund.conf
+
+[webalizer]
+files =
+	/etc/cron.daily/00webalizer
+	/etc/webalizer.conf
+
+[webmin]
+files =
+	/etc/sysconfig/daemons/webmin
+	/etc/webmin/config
+
+[wuftpd]
+files =
+	/etc/ftpaccess
+	/etc/ftpconversions
+	/etc/ftpgroups
+	/etc/ftphosts
+	/etc/ftpservers
+	/etc/ftpusers
+
+[xinetd]
+files =
+	/etc/sysconfig/xinetd
+	/etc/xinetd.conf
+	/etc/xinetd.d/chargen*
+	/etc/xinetd.d/daytime*
+	/etc/xinetd.d/echo*
+	/etc/xinetd.d/services
+	/etc/xinetd.d/time*
+
+[xl2tpd]
+files =
+	/etc/xl2tpd/l2tp-secrets
+	/etc/xl2tpd/xl2tpd.conf
+	/etc/ppp/options.xl2tpd
+
+[yam]
+files =
+	/etc/cron.daily/yam
+	/etc/httpd/conf.d/yam.conf
+	/etc/sysconfig/yam
+	/etc/yam.conf
+	/var/yam/*/systemid
+
+[yp]
+cmds =	ypwhich
+dirs =	/var/yp/
+files =
+	/etc/yp.conf
+	/var/yp/nicknames
+
+[yum]
+files =
+	/etc/yum.conf
+	/etc/yum.repos.d/*.repo
+	/etc/yum/repos.d/*.repo
+	/etc/yum/pluginconf.d/*
+
+### Proprietary software
+[gpfs]
+cmds =	
+	/usr/lpp/mmfs/bin/mmgetstate -aL
+#	/usr/lpp/mmfs/bin/mmfsadm dump config
+	/usr/lpp/mmfs/bin/mmlscluster
+	/usr/lpp/mmfs/bin/mmlsconfig
+	/usr/lpp/mmfs/bin/mmlsmgr 2>/dev/null
+	/usr/lpp/mmfs/bin/mmlsnode -a
+	/usr/lpp/mmfs/bin/mmlsnsd
+files =
+	/etc/cluster.nodes
+	/etc/profile.d/mmfs.sh
+	/proc/fs/gpfs/version
+	/var/mmfs/etc/cluster.preferences
+	/var/mmfs/etc/mmfs.cfg
+	/var/mmfs/etc/*.scr
+	/var/mmfs/etc/nsddevices
+	/var/mmfs/gen/mmfsNodeData
+	/var/mmfs/gen/mmsdrfs
+
+[netiq]
+files =
+	/etc/rc.d/init.d/nqmdaemon
+	/usr/netiq/UnixAgent/etc/mo_version.map
+	/usr/netiq/UnixAgent/etc/nqmumomapping.xml
+	/usr/netiq/UnixAgent/etc/uaconf.xml
+	/usr/netiq/UnixAgent/data/Config_1/NqmComms.xml
+	/usr/netiq/UnixAgent/log/SilentInstall.ini
+
+[powerbroker]
+files =
+	/etc/xinetd.d/pbguid
+	/etc/xinetd.d/pblocald
+	/etc/xinetd.d/pblogd
+	/etc/xinetd.d/pbmasterd
+	/etc/xinetd.d/pbsguid
+	/etc/pb.key
+	/etc/pb.settings
+
+[tsm]
+files =
+	/etc/logrotate.d/tsm
+	/etc/profile.d/tsm.sh
+	/etc/rc.d/init.d/tsm
+	/etc/sysconfig/tsm
+	/opt/tivoli/tsm/client/ba/bin/dsm.opt
+	/opt/tivoli/tsm/client/ba/bin/dsm.sys
+	/opt/tivoli/tsm/client/ba/bin/inclexcl
+
+[vas-client]
+files =
+	/etc/opt/vas/.licenses/license.txt
+	/etc/opt/vas/access.d/*
+	/etc/opt/vas/users.allow
+	/etc/opt/vas/users.deny
+	/etc/opt/vas/vas.conf
+
+### Add your own customizations to /etc/dconf-custom.conf

Copied: trunk/tools/dconf/config/suse.conf (from rev 5109, trunk/tools/dconf/config/dconf-suse.conf)
===================================================================
--- trunk/tools/dconf/config/suse.conf	                        (rev 0)
+++ trunk/tools/dconf/config/suse.conf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,639 @@
+### Changes to this file may get lost when upgrading dconf
+### Customizations should go into /etc/dconf-custom.conf
+
+### Please send improvements or fixes to: Dag Wieers <dag at wieers.com>
+
+### Main configuration
+[main]
+logdir = /var/log/dconf
+confdir = /etc/dconf.d
+
+### System information
+[apm]
+files =	/etc/sysconfig/apmd
+
+[boot]
+files =
+	/boot/grub/menu.lst
+	/etc/inittab
+	/etc/lilo.conf
+	/etc/rc.d/boot.local
+	/etc/sysconfig/boot
+	/etc/sysconfig/bootloader
+	/etc/sysconfig/bootsplash
+	/proc/cmdline
+
+[dhcp]
+files =
+	/etc/dhclient-*.conf
+	/etc/dhcpd.conf
+	/etc/pump.conf
+	/etc/sysconfig/dhcpd
+
+[filesystems]
+cmds =
+	fdisk -l 2>/dev/null
+	mount
+files =
+	/etc/exports
+	/etc/fstab
+	/proc/filesystems
+
+[firewall]
+cmds =
+	ebtables -L
+	ipchains -L -xnv
+	iptables -L -t filter -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+	iptables -L -t mangle -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+	iptables -L -t nat -xnv | sed -e 's| [0-9]\+ packets, [0-9]\+ bytes||'
+files =
+	/etc/rc.d/rc.firewall
+	/etc/sysconfig/ipchains
+	/etc/sysconfig/iptables-config
+
+[ipsec]
+files =
+	/etc/ipsec.conf
+	/proc/net/ipsec_version
+
+[ipvs]
+cmds =	ipvsadm -L
+files =
+	/etc/sysconfig/ipvsadm
+	/etc/ipvsadm.rules
+
+[kernel]
+cmds =
+	ipcs -l
+	sysctl -e -p
+files =
+	/etc/sysctl.conf
+	/etc/sysconfig/kernel
+	/etc/sysconfig/sysctl
+
+[lsb]
+cmds =
+	lsb_release -a
+
+[network]
+cmds =
+	ip addr
+	ip route
+#	netstat -lnpt | grep -v ":60.. " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+#	netstat -lnpu | grep -v "/local " | perl -p -e "s|^(\w+)(\s+\S+){2}|\$1  |; s|(\d+\|PID)/||;"
+	route -n
+files =
+	/etc/ethers
+	/etc/host.conf
+	/etc/hosts
+	/etc/networks
+	/etc/nsswitch.conf
+	/etc/resolv.conf
+	/etc/sysconfig/network/config
+	/etc/sysconfig/network/dhcp
+	/etc/sysconfig/network/ifcfg-*
+	/etc/sysconfig/network/routes
+	/etc/sysconfig/network/wireless
+	/proc/net/bond0/info
+	/proc/net/bonding/bond0
+
+[packages]
+cmds =	rpm -qa --nodigest --nosignature | sort -f
+
+[printer]
+files =
+	/etc/cups/cupsd.conf
+	/etc/cups/printers.conf
+	/etc/lpd.conf
+	/etc/lpd.perms
+	/etc/printcap
+	/etc/sysconfig/cups
+
+[root user]
+files =
+	/root/.Xresources
+	/root/.bash_logout
+	/root/.bash_profile
+	/root/.bashrc
+	/root/.cshrc
+	/root/.tcshrc
+
+[security]
+files =
+	/etc/group
+	/etc/gshadow
+	/etc/hosts.allow
+	/etc/hosts.deny
+	/etc/op.conf
+	/etc/passwd
+	/etc/shadow
+	/etc/sudoers
+	/etc/sysconfig/system-config-securitylevel
+
+[services]
+cmds =	chkconfig --list
+dirs =	/etc/security
+files =
+	/etc/inetd.conf
+	/etc/sysconfig/identd
+	/etc/xinetd.conf
+
+[shell]
+files =
+	/etc/bashrc
+	/etc/profile
+
+[system]
+cmds =	uname -a
+files =
+	/etc/suseservers
+	/etc/sysconfig/onlineupdate
+	/etc/sysconfig/suseconfig
+	/etc/sysconfig/susehelp
+
+[user management]
+files =	/etc/sysconfig/system-config-users
+
+### Hardware info
+[hardware]
+cmds =
+	dmidecode
+	lspci -v
+	lsusb -vv
+#	for i in /dev/hd[a-z] /dev/sd[a-z]; do smartctl -a $i; done
+files =
+	/etc/modprobe.conf
+	/etc/modules.conf
+	/etc/sysconfig/autofs
+	/etc/sysconfig/ide
+	/etc/sysconfig/hotplug
+	/etc/sysconfig/joystick
+	/etc/sysconfig/netdump
+	/etc/sysconfig/noflushd
+	/etc/sysconfig/pcmcia
+	/etc/sysconfig/kudzu
+	/proc/cpuinfo
+	/proc/devices
+	/proc/dma
+	/proc/driver/nvram
+	/proc/ide/drivers
+	/proc/ide/ide?/hd?/{cache,capacity,media,model,settings}
+	/proc/ide/piix
+	/proc/ide/via
+	/proc/iomem
+	/proc/mdstat
+	/proc/misc
+	/proc/modules
+	/proc/mtrr
+	/proc/ppc64/lparcfg
+	/proc/ppc64/rtas/poweron
+	/proc/ppc64/rtas/sensors
+	/proc/scsi
+	/proc/scsi/IBMchanger
+	/proc/scsi/IBMtape
+	/proc/swaps
+	/proc/tty/drivers
+
+[mpp]
+cmds =	mppUtil -V
+files =
+	/etc/mpp.conf
+	/var/mpp/devicemapping
+
+[qlogic]
+cmds =	/root/qla-autoconf -v
+files =
+	/etc/qla2300.conf
+	/proc/scsi/qla2300/? | grep -v -i -E '(number| reqs| free count) '
+
+### Software tools
+[afick]
+files = /etc/afick.conf
+
+[aide]
+files =	/etc/aide.conf
+
+[amanda]
+files =
+	/etc/amandates
+	/var/lib/amanda/.amandahosts
+
+[amavisd-new]
+files =
+	/etc/amavisd.conf
+	/etc/sysconfig/amavisd
+
+[apache]
+files =
+	/etc/httpd/conf/httpd.conf
+	/etc/httpd/conf.d/*
+	/etc/sysconfig/apache
+
+[arpwatch]
+files =
+	/etc/sysconfig/arpwatch
+	/var/arpwatch/arp.dat
+
+[autofs]
+files =
+	/etc/auto.master
+	/etc/autofs.conf
+
+[bind]
+files =
+	/etc/named.conf
+	/etc/rndc.conf
+	/etc/rndc.key
+	/etc/sysconfig/named
+	/var/named/chroot/etc/named.conf
+
+[clamav]
+files =
+	/etc/clamd.conf
+	/etc/freshclam.conf
+	/etc/sysconfig/clamav-milter
+
+[cron]
+files =
+	/etc/crontab
+	/etc/sysconfig/cron
+cmds =	crontab -l
+#	ls -l /etc/cron.*/
+
+[dante]
+files =
+	/etc/sockd.conf
+	/etc/socks.conf
+
+[dar]
+files = /etc/dar/dar.conf
+
+[dconf]
+files =
+	/etc/dconf.conf
+	/etc/dconf-custom.conf
+
+[distcc]
+files = /etc/sysconfig/distccd
+
+[dnsmasq]
+files = /etc/dnsmasq.conf
+
+[dovecot]
+files =	/etc/dovecot.conf
+
+[drbd]
+files = /etc/drbd.conf
+
+[dwall firewall]
+files =
+	/etc/dwall/alias.conf
+	/etc/dwall/chains/*
+	/etc/dwall/dwall.conf
+	/etc/dwall/firewall
+	/etc/dwall/scripts/*
+	/etc/dwall/zone.conf
+
+[gnokii]
+files =	/etc/gnokiirc
+
+[gpfs]
+cmds =	
+	/usr/lpp/mmfs/bin/mmgetstate -aL
+#	/usr/lpp/mmfs/bin/mmfsadm dump config
+	/usr/lpp/mmfs/bin/mmlscluster
+	/usr/lpp/mmfs/bin/mmlsconfig
+	/usr/lpp/mmfs/bin/mmlsmgr 2>/dev/null
+	/usr/lpp/mmfs/bin/mmlsnode -a
+	/usr/lpp/mmfs/bin/mmlsnsd
+files =
+	/etc/cluster.nodes
+	/etc/profile.d/mmfs.sh
+	/proc/fs/gpfs/version
+	/var/mmfs/etc/cluster.preferences
+	/var/mmfs/etc/mmfs.cfg
+	/var/mmfs/etc/mmfsdown.scr
+	/var/mmfs/etc/mmfsup.scr
+	/var/mmfs/etc/nsddevices
+	/var/mmfs/gen/mmfsNodeData
+	/var/mmfs/gen/mmsdrfs
+
+[hammerhead]
+dirs = /etc/hammerhead/
+
+[hercules]
+dirs = /etc/hercules/
+
+[hylafax]
+files =
+	/etc/hfaxd.conf
+	/etc/hosts.hfaxd
+	/etc/hyla.conf
+	/etc/faxmail.conf
+	/var/spool/fax/etc/dialrules
+	/var/spool/fax/etc/setup.cache
+	/var/spool/fax/etc/config.*
+
+[keepalived]
+files =	/etc/keepalived/keepalived.conf
+
+[kismet]
+files =
+	/etc/kismet.conf
+	/etc/kismet_drone.conf
+	/etc/kismet_ui.conf
+
+[laus]
+dirs = /etc/audit/
+
+[lftp]
+files = /etc/lftp.conf
+
+[ltsp]
+files =
+	/etc/ltsp.conf
+	/opt/ltsp/*/etc/lts.conf
+
+[mirror]
+files =	/etc/mirror.conf
+
+[mon]
+files =
+	/etc/mon/auto.cf
+	/etc/mon/mon.cf
+	/etc/mon/userfile
+
+[monit]
+files =	/etc/monit.conf
+
+[mplayerplug-in]
+files =
+	/etc/mplayerplug-in.conf
+	/etc/mplayerplug-in.types
+
+[mysql]
+files = /etc/my.cnf
+
+[nagios]
+files =
+	/etc/httpd/conf.d/nagios
+	/etc/nagios/*.cfg
+
+[nfs]
+cmds =
+	exportfs
+	showmount -d
+	showmount -e
+files =
+	/etc/exports
+	/etc/sysconfig/nfs
+
+[nscd]
+files =	/etc/nscd.conf
+
+[ntp]
+files =
+	/etc/ntp.conf
+	/etc/sysconfig/xntp
+
+[openldap]
+files =
+	/etc/ldap.conf
+	/etc/ldap.secrets
+	/etc/openldap/ldap.conf
+	/etc/openldap/ldapfilter.conf
+	/etc/openldap/ldapsearchprefs.conf
+	/etc/openldap/ldaptemplates.conf
+	/etc/openldap/slapd.conf
+	/etc/openldap/ud.conf
+	/etc/sysconfig/ldap
+	/etc/sysconfig/openldap
+
+[openssh]
+files =
+	/etc/ssh/shosts.equiv
+	/etc/ssh/ssh_config
+	/etc/ssh/sshd_config
+	/root/.ssh/authorized_keys
+	/root/.ssh/sshd_config
+	/root/.ssh/sshd_config
+
+[p0f]
+files =	/etc/sysconfig/p0f
+
+[partimaged]
+files =
+	/etc/partimaged/partimagedusers
+	/etc/sysconfig/partimaged
+
+[pearpc]
+files =	/etc/ppc.conf
+
+[pen]
+files =	/etc/httpd/conf.d/pen.conf
+
+[php]
+files =
+	/etc/httpd/conf.d/php.conf
+	/etc/pear.conf
+	/etc/php.ini
+
+[pine]
+files =
+	/etc/pine.conf
+	/etc/pine.conf.fixed
+
+[postfix]
+files =
+	/etc/postfix/access
+	/etc/postfix/aliases
+	/etc/postfix/canonical
+	/etc/postfix/main.cf
+	/etc/postfix/master.cf
+	/etc/postfix/pcre_table
+	/etc/postfix/regexp_table
+	/etc/postfix/relocated
+	/etc/postfix/transport
+	/etc/postfix/virtual
+	/etc/sysconfig/postfix
+	/usr/lib/sasl/smtpd.conf
+	/usr/lib/sasl2/smtpd.conf
+
+[prelink]
+files =
+	/etc/prelink.conf
+	/etc/sysconfig/prelink
+
+[proftpd]
+files =
+	/etc/ftpusers
+	/etc/proftpd.conf
+	/var/ftp/welcome.msg
+
+[qmail]
+cmds =	/var/qmail/bin/qmail-showctl
+dirs =
+	/var/qmail/alias/
+	/var/qmail/popboxes/
+	/var/qmail/users/
+
+[rpc]
+files =
+	/etc/rpc
+	pmap_dump
+
+[rsct]
+cmds =
+	lsclcfg
+	lscomg
+	for i in \\$(seq 1 9); do lscomg -i CG\\$i; done
+	lscondition
+	lsnodeid
+	lsrsrc
+	lssrc -ls cthags
+	lsrpdomain
+	lsrpnode
+	lssrc -a
+files =
+	/var/ct/cfg/clusters
+	/var/ct/cfg/ct_node_id
+	/var/ct/cfg/ctsec.nodeinfo
+	/var/ct/cfg/ctrmc.acls
+	/var/ct/cfg/current_cluster
+	
+[rsync]
+files =	/etc/rsyncd.conf
+
+[samba]
+files =
+	/etc/lmhosts
+	/etc/MACHINE.SID
+	/etc/smb.conf
+	/etc/smbusers
+	/etc/samba/lmhosts
+	/etc/samba/smb.conf
+	/etc/samba/smbpasswd
+	/etc/samba/smbusers
+	/etc/sysconfig/samba
+
+[sendmail]
+files =
+	/etc/aliases
+	/etc/mail/access
+	/etc/mail/domaintable
+	/etc/mail/local-host-names
+	/etc/mail/mailertable
+	/etc/mail/sendmail.mc
+	/etc/mail/submit.mc
+	/etc/mail/trusted-users
+	/etc/mail/virtusertable
+	/etc/sysconfig/sendmail
+
+[smbldap]
+files =
+	/etc/smbldap-tools/smbldap.conf
+	/etc/smbldap-tools/smbldap_bind.conf
+
+[smunge]
+files =	/etc/sysconfig/smunged
+
+[snort]
+files =
+	/etc/snort/*.config
+	/etc/sysconfig/snort
+
+[spamassassin]
+files =
+	/etc/sysconfig/spamassassin
+	/etc/mail/spamassassin/*.cf
+
+[speechd]
+files =
+	/etc/speechd.sub
+	/etc/speechdrc
+
+[squid]
+files =
+	/etc/squid/mime.conf
+	/etc/squid/msntauth.conf
+	/etc/squid/squid.conf
+	/etc/sysconfig/squid
+
+[squidguard]
+dirs =	/etc/squid/local/
+files =
+	/etc/squid/squidguard.conf
+	/etc/squid/squidguard-blacklists.conf
+
+[squirrelmail]
+files =
+	/etc/httpd/conf.d/squirrelmail.conf
+	/etc/squirrelmail/config.php
+
+[syslog]
+files =
+	/etc/sysconfig/syslog
+	/etc/syslog.conf
+
+[sysstat]
+files =	/etc/sysconfig/sysstat
+
+[tpb]
+files =	/etc/tpbrc
+
+[tsm]
+files =
+	/etc/adsm/dsm.sys
+	/etc/adsm/dsm.opt
+	/etc/adsm/inclexcl.conf
+	/etc/adsm/inclexcl.lst
+
+[tsocks]
+files =	/etc/tsocks.conf
+
+[ucarp]
+dirs =	/etc/sysconfig/carp/
+
+[vtund]
+files =	/etc/vtund.conf
+
+[webalizer]
+files =	/etc/webalizer.conf
+
+[webmin]
+files =
+	/etc/sysconfig/daemons/webmin
+	/etc/webmin/config
+
+[wuftpd]
+files =
+	/etc/ftpaccess
+	/etc/ftpconversions
+	/etc/ftpgroups
+	/etc/ftphosts
+	/etc/ftpservers
+	/etc/ftpusers
+
+[xinetd]
+files =
+	/etc/sysconfig/xinetd
+#	/etc/xinetd.d/*
+
+[yam]
+files =
+	/etc/httpd/conf.d/yam.conf
+	/etc/yam.conf
+
+[yp]
+cmds =	ypwhich
+dirs =	/var/yp/
+files =
+	/etc/sysconfig/ypbind
+	/etc/sysconfig/ypserv
+	/etc/yp.conf
+	/var/yp/nicknames
+
+[yum]
+files =	/etc/yum.conf
+
+### Add your own customizations to /etc/dconf-custom.conf

Modified: trunk/tools/dconf/dconf
===================================================================
--- trunk/tools/dconf/dconf	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/dconf	2007-01-25 19:18:57 UTC (rev 5110)
@@ -2,7 +2,7 @@
 
 import os, sys, glob, re, shutil, getopt, popen2, time, fnmatch
 import ConfigParser, urlparse, pwd, grp, stat, syslog
-import difflib, smtplib, gzip, md5, sha
+import difflib, gzip, md5, sha
 
 VERSION = '0.5.1svn'
 
@@ -75,10 +75,19 @@
 	def __init__(self):
 		self.sections = {}
 
-		self.includefile(op.configfile)
-		self.include = self.getoption('main', 'include', None)
+		self.read(op.configfile)
 
-	def includefile(self, configfile):
+		self.confdir = self.getoption('main', 'confdir', '/etc/dconf.d')
+		self.logdir = self.getoption('main', 'logdir', '/var/log/dconf')
+
+		if not op.output:
+			op.output = self.getoption('main', 'output', None)
+
+		self.quiet = not self.getoption('main', 'quiet', 'no') in disable
+		if op.verbose == 1 and self.quiet:
+			op.verbose = 0
+
+	def read(self, configfile):
 		self.cfg = ConfigParser.ConfigParser()
 
 		(s,b,p,q,f,o) = urlparse.urlparse(configfile)
@@ -99,23 +108,16 @@
 
 		self.compression = self.getoption('main', 'compression', 'gzip')
 		self.cron = self.getoption('main', 'cron', None)
-		self.logdir = self.getoption('main', 'logdir', '/var/log/dconf')
+		self.mailfrom = self.getoption('main', 'mailfrom', 'mrepo@%s' % os.uname()[1])
 		self.mailto = self.getoption('main', 'mailto', None)
 		self.smtpserver = self.getoption('main', 'smtp-server', 'localhost')
 		self.rpm = not self.getoption('main', 'rpm', 'no') in disable
 		self.exclude = self.getoption('main', 'exclude', excludelist).split()
 
-		if not op.output:
-			op.output = self.getoption('main', 'output', None)
-
-		self.quiet = not self.getoption('main', 'quiet', 'no') in disable
-		if op.verbose == 1 and self.quiet:
-			op.verbose = 0
-
 		sections = self.cfg.sections()
 		sections.sort()
 		for section in sections:
-			if section in ['main']:
+			if section in ('main', ):
 				continue
 			else:
 				self.sections[section] = {}
@@ -282,15 +284,26 @@
 def mail(subject, msg):
 	info(2, 'Sending mail to: %s' % cf.mailto)
 	try:
+		import smtplib
 		smtp = smtplib.SMTP(cf.smtpserver)
 #		server.set_debuglevel(1)
 		msg = 'Subject: [dconf] %s\n\nCurrent time:\n%s\nSystem information:\n%s\nUptime:\n%s\nCurrently logged on users:\n%s\n%s\n\n%s' % (subject, os.popen('date').read(), os.popen('uname -a').read(), os.popen('uptime').read(), os.popen('who').read(), subject, msg)
 		for email in cf.mailto.split():
-			smtp.sendmail('dconf@%s' % os.uname()[1], email, 'To: %s\n%s' % (email, msg))
+			smtp.sendmail(cf.mailfrom, email, 'To: %s\n%s' % (email, msg))
 		smtp.quit()
 	except:
 		info(1, 'Sending mail via %s failed.' % cf.smtpserver)
 
+def readconfig():
+	cf = Config()
+	if cf.confdir and os.path.isdir(cf.confdir):
+		files = glob.glob(os.path.join(cf.confdir, '*.conf'))
+		files.sort()
+		for configfile in files:
+			cf.read(configfile)
+#		cf.update(configfile)
+	return cf
+
 def main():
 	global extension, hostname, timestamp, ts
 
@@ -468,15 +481,8 @@
 
 ### Main entrance
 if __name__ == '__main__':
-	op=Options(sys.argv[1:])
-	cf=Config()
-	for cfgfile in cf.include.split():
-		if os.path.isfile(cfgfile):
-			info(2, 'Processing configfile %s.' % cfgfile)
-			cf.includefile(cfgfile)
-		else:
-			info(3, 'Configfile %s does not exist, ignoring.')
-
+	op = Options(sys.argv[1:])
+	cf = readconfig()
 	try:
 		main()
 	except KeyboardInterrupt, e:

Deleted: trunk/tools/dconf/dconf.1.txt
===================================================================
--- trunk/tools/dconf/dconf.1.txt	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/dconf.1.txt	2007-01-25 19:18:57 UTC (rev 5110)
@@ -1,132 +0,0 @@
-dconf(1)
-========
-Dag Wieers <dag at wieers.com>
-v0.5.0, September 2005
-
-
-NAME
-----
-dconf - create a system's hardware and software configuration snapshot
-
-
-SYNOPSIS
---------
-dconf [-q] [-v] [-c config] [-o output]
-
-
-DESCRIPTION
------------
-Dconf is a tool to collect a system's hardware and software configuration.
-It allows to take your system configuration with you on the road, compare
-identical systems (like nodes in a cluster) to troubleshoot HW or SW
-problems.
-
-Dconf is also useful in projects where you have to manage changes as a
-team. Dconf can run periodically and send out system changes to a list
-of email addresses so that they can be revised and discussed in group.
-
-You can customize your dconf configuration for specific needs, like making
-a profile of your laptop's hardware or copy specific software configuration
-files to send out or compare with other systems.
-
-As a sysadmin, you won't become too paranoid if less experienced people
-have root-access. As a consultant, you won't feel isolated if you don't
-have remote access to your systems. As a support engineer, you won't
-become frustrated if a customer has fiddled around with some important
-config file and you have to find which. As a performance tuner, you can
-capture the state of the system configuration in between performance
-tests/benchmarks.
-
-
-OPTIONS
--------
--c, --config file::
-	specify alternative configfile
-
--o, --output file::
-	write output to given file
-
--q, --quiet::
-	minimal output
-
--v, --verbose::
-	increase verbosity
-
--vv, -vvv::
-	increase verbosity more
-
-
-ARGUMENTS
----------
-Man:::
-	Ah. I'd like to have an argument, please.
-Receptionist:::
-	Certainly sir. Have you been here before?
-Man:::
-	No, I haven't, this is my first time.
-Receptionist:::
-	I see. Well, do you want to have just one argument, or were
-	you thinking of taking a course?
-Man:::
-	Well, what is the cost?
-Receptionist:::
-	Well, It's one pound for a five minute argument, but only
-	eight pounds for a course of ten.
-Man:::
-	Well, I think it would be best if I perhaps started off with
-	just the one and then see how it goes.
-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.
-
-Dconf was design so that an excessive list of configuration files or
-commands would not harm the execution of the program or the content of
-the snapshot file.
-
-Please send changes to: Dag Wieers mailto:dag at wieers.com[]
-
-
-BUGS
-----
-See the TODO file for known bugs and future plans.
-
-
-FILES
------
-/etc/dconf.conf::
-	the main Dconf configuration file (replaced on update)
-/etc/dconf-custom.conf::
-	the customized configuration file (customize this one)
-/var/log/dconf/::
-	the location of the snapshot files
-
-
-SEE ALSO
---------
-snap(8)
-
-
-AUTHOR
-------
-Written by Dag Wieers mailto:dag at wieers.com[]
-
-Homepage at http://dag.wieers.com/home-made/dconf/[]

Modified: trunk/tools/dconf/dconf.spec
===================================================================
--- trunk/tools/dconf/dconf.spec	2007-01-24 19:29:13 UTC (rev 5109)
+++ trunk/tools/dconf/dconf.spec	2007-01-25 19:18:57 UTC (rev 5110)
@@ -50,15 +50,15 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING README THANKS TODO config/ scripts/
+%doc AUTHORS ChangeLog COPYING README THANKS TODO config/ docs/*.txt scripts/
 %doc %{_mandir}/man1/dconf.1*
-%config %{_sysconfdir}/dconf.conf
-%config(noreplace) %{_sysconfdir}/dconf-custom.conf
+%config(noreplace) %{_sysconfdir}/dconf.conf
+%config %{_sysconfdir}/dconf.d/redhat.conf
 %{_bindir}/dconf
 %{_localstatedir}/log/dconf/
 
 %changelog
-* Sun Jul 30 2006 Dag Wieers <dag at wieers.com> - 0.5.1svn-1
+* Mon Jul 31 2006 Dag Wieers <dag at wieers.com> - 0.5.1svn-1
 - Updated to release 0.5.1svn.
 
 * Sun Jul 30 2006 Dag Wieers <dag at wieers.com> - 0.5.1-1

Added: trunk/tools/dconf/docs/Makefile
===================================================================
--- trunk/tools/dconf/docs/Makefile	                        (rev 0)
+++ trunk/tools/dconf/docs/Makefile	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,23 @@
+prefix = /usr
+datadir = $(prefix)/share
+mandir = $(datadir)/man
+
+all: dconf.1
+
+install: dconf.1
+	install -Dp -m0644 dconf.1 $(DESTDIR)$(mandir)/man1/dconf.1
+
+dist: clean all
+
+%.html: %.txt
+	asciidoc -b xhtml11 -d manpage $<
+
+%.1: %.1.xml
+	xmlto man $<
+
+%.xml: %.txt
+	asciidoc -b docbook -d manpage $<
+
+clean:
+	rm -f dconf.1 dconf.1.html dconf.1.xml
+

Copied: trunk/tools/dconf/docs/dconf.1.txt (from rev 5109, trunk/tools/dconf/dconf.1.txt)
===================================================================
--- trunk/tools/dconf/docs/dconf.1.txt	                        (rev 0)
+++ trunk/tools/dconf/docs/dconf.1.txt	2007-01-25 19:18:57 UTC (rev 5110)
@@ -0,0 +1,132 @@
+dconf(1)
+========
+Dag Wieers <dag at wieers.com>
+v0.5.0, September 2005
+
+
+NAME
+----
+dconf - create a system's hardware and software configuration snapshot
+
+
+SYNOPSIS
+--------
+dconf [-q] [-v] [-c config] [-o output]
+
+
+DESCRIPTION
+-----------
+Dconf is a tool to collect a system's hardware and software configuration.
+It allows to take your system configuration with you on the road, compare
+identical systems (like nodes in a cluster) to troubleshoot HW or SW
+problems.
+
+Dconf is also useful in projects where you have to manage changes as a
+team. Dconf can run periodically and send out system changes to a list
+of email addresses so that they can be revised and discussed in group.
+
+You can customize your dconf configuration for specific needs, like making
+a profile of your laptop's hardware or copy specific software configuration
+files to send out or compare with other systems.
+
+As a sysadmin, you won't become too paranoid if less experienced people
+have root-access. As a consultant, you won't feel isolated if you don't
+have remote access to your systems. As a support engineer, you won't
+become frustrated if a customer has fiddled around with some important
+config file and you have to find which. As a performance tuner, you can
+capture the state of the system configuration in between performance
+tests/benchmarks.
+
+
+OPTIONS
+-------
+-c, --config file::
+	specify alternative configfile
+
+-o, --output file::
+	write output to given file
+
+-q, --quiet::
+	minimal output
+
+-v, --verbose::
+	increase verbosity
+
+-vv, -vvv::
+	increase verbosity more
+
+
+ARGUMENTS
+---------
+Man:::
+	Ah. I'd like to have an argument, please.
+Receptionist:::
+	Certainly sir. Have you been here before?
+Man:::
+	No, I haven't, this is my first time.
+Receptionist:::
+	I see. Well, do you want to have just one argument, or were
+	you thinking of taking a course?
+Man:::
+	Well, what is the cost?
+Receptionist:::
+	Well, It's one pound for a five minute argument, but only
+	eight pounds for a course of ten.
+Man:::
+	Well, I think it would be best if I perhaps started off with
+	just the one and then see how it goes.
+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.
+
+Dconf was design so that an excessive list of configuration files or
+commands would not harm the execution of the program or the content of
+the snapshot file.
+
+Please send changes to: Dag Wieers mailto:dag at wieers.com[]
+
+
+BUGS
+----
+See the TODO file for known bugs and future plans.
+
+
+FILES
+-----
+/etc/dconf.conf::
+	the main Dconf configuration file (replaced on update)
+/etc/dconf-custom.conf::
+	the customized configuration file (customize this one)
+/var/log/dconf/::
+	the location of the snapshot files
+
+
+SEE ALSO
+--------
+snap(8)
+
+
+AUTHOR
+------
+Written by Dag Wieers mailto:dag at wieers.com[]
+
+Homepage at http://dag.wieers.com/home-made/dconf/[]



More information about the svn-commits mailing list