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

Mon Jan 8 19:31:21 CET 2007

Author: dag
Date: 2007-01-08 19:31:20 +0100 (Mon, 08 Jan 2007)
New Revision: 5052

Modified:
   trunk/tools/dconf/ChangeLog
   trunk/tools/dconf/Makefile
   trunk/tools/dconf/config/dconf-redhat.conf
   trunk/tools/dconf/dconf.spec
Log:
Added updates from Tuomo Soini.

Modified: trunk/tools/dconf/ChangeLog
===================================================================

--- trunk/tools/dconf/ChangeLog	2007-01-08 16:02:27 UTC (rev 5051)
+++ trunk/tools/dconf/ChangeLog	2007-01-08 18:31:20 UTC (rev 5052)
@@ -1,8 +1,11 @@
-* 0.5.2 - ... - release 31/07/2006
+* 0.5.1svn - ... - release 31/07/2006
 - Added cpuid to hardware section
 - Added fam, ld.so, pam, powerbroker and vas-client sections
 - 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)
 
+>>>>>>> .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-08 16:02:27 UTC (rev 5051)
+++ trunk/tools/dconf/Makefile	2007-01-08 18:31:20 UTC (rev 5052)
@@ -17,7 +17,6 @@
 	@echo "Nothing to be build."
 
 install: dconf.1
-#	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -D -m0644 dconf.conf $(DESTDIR)$(sysconfdir)/dconf.conf
 	-@[ ! -f $(DESTDIR)$(sysconfdir)/dconf-custom.conf ] && install -D -m0644 config/dconf-custom.conf $(DESTDIR)$(sysconfdir)/dconf-custom.conf
 
 	install -Dp -m0755 dconf $(DESTDIR)$(bindir)/dconf
@@ -26,14 +25,14 @@
 	install -dp -m0755 $(DESTDIR)$(logdir)
 	@echo "Also do: make install-<dist>   (with dist: debian|redhat|suse)"
 
-install-redhat:
-	install -Dp -m0644 config/dconf-redhat.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+install-redhat: install
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-redhat.conf $(DESTDIR)$(sysconfdir)/dconf.conf
 
-install-debian:
-	install -Dp -m0644 config/dconf-debian.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+install-debian: install
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-debian.conf $(DESTDIR)$(sysconfdir)/dconf.conf
 
 install-suse:
-	install -Dp -m0644 config/dconf-suse.conf $(DESTDIR)$(sysconfdir)/dconf.conf
+	-[ ! -f $(DESTDIR)$(sysconfdir)/dconf.conf ] && install -Dp -m0644 config/dconf-suse.conf $(DESTDIR)$(sysconfdir)/dconf.conf
 
 clean:
 	rm -f dconf.1 dconf.1.html dconf.1.xml

Modified: trunk/tools/dconf/config/dconf-redhat.conf
===================================================================
--- trunk/tools/dconf/config/dconf-redhat.conf	2007-01-08 16:02:27 UTC (rev 5051)
+++ trunk/tools/dconf/config/dconf-redhat.conf	2007-01-08 18:31:20 UTC (rev 5052)
@@ -97,6 +97,15 @@
 [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
@@ -343,6 +352,7 @@
 [amavisd-new]
 files =
 	/etc/amavisd.conf
+	/etc/amavis/amavisd.conf
 	/etc/cron.daily/amavisd
 	/etc/logrotate.d/amavisd
 	/etc/sysconfig/amavisd
@@ -400,6 +410,11 @@
 	/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/*
@@ -530,6 +545,18 @@
 [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/
 
@@ -555,6 +582,12 @@
 	/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/
 
@@ -679,20 +712,26 @@
 
 [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
@@ -703,6 +742,12 @@
 	/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
@@ -711,7 +756,10 @@
 [proftpd]
 files =
 	/etc/ftpusers
+	/etc/logrotate.d/proftpd
 	/etc/proftpd.conf
+	/etc/proftpd.ftpusers
+	/etc/proftpd/proftpd.conf
 	/var/ftp/welcome.msg
 
 [qmail]
@@ -822,6 +870,7 @@
 files =
 	/etc/httpd/conf.d/squirrelmail.conf
 	/etc/squirrelmail/config.php
+	/etc/squirrelmail/config_local.php
 
 [syslog]
 files =
@@ -853,6 +902,13 @@
 [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
 
@@ -885,6 +941,12 @@
 	/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
@@ -904,6 +966,8 @@
 files =
 	/etc/yum.conf
 	/etc/yum.repos.d/*.repo
+	/etc/yum/repos.d/*.repo
+	/etc/yum/pluginconf.d/*
 
 ### Proprietary software
 [gpfs]

Modified: trunk/tools/dconf/dconf.spec
===================================================================
--- trunk/tools/dconf/dconf.spec	2007-01-08 16:02:27 UTC (rev 5051)
+++ trunk/tools/dconf/dconf.spec	2007-01-08 18:31:20 UTC (rev 5052)
@@ -38,7 +38,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install install-redhat DESTDIR="%{buildroot}"
+%{__make} install-redhat DESTDIR="%{buildroot}"
 
 %postun
 if [ $1 -eq 0 ]; then

