diff -Naur mds-2.4.0/agent/conf/plugins/network.ini mds-2.4.0.oden/agent/conf/plugins/network.ini --- mds-2.4.0/agent/conf/plugins/network.ini 2009-07-08 15:14:29.000000000 +0200 +++ mds-2.4.0.oden/agent/conf/plugins/network.ini 2010-04-27 16:16:09.450203415 +0200 @@ -3,10 +3,10 @@ [dhcp] dn = ou=DHCP,dc=mandriva,dc=com -pidfile = /var/run/dhcpd.pid -init = /etc/init.d/dhcp3-server -logfile = /var/log/syslog -leases = /var/lib/dhcp3/dhcpd.leases +pidfile = /var/run/dhcpd/dhcpd.pid +init = /etc/rc.d/init.d/dhcpd +logfile = /var/log/messages +leases = /var/lib/dhcp/dhcpd.leases [dns] # DNS Server Type : (default: bind) @@ -14,10 +14,10 @@ # - pdns (PowerDNS) #type = bind dn = ou=DNS,dc=mandriva,dc=com -pidfile = /var/run/bind/run/named.pid -init = /etc/init.d/bind9 -logfile = /var/log/syslog -bindroot = /etc/bind/ -bindgroup = bind +pidfile = /var/lib/named/var/run/named.pid +init = /etc/rc.d/init.d/named +logfile = /var/log/messages +bindroot = /var/lib/named +bindgroup = named # dnsreader = DNS Reader # dnsreaderpassword = DNSReaderPassword diff -Naur mds-2.4.0/agent/conf/plugins/proxy.ini mds-2.4.0.oden/agent/conf/plugins/proxy.ini --- mds-2.4.0/agent/conf/plugins/proxy.ini 2009-07-08 15:14:29.000000000 +0200 +++ mds-2.4.0.oden/agent/conf/plugins/proxy.ini 2010-04-27 16:04:01.215265197 +0200 @@ -3,7 +3,7 @@ [squidguard] path = /usr/bin/squidGuard -blacklist = /var/lib/squidguard/db/bad.destdomainlist -scriptReload = /etc/init.d/squid reload -user = proxy -group = proxy +blacklist = /usr/share/squidGuard-1.2.0/db/bad.destdomainlist +scriptReload = /etc/rc.d/init.d/squid reload +user = squid +group = squid diff -Naur mds-2.4.0/agent/conf/plugins/samba.ini mds-2.4.0.oden/agent/conf/plugins/samba.ini --- mds-2.4.0/agent/conf/plugins/samba.ini 2009-07-08 15:14:29.000000000 +0200 +++ mds-2.4.0.oden/agent/conf/plugins/samba.ini 2010-04-27 16:04:01.215265197 +0200 @@ -3,7 +3,7 @@ # Computers Locations baseComputersDN = ou=Computers, dc=mandriva, dc=com sambaConfFile = /etc/samba/smb.conf -sambaInitScript = /etc/init.d/samba +sambaInitScript = /etc/rc.d/init.d/smb sambaClamavSo = /usr/lib/samba/vfs/vscan-clamav.so # Default SAMBA shares location defaultSharesPath = /home/samba diff -Naur mds-2.4.0/agent/Makefile mds-2.4.0.oden/agent/Makefile --- mds-2.4.0/agent/Makefile 2010-04-21 14:29:46.000000000 +0200 +++ mds-2.4.0.oden/agent/Makefile 2010-04-27 16:19:40.451203297 +0200 @@ -21,7 +21,7 @@ # General Makefile variables DESTDIR = -PREFIX = /usr/local +PREFIX = /usr SBINDIR = $(PREFIX)/sbin LIBDIR = $(PREFIX)/lib/mmc ETCDIR = /etc/mmc @@ -47,10 +47,10 @@ install: @# Install directories @echo "Creating directories..." - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(LIBDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR) - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX) + $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(PYTHON_PREFIX) @echo "" @echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)" @@ -58,18 +58,18 @@ @echo "" @echo "Install LIBFILES in $(DESTDIR)$(LIBDIR)" - $(INSTALL) $(LIBFILES) -m 755 -o root -g root $(DESTDIR)$(LIBDIR) + $(INSTALL) $(LIBFILES) -m 755 $(DESTDIR)$(LIBDIR) @echo "" @echo "Install CONFILES in $(DESTDIR)$(ETCDIR)" - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/plugins - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/samba.ini ] && $(INSTALL) conf/plugins/samba.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/samba.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/mail.ini ] && $(INSTALL) conf/plugins/mail.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/mail.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/network.ini ] && $(INSTALL) conf/plugins/network.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/network.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/proxy.ini ] && $(INSTALL) conf/plugins/proxy.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/proxy.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/sshlpk.ini ] && $(INSTALL) conf/plugins/sshlpk.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/sshlpk.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/userquota.ini ] && $(INSTALL) conf/plugins/userquota.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/userquota.ini - -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/bulkimport.ini ] && $(INSTALL) conf/plugins/bulkimport.ini -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins/bulkimport.ini + $(INSTALL) -d -m 755 $(DESTDIR)$(ETCDIR)/plugins + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/samba.ini ] && $(INSTALL) conf/plugins/samba.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/samba.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/mail.ini ] && $(INSTALL) conf/plugins/mail.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/mail.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/network.ini ] && $(INSTALL) conf/plugins/network.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/network.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/proxy.ini ] && $(INSTALL) conf/plugins/proxy.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/proxy.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/sshlpk.ini ] && $(INSTALL) conf/plugins/sshlpk.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/sshlpk.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/userquota.ini ] && $(INSTALL) conf/plugins/userquota.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/userquota.ini + -[ ! -f $(DESTDIR)$(ETCDIR)/plugins/bulkimport.ini ] && $(INSTALL) conf/plugins/bulkimport.ini -m 600 $(DESTDIR)$(ETCDIR)/plugins/bulkimport.ini include common.mk diff -Naur mds-2.4.0/web/Makefile mds-2.4.0.oden/web/Makefile --- mds-2.4.0/web/Makefile 2009-07-08 16:43:30.000000000 +0200 +++ mds-2.4.0.oden/web/Makefile 2010-04-27 16:14:37.423265826 +0200 @@ -20,12 +20,10 @@ # General Makefile variables DESTDIR = -PREFIX = /usr/local +PREFIX = /usr DATADIR = $(PREFIX)/share/mmc INSTALL = $(shell which install) CP = $(shell which cp) -CHOWN = $(shell which chown) -CHGRP = $(shell which chgrp) SED = $(shell which sed) RM = $(shell which rm) @@ -48,10 +46,8 @@ install: build_mo @echo "" @echo "Installing mmc-web in $(DESTDIR)$(DATADIR)" - $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(DATADIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(DATADIR) $(CP) -R $(FILESTOINSTALL) $(DESTDIR)$(DATADIR) - $(CHOWN) -R root $(DESTDIR)$(DATADIR) - $(CHGRP) -R root $(DESTDIR)$(DATADIR) find $(DESTDIR)$(DATADIR) -type f -name *.po[t] -exec rm -f {} \; $(RELEASES_DIR)/$(TARBALL_GZ):