Skip to content

ENT-14193: Added cf-watchd binary to CFEngine packages #2343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 1 commit into from
Jul 13, 2026
Merged

ENT-14193: Added cf-watchd binary to CFEngine packages #2343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packaging/cfengine-community/cfengine-community.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
# Create symlinks to /usr/local/sbin and /usr/sbin
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
mkdir -p $RPM_BUILD_ROOT/usr/sbin
for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support; do
for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
done
Expand Down Expand Up @@ -115,6 +115,7 @@ done
%prefix/bin/cf-serverd
%prefix/bin/cf-support
%prefix/bin/cf-upgrade
%prefix/bin/cf-watchd
# Libraries
%dir %prefix/lib
%prefix/lib/lib*.so*
Expand Down Expand Up @@ -179,6 +180,7 @@ done
/usr/local/sbin/cf-secret
/usr/local/sbin/cf-serverd
/usr/local/sbin/cf-support
/usr/local/sbin/cf-watchd

# Symlinks to /usr/sbin (included in secure_path)
/usr/sbin/cf-agent
Expand All @@ -192,6 +194,7 @@ done
/usr/sbin/cf-secret
/usr/sbin/cf-serverd
/usr/sbin/cf-support
/usr/sbin/cf-watchd

# Documentation
%defattr(644,root,root,755)
Expand Down
1 change: 1 addition & 0 deletions packaging/cfengine-community/debian/cfengine-community.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/var/cfengine/bin/cf-serverd
/var/cfengine/bin/cf-support
/var/cfengine/bin/cf-upgrade
/var/cfengine/bin/cf-watchd
/var/cfengine/bin/getfacl
/var/cfengine/lib/lib*.so.*
/var/cfengine/lib/liblmdb.so
Expand Down
5 changes: 4 additions & 1 deletion packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ chmod 755 $RPM_BUILD_ROOT%prefix/share/cf-support-nova-hub.sh
# Create symlinks to /usr/local/sbin and /usr/sbin
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
mkdir -p $RPM_BUILD_ROOT/usr/sbin
for binary in cf-agent cf-check cf-execd cf-hub cf-key cf-monitord cf-net cf-promises cf-reactor cf-runagent cf-secret cf-serverd cf-support cfbs; do
for binary in cf-agent cf-check cf-execd cf-hub cf-key cf-monitord cf-net cf-promises cf-reactor cf-runagent cf-secret cf-serverd cf-support cf-watchd cfbs; do
if [ -f $RPM_BUILD_ROOT%{prefix}/bin/$binary ]; then
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
Expand Down Expand Up @@ -221,6 +221,7 @@ exit 0
%prefix/bin/cf-secret
%prefix/bin/cf-serverd
%prefix/bin/cf-support
%prefix/bin/cf-watchd
# Nova-only binaries
%prefix/bin/cf-hub
%prefix/bin/cf-reactor
Expand Down Expand Up @@ -363,6 +364,7 @@ exit 0
/usr/local/sbin/cf-secret
/usr/local/sbin/cf-serverd
/usr/local/sbin/cf-support
/usr/local/sbin/cf-watchd
%if %{?rhel}%{!?rhel:0} >= 7
/usr/local/sbin/cfbs
%endif
Expand All @@ -381,6 +383,7 @@ exit 0
/usr/sbin/cf-secret
/usr/sbin/cf-serverd
/usr/sbin/cf-support
/usr/sbin/cf-watchd
%if %{?rhel}%{!?rhel:0} >= 7
/usr/sbin/cfbs
%endif
Expand Down
1 change: 1 addition & 0 deletions packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
/var/cfengine/bin/cf-secret
/var/cfengine/bin/cf-serverd
/var/cfengine/bin/cf-support
/var/cfengine/bin/cf-watchd
/var/cfengine/bin/rsync
/var/cfengine/bin/cfengine3-nova-hub-init-d.sh
/var/cfengine/bin/git
Expand Down
1 change: 1 addition & 0 deletions packaging/cfengine-nova/cfengine-nova.spec.aix.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
%prefix/bin/cf-serverd
%prefix/bin/cf-support
%prefix/bin/cf-upgrade
%prefix/bin/cf-watchd
# Libraries
%dir %prefix/lib
%prefix/lib/lib*.so*
Expand Down
5 changes: 4 additions & 1 deletion packaging/cfengine-nova/cfengine-nova.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
# Create symlinks to /usr/local/sbin and /usr/sbin
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
mkdir -p $RPM_BUILD_ROOT/usr/sbin
for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support; do
for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
done
Expand Down Expand Up @@ -128,6 +128,7 @@ exit 0
%prefix/bin/cf-serverd
%prefix/bin/cf-support
%prefix/bin/cf-upgrade
%prefix/bin/cf-watchd
# Libraries
%dir %prefix/lib
%prefix/lib/lib*.so*
Expand Down Expand Up @@ -191,6 +192,7 @@ exit 0
/usr/local/sbin/cf-secret
/usr/local/sbin/cf-serverd
/usr/local/sbin/cf-support
/usr/local/sbin/cf-watchd

