From mboxrd@z Thu Jan 1 00:00:00 1970 From: kupcevic@sourceware.org Date: 15 Jun 2006 03:08:41 -0000 Subject: [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ... Message-ID: <20060615030841.29294.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: kupcevic at sourceware.org 2006-06-15 03:08:37 Modified files: . : conga.spec.in.in make : version.in ricci : Makefile ricci/init.d : ricci ricci/modules/cluster: Makefile ricci/modules/log: Makefile ricci/modules/rpm: Makefile ricci/modules/service: Makefile ricci/modules/storage: Makefile ricci/ricci : DBusController.cpp Makefile dbus_test.cpp Added files: ricci/modules/cluster/d-bus: ricci-modcluster.oddjob.conf ricci-modcluster.systembus.conf ricci/modules/log/d-bus: ricci-modlog.oddjob.conf ricci-modlog.systembus.conf ricci/modules/rpm/d-bus: ricci-modrpm.oddjob.conf ricci-modrpm.systembus.conf ricci/modules/service/d-bus: ricci-modservice.oddjob.conf ricci-modservice.systembus.conf ricci/modules/storage/d-bus: ricci-modstorage.oddjob.conf ricci-modstorage.systembus.conf ricci/ricci/d-bus: ricci.oddjob.conf ricci.systembus.conf Removed files: ricci/oddjobd.conf.d: Makefile modcluster_rw.conf modlog_rw.conf modrpm_rw.conf modservice_rw.conf modstorage_rw.conf reboot.conf Log message: Use com.redhat.ricci d-bus namespace instead of com.redhat.oddjob; conga.spec: proper paths and reload of messagebus and oddjob on installs/upgrades Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/ricci.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modcluster_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modlog_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modrpm_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modservice_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modstorage_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/reboot.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/dbus_test.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1 --- conga/conga.spec.in.in 2006/06/14 21:44:34 1.4 +++ conga/conga.spec.in.in 2006/06/15 03:08:35 1.5 @@ -86,22 +86,20 @@ %files -n luci %defattr(-,root,root) -%config /etc/rc.d/init.d/luci -%{_sbindir}/luci_admin -%attr(-,luci,root) /var/lib/luci -%attr(600,luci,root) /var/lib/luci/var/Data.fs -%config /var/lib/luci/var/Data.fs -%config /var/lib/luci/etc/zope.conf -%config(noreplace) /var/lib/luci/etc/logrotate.conf -%config(noreplace) /var/lib/luci/etc/stunnel.conf - +%config %{_sysconfdir}/rc.d/init.d/luci + %{_sbindir}/luci_admin +%attr(-,luci,root) %{_localstatedir}/lib/luci +%attr(600,luci,root) %{_localstatedir}/lib/luci/var/Data.fs +%config %{_localstatedir}/lib/luci/var/Data.fs +%config %{_localstatedir}/lib/luci/etc/zope.conf +%config(noreplace) %{_localstatedir}/lib/luci/etc/logrotate.conf +%config(noreplace) %{_localstatedir}/lib/luci/etc/stunnel.conf %pre -n luci /usr/sbin/groupadd -r -f luci >/dev/null 2>&1 /usr/sbin/useradd -r -M -s /sbin/nologin -g luci luci >/dev/null 2>&1 exit 0 - %post -n luci /sbin/chkconfig --add luci if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then @@ -117,14 +115,12 @@ /bin/chown luci /var/lib/luci/inituser fi - %preun -n luci if [ "$1" = 0 ]; then /sbin/service luci stop >/dev/null 2>$1 /sbin/chkconfig --del luci fi - %postun -n luci if [ "$1" -ge "1" ]; then /sbin/service luci condrestart > /dev/null 2>&1 @@ -163,26 +159,26 @@ # ricci #%doc README COPYING -%config /etc/rc.d/init.d/ricci -%config /etc/oddjobd.conf.d/reboot.conf -%config(noreplace) /etc/pam.d/ricci -%attr(-,ricci,root) /var/lib/ricci -%{_sbindir}/ricci -%{_sbindir}/ricci-worker -%attr(4755,root,root) %{_sbindir}/ricci-auth +%config %{_sysconfdir}/rc.d/init.d/ricci +%config(noreplace) %{_sysconfdir}/pam.d/ricci + %{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf + %{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf +%attr(-,ricci,root) %{_localstatedir}/lib/ricci + %{_sbindir}/ricci + %{_sbindir}/ricci-worker +%attr(4755,root,root) %{_sbindir}/ricci-auth # modrpm -%config /etc/oddjobd.conf.d/modrpm_rw.conf -%{_sbindir}/ricci-modrpm -%{_sbindir}/ricci-modrpm.exe - + %{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf + %{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf + %{_sbindir}/ricci-modrpm + %{_sbindir}/ricci-modrpm.exe %pre -n ricci /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1 /usr/sbin/useradd -r -M -s /sbin/nologin -g ricci ricci >/dev/null 2>&1 exit 0 - %post -n ricci /sbin/chkconfig --add ricci if [ ! -e /var/lib/ricci/certs/privkey.pem ]; then @@ -193,14 +189,14 @@ /bin/chmod 644 /var/lib/ricci/certs/cacert.pem /bin/chmod 600 /var/lib/ricci/certs/privkey.pem fi -/sbin/chkconfig messagebus on -/sbin/chkconfig oddjobd on -/sbin/service messagebus start > /dev/null 2>&1 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid` -/sbin/service oddjobd start > /dev/null 2>&1 /sbin/service oddjobd reload > /dev/null 2>&1 -/sbin/service ricci restart > /dev/null 2>&1 - +RUNS=(`runlevel`) +RUNLEVEL=${RUNS[1]} +STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,` +if [ $STATE = "on" ]; then + /sbin/service ricci restart > /dev/null 2>&1 +fi %preun -n ricci if [ "$1" = 0 ]; then @@ -208,12 +204,12 @@ /sbin/chkconfig --del ricci fi - %postun -n ricci +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` +/sbin/service oddjobd reload > /dev/null 2>&1 if [ "$1" -ge "1" ]; then /sbin/service ricci condrestart > /dev/null 2>&1 fi -/sbin/service oddjobd reload > /dev/null 2>&1 exit 0 @@ -234,22 +230,26 @@ %description -n ricci-modcluster ricci-modcluster description - %files -n ricci-modcluster %defattr(-,root,root) #%doc README -%config /etc/rc.d/init.d/ricci-modclusterd -%config /etc/oddjobd.conf.d/modcluster_rw.conf -%{_sbindir}/ricci-modcluster -%{_sbindir}/ricci-modcluster.exe -%{_sbindir}/ricci-modclusterd - +%config %{_sysconfdir}/rc.d/init.d/ricci-modclusterd + %{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf + %{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf + %{_sbindir}/ricci-modcluster + %{_sbindir}/ricci-modcluster.exe + %{_sbindir}/ricci-modclusterd %post -n ricci-modcluster /sbin/chkconfig --add ricci-modclusterd +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 -/sbin/service ricci-modclusterd restart > /dev/null 2>&1 - +RUNS=(`runlevel`) +RUNLEVEL=${RUNS[1]} +STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,` +if [ $STATE = "on" ]; then + /sbin/service ricci-modclusterd restart > /dev/null 2>&1 +fi %preun -n ricci-modcluster if [ "$1" = 0 ]; then @@ -257,12 +257,12 @@ /sbin/chkconfig --del ricci-modclusterd fi - %postun -n ricci-modcluster +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` +/sbin/service oddjobd reload > /dev/null 2>&1 if [ "$1" -ge "1" ]; then /sbin/service ricci-modclusterd condrestart > /dev/null 2>&1 fi -/sbin/service oddjobd reload > /dev/null 2>&1 exit 0 @@ -282,21 +282,23 @@ %description -n ricci-modstorage ricci-modstorage description - %files -n ricci-modstorage %defattr(-,root,root) #%doc README -%config /etc/oddjobd.conf.d/modstorage_rw.conf +%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf +%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf %{_sbindir}/ricci-modstorage %{_sbindir}/ricci-modstorage.exe %post -n ricci-modstorage +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 %preun -n ricci-modstorage %postun -n ricci-modstorage +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 @@ -317,21 +319,23 @@ %description -n ricci-modservice ricci-modservice description - %files -n ricci-modservice %defattr(-,root,root) #%doc README -%config /etc/oddjobd.conf.d/modservice_rw.conf +%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf +%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf %{_sbindir}/ricci-modservice %{_sbindir}/ricci-modservice.exe %post -n ricci-modservice +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 %preun -n ricci-modservice %postun -n ricci-modservice +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 @@ -352,22 +356,23 @@ %description -n ricci-modlog ricci-modlog description - %files -n ricci-modlog %defattr(-,root,root) #%doc README -%config /etc/oddjobd.conf.d/modlog_rw.conf +%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf +%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf %{_sbindir}/ricci-modlog %{_sbindir}/ricci-modlog.exe %post -n ricci-modlog +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 - %preun -n ricci-modlog %postun -n ricci-modlog +/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` /sbin/service oddjobd reload > /dev/null 2>&1 exit 0 @@ -390,17 +395,17 @@ %description -n cluster-snmp SNMP agent for Red Hat Enterprise Linux Cluster Suite - %files -n cluster-snmp %defattr(-,root,root) -%{_libdir}/cluster-snmp/ -%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-MIB -%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB -%{_docdir}/cluster-snmp-%{version}/ + %{_libdir}/cluster-snmp/ +%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-MIB +%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB + %{_docdir}/cluster-snmp-%{version}/ %pre -n cluster-snmp %post -n cluster-snmp +#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` #/sbin/service oddjobd reload > /dev/null 2>&1 /sbin/service snmpd condrestart > /dev/null 2>&1 exit 0 @@ -408,6 +413,7 @@ %preun -n cluster-snmp %postun -n cluster-snmp +#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` #/sbin/service oddjobd reload > /dev/null 2>&1 /sbin/service snmpd condrestart > /dev/null 2>&1 exit 0 @@ -431,7 +437,6 @@ %description -n cluster-cim CIM provider for Red Hat Enterprise Linux Cluster Suite - %files -n cluster-cim %defattr(-,root,root) %{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so @@ -440,6 +445,7 @@ %pre -n cluster-cim %post -n cluster-cim +#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` #/sbin/service oddjobd reload > /dev/null 2>&1 /sbin/service tog-pegasus condrestart > /dev/null 2>&1 exit 0 @@ -447,6 +453,7 @@ %preun -n cluster-cim %postun -n cluster-cim +#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` #/sbin/service oddjobd reload > /dev/null 2>&1 /sbin/service tog-pegasus condrestart > /dev/null 2>&1 exit 0 --- conga/make/version.in 2006/06/14 21:44:34 1.3 +++ conga/make/version.in 2006/06/15 03:08:35 1.4 @@ -1,2 +1,2 @@ VERSION=0.8 -RELEASE=1.FC5 +RELEASE=3.FC5 --- conga/ricci/Makefile 2006/06/14 21:44:34 1.7 +++ conga/ricci/Makefile 2006/06/15 03:08:35 1.8 @@ -20,7 +20,6 @@ make -C modules make -C init.d make -C pam.d - make -C oddjobd.conf.d install: @@ -28,7 +27,7 @@ make -C modules install make -C init.d install make -C pam.d install - make -C oddjobd.conf.d install + uninstall: @@ -38,7 +37,7 @@ make -C modules clean make -C init.d clean make -C pam.d clean - make -C oddjobd.conf.d clean + distclean: clean rm -f make/defines.mk --- conga/ricci/init.d/ricci 2006/04/07 16:42:39 1.5 +++ conga/ricci/init.d/ricci 2006/06/15 03:08:36 1.6 @@ -38,9 +38,23 @@ case $1 in start) + service messagebus status > /dev/null 2>&1 + if [ $? -ne 0 ]; then + service messagebus start + service messagebus status > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "not starting ricci..." + exit 1 + fi + fi service oddjobd status > /dev/null 2>&1 if [ $? -ne 0 ]; then - /sbin/service oddjobd start + service oddjobd start + service oddjobd status > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "not starting ricci..." + exit 1 + fi fi NewUID=`cat /etc/passwd | grep "^$RUNASUSER:" | sed -e 's/^[^:]*:[^:]*://' -e 's/:.*//'` --- conga/ricci/modules/cluster/Makefile 2006/04/07 16:42:40 1.8 +++ conga/ricci/modules/cluster/Makefile 2006/06/15 03:08:36 1.9 @@ -38,6 +38,10 @@ install -d ${sbindir} install ${TARGET} ${sbindir} install ricci-modcluster ${sbindir} + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci-modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci-modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d make -C clumon install uninstall: /cvs/cluster/conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf +++ - 2006-06-15 03:08:38.412154000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf +++ - 2006-06-15 03:08:38.507288000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + --- conga/ricci/modules/log/Makefile 2006/06/02 00:14:29 1.1 +++ conga/ricci/modules/log/Makefile 2006/06/15 03:08:36 1.2 @@ -34,6 +34,11 @@ install -d ${sbindir} install ${TARGET} ${sbindir} install ricci-modlog ${sbindir} + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci-modlog.systembus.conf ${sysconfdir}/dbus-1/system.d + uninstall: /cvs/cluster/conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf +++ - 2006-06-15 03:08:38.763576000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf +++ - 2006-06-15 03:08:39.065797000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + --- conga/ricci/modules/rpm/Makefile 2006/04/07 16:42:40 1.2 +++ conga/ricci/modules/rpm/Makefile 2006/06/15 03:08:36 1.3 @@ -34,6 +34,11 @@ install -d ${sbindir} install ${TARGET} ${sbindir} install ricci-modrpm ${sbindir} + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci-modrpm.systembus.conf ${sysconfdir}/dbus-1/system.d + uninstall: /cvs/cluster/conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf +++ - 2006-06-15 03:08:39.284783000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf +++ - 2006-06-15 03:08:39.402671000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + --- conga/ricci/modules/service/Makefile 2006/04/07 16:42:40 1.3 +++ conga/ricci/modules/service/Makefile 2006/06/15 03:08:36 1.4 @@ -34,6 +34,11 @@ install -d ${sbindir} install ${TARGET} ${sbindir} install ricci-modservice ${sbindir} + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci-modservice.systembus.conf ${sysconfdir}/dbus-1/system.d + uninstall: /cvs/cluster/conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf +++ - 2006-06-15 03:08:39.615317000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf +++ - 2006-06-15 03:08:39.747052000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + --- conga/ricci/modules/storage/Makefile 2006/04/07 16:42:40 1.5 +++ conga/ricci/modules/storage/Makefile 2006/06/15 03:08:37 1.6 @@ -63,6 +63,11 @@ install -d ${sbindir} install ${TARGET} ${sbindir} install ricci-modstorage ${sbindir} + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci-modstorage.systembus.conf ${sysconfdir}/dbus-1/system.d + uninstall: /cvs/cluster/conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf +++ - 2006-06-15 03:08:39.969505000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf +++ - 2006-06-15 03:08:40.054604000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + --- conga/ricci/ricci/DBusController.cpp 2006/06/02 00:14:29 1.10 +++ conga/ricci/ricci/DBusController.cpp 2006/06/15 03:08:37 1.11 @@ -134,9 +134,9 @@ throw string("module not supported"); // prepare msg - DBusMessage* msg = dbus_message_new_method_call("com.redhat.oddjob", - "/com/redhat/oddjob", - "com.redhat.oddjob", + DBusMessage* msg = dbus_message_new_method_call("com.redhat.ricci", + "/com/redhat/ricci", + "com.redhat.ricci", _mod_map[module_name].c_str()); if (!msg) throw string("not enough memory to create message"); --- conga/ricci/ricci/Makefile 2006/06/14 21:44:37 1.9 +++ conga/ricci/ricci/Makefile 2006/06/15 03:08:37 1.10 @@ -58,10 +58,15 @@ install -d ${localstatedir}/lib/ricci/certs install -d ${localstatedir}/lib/ricci/certs/clients install -d ${localstatedir}/lib/ricci/queue + install cacert.config ${localstatedir}/lib/ricci/certs/ install ${TARGET} ${sbindir} install ${TARGET_AUTH} ${sbindir} install ${TARGET_WORKER} ${sbindir} - install cacert.config ${localstatedir}/lib/ricci/certs/ + install -d ${sysconfdir}/oddjobd.conf.d + install -d ${sysconfdir}/dbus-1/system.d + install d-bus/ricci.oddjob.conf ${sysconfdir}/oddjobd.conf.d + install d-bus/ricci.systembus.conf ${sysconfdir}/dbus-1/system.d + uninstall: --- conga/ricci/ricci/dbus_test.cpp 2006/03/10 17:50:11 1.2 +++ conga/ricci/ricci/dbus_test.cpp 2006/06/15 03:08:37 1.3 @@ -13,10 +13,10 @@ DBusConnection* conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - DBusMessage* msg = dbus_message_new_method_call("com.redhat.oddjob", - "/com/redhat/oddjob", - "com.redhat.oddjob", - "cluster_rw"); + DBusMessage* msg = dbus_message_new_method_call("com.redhat.ricci", + "/com/redhat/ricci", + "com.redhat.ricci", + "modlog_rw"); cout << "max msg size: " << dbus_connection_get_max_message_size(conn) << endl; /cvs/cluster/conga/ricci/ricci/d-bus/ricci.oddjob.conf,v --> standard output revision 1.1 --- conga/ricci/ricci/d-bus/ricci.oddjob.conf +++ - 2006-06-15 03:08:41.768391000 +0000 @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /cvs/cluster/conga/ricci/ricci/d-bus/ricci.systembus.conf,v --> standard output revision 1.1 --- conga/ricci/ricci/d-bus/ricci.systembus.conf +++ - 2006-06-15 03:08:41.877664000 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + +