# HG changeset patch # User Michael Schloh von Bennewitz # Date 1347902014 -7200 # Node ID 67831a9de1683c871f8f482c29ad154bb0b1a34d # Parent a9cbdfa9697a2ed1f3581920fa970b815b7ace56 Correct pathnames and generally migrate buildconf from version 2 to 3. diff -r a9cbdfa9697a -r 67831a9de168 cfengine/cfengine.spec --- a/cfengine/cfengine.spec Mon Sep 17 19:12:11 2012 +0200 +++ b/cfengine/cfengine.spec Mon Sep 17 19:13:34 2012 +0200 @@ -74,10 +74,19 @@ %{l_shtool} subst \ -e 's;\(LIBS=.*\)-ltokyocabinet;\1`%{l_prefix}/bin/pkg-config --libs-only-l tokyocabinet`;' \ -e 's;\(LIBS=.*\)-lcrypto;\1`%{l_prefix}/bin/pkg-config --libs-only-l openssl`;' \ + -e "s;mandir=.\${datarootdir}/man.;;" \ + -e "s;mandir=.\${exec_prefix}/share/man.;;" \ configure %{l_shtool} subst \ -e 's;\(masterfilesdir = \$(projdatadir)\)/CoreBase;\1/cfengine;' \ masterfiles/Makefile.in + %{l_shtool} subst \ + -e 's;\(string *=>\) "/var/cfengine/masterfiles";\1 translatepath("$(sys.workdir)/masterfiles");' \ + -e 's;"/usr/local/sbin";"%{l_prefix}/bin";' \ + masterfiles/failsafe.cf + %{l_shtool} subst \ + -e 's;\(/var/cfengine/masterfiles\);%{l_prefix}\1;g' \ + src/bootstrap.c %build # configure package @@ -103,14 +112,30 @@ %install # install package %{l_shtool} mkdir -f -p -m 755 \ - $RPM_BUILD_ROOT%{l_prefix}/var/cfengine - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + $RPM_BUILD_ROOT%{l_prefix}/var/cfengine \ + $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase + %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT" + + # copy or move files to correct subdirectories + mv \ + $RPM_BUILD_ROOT%{l_prefix}/share/doc/examples \ + $RPM_BUILD_ROOT%{l_prefix}/share/cfengine + mv \ + $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/*.cf \ + $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase/ + cp \ + $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase/* \ + $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/masterfiles/ + cp -rp \ + $RPM_BUILD_ROOT%{l_prefix}/bin \ + $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/ # strip down installation rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib* >/dev/null 2>&1 || true rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir >/dev/null 2>&1 || true - strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + strip $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/bin/* >/dev/null 2>&1 || true # install run-command script %{l_shtool} mkdir -f -p -m 755 \ @@ -127,6 +152,7 @@ # determine installation files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ + '%config %{l_prefix}/var/cfengine/masterfiles/*' \ '%config %{l_prefix}/etc/fsl/fsl.cfengine' %files -f files @@ -138,4 +164,10 @@ if [ ! -f $RPM_INSTALL_PREFIX/var/cfengine/ppkeys/localhost.priv ]; then $RPM_INSTALL_PREFIX/bin/cf-key fi + ( echo "You must choose a policy server (hub) to use and supply the" + echo "corresponding IP address while bootstrapping CFEngine for it" + echo "to be useful:" + echo "" + echo " # $RPM_INSTALL_PREFIX/var/cfengine/bin/cf-agent --bootstrap --policy-server " + ) | %{l_rpmtool} msg -b -t notice diff -r a9cbdfa9697a -r 67831a9de168 cfengine/rc.cfengine --- a/cfengine/rc.cfengine Mon Sep 17 19:12:11 2012 +0200 +++ b/cfengine/rc.cfengine Mon Sep 17 19:13:34 2012 +0200 @@ -5,8 +5,9 @@ %config cfengine_enable="$openpkg_rc_def" - cfengine_cservd_flags="" - cfengine_cenvd_flags="" + cfengine_cfserverd_flags="" + cfengine_cfexecd_flags="" + cfengine_cfmonitord_flags="" cfengine_log_prolog="true" cfengine_log_epilog="true" cfengine_log_numfiles="10" @@ -14,15 +15,19 @@ cfengine_log_complevel="9" %common - cfengine_cfservd_pidfile="@l_prefix@/var/cfengine/cfservd.pid" - cfengine_cfenvd_pidfile="@l_prefix@/var/cfengine/cfenvd.pid" + cfengine_cfserverd_pidfile="@l_prefix@/var/cfengine/cf-serverd.pid" + cfengine_cfexecd_pidfile="@l_prefix@/var/cfengine/cf-execd.pid" + cfengine_cfmonitord_pidfile="@l_prefix@/var/cfengine/cf-monitord.pid" cfengine_signal () { - [ -f $cfengine_cfservd_pidfile ] \ - && kill -$1 `cat $cfengine_cfservd_pidfile` + [ -f $cfengine_cfserverd_pidfile ] \ + && kill -$1 `cat $cfengine_cfserverd_pidfile` local rc=$? - [ -f $cfengine_cfenvd_pidfile ] \ - && kill -$1 `cat $cfengine_cfenvd_pidfile` \ - && [ $rc -eq 0 ] + [ -f $cfengine_cfexecd_pidfile ] \ + && kill -$1 `cat $cfengine_cfexecd_pidfile` \ + || [ $rc -eq 0 ] + [ -f $cfengine_cfmonitord_pidfile ] \ + && kill -$1 `cat $cfengine_cfmonitord_pidfile` \ + || [ $rc -eq 0 ] } %status -u @l_susr@ -o @@ -37,24 +42,18 @@ %start -u @l_susr@ rcService cfengine enable yes || exit 0 rcService cfengine active yes && exit 0 - ( nohup @l_prefix@/sbin/cfservd \ - --no-fork $cfengine_cfservd_flags \ - /dev/null 2>&1 & - echo $! >$cfengine_cfservd_pidfile - ) >/dev/null 2>&1 - ( nohup @l_prefix@/sbin/cfenvd \ - --no-fork $cfengine_cfenvd_flags \ - /dev/null 2>&1 & - echo $! >$cfengine_cfenvd_pidfile - ) >/dev/null 2>&1 + @l_prefix@/var/cfengine/bin/cf-serverd $cfengine_cfserverd_flags + @l_prefix@/var/cfengine/bin/cf-execd $cfengine_cfexecd_flags + @l_prefix@/var/cfengine/bin/cf-monitord $cfengine_cfmonitord_flags %stop -u @l_susr@ rcService cfengine enable yes || exit 0 rcService cfengine active no && exit 0 cfengine_signal TERM sleep 2 - rm -f $cfengine_cfservd_pidfile 2>/dev/null || true - rm -f $cfengine_cfenvd_pidfile 2>/dev/null || true + rm -f $cfengine_cfserverd_pidfile 2>/dev/null || true + rm -f $cfengine_cfexecd_pidfile 2>/dev/null || true + rm -f $cfengine_cfmonitord_pidfile 2>/dev/null || true %restart -u @l_susr@ rcService cfengine enable yes || exit 0