# Symlinks to /usr/sbin (included in secure_path)
/usr/sbin/cf-agent
Expand All @@ -204,6 +206,7 @@ exit 0
/usr/sbin/cf-secret
/usr/sbin/cf-serverd
/usr/sbin/cf-support
/usr/sbin/cf-watchd

# Documentation
%defattr(644,root,root,755)
Expand Down
4 changes: 4 additions & 0 deletions packaging/cfengine-nova/cfengine-nova.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
<Environment Id='Path' Name='Path' Value='[dir_bin]' Separator=';' Action='set' Part='last' System='yes' />
<File Id='cf_serverd.exe' Name='cf-serverd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-serverd.exe' />
</Component>
<Component Id='cf_watchd.exe' Guid='D0017C79-0DE0-4AD6-99AC-55B2A84BF987' Win64='$(var.isWin64)'>
<File Id='cf_watchd.exe' Name='cf-watchd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-watchd.exe' />
</Component>
<Component Id='diff.exe' Guid='A343B6FD-A0E9-468A-8678-84647C609DC6' Win64='$(var.isWin64)'>
<File Id='diff.exe' Name='diff.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\diff.exe' />
</Component>
Expand Down Expand Up @@ -201,6 +204,7 @@
<ComponentRef Id='cf_promises.exe' />
<ComponentRef Id='cf_runagent.exe' />
<ComponentRef Id='cf_serverd.exe' />
<ComponentRef Id='cf_watchd.exe' />
<ComponentRef Id='cf_secret.exe' />
<ComponentRef Id='cf_upgrade.exe' />
<ComponentRef Id='mdb_copy.exe' />
Expand Down
1 change: 1 addition & 0 deletions packaging/cfengine-nova/debian/cfengine-nova.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/var/cfengine/bin/cf-secret
/var/cfengine/bin/cf-support
/var/cfengine/bin/cf-upgrade
/var/cfengine/bin/cf-watchd
/var/cfengine/lib/lib*.so.*
/var/cfengine/lib/python/*
/var/cfengine/lib/cfengine-enterprise.so
Expand Down
2 changes: 2 additions & 0 deletions packaging/cfengine-nova/freebsd/pkg-plist.foot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
@unexec /bin/pkill -9 cf-execd > /dev/null 2>&1
@unexec /bin/pkill -9 cf-monitord > /dev/null 2>&1
@unexec /bin/pkill -9 cf-serverd > /dev/null 2>&1
@unexec /bin/pkill -9 cf-watchd > /dev/null 2>&1
@unexec /bin/pkill -9 cf-hub > /dev/null 2>&1
@unexec /bin/pkill -9 cf-reactor > /dev/null 2>&1
@unexec /bin/rm -rf /var/cfengine/rc.d > /dev/null 2>&1
Expand All @@ -25,3 +26,4 @@
@unexec /bin/rm -f /var/cfengine/bin/cf-secret > /dev/null 2>&1
@unexec /bin/rm -f /var/cfengine/bin/cf-serverd > /dev/null 2>&1
@unexec /bin/rm -f /var/cfengine/bin/cf-support > /dev/null 2>&1
@unexec /bin/rm -f /var/cfengine/bin/cf-watchd > /dev/null 2>&1
2 changes: 1 addition & 1 deletion packaging/common/cfengine-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ fi

for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent \
cf-hub cf-reactor \
cf-net cf-check cf-support \
cf-net cf-check cf-support cf-watchd \
cfbs;
do
if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ] && [ -d /usr/local/sbin ]; then
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/cfengine-hub/postremove.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fi

if [ `os_type` != redhat ]; then
# These links are handled in .spec file for RedHat
for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support; do
for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support cf-watchd; do
rm -f /usr/local/sbin/$i || true
done
fi
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/cfengine-non-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [ -f $PREFIX/bin/cf-twin ]; then
fi

mkdir -p /usr/local/sbin
for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support;
for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd;
do
if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ]; then
# These links are handled in .spec file for RedHat
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/cfengine-non-hub/postremove.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ esac

if [ `os_type` != redhat ]; then
# These links are handled in .spec file for RedHat
for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support; do
for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd; do
rm -f /usr/local/sbin/$i || true
done
fi
Expand Down
Loading