Skip to content

Commit 91ad15e

Browse files
olehermanseolehermanse
authored
Merge pull request #2343 from larsewi/package-cf-watchd
ENT-14193: Added cf-watchd binary to CFEngine packages
2 parents 641b4a0 + 5b0f3d0 commit 91ad15e

13 files changed

Lines changed: 26 additions & 7 deletions

File tree

‎packaging/cfengine-community/cfengine-community.spec.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
8181
# Create symlinks to /usr/local/sbin and /usr/sbin
8282
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
8383
mkdir -p $RPM_BUILD_ROOT/usr/sbin
84-
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
84+
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
8585
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
8686
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
8787
done
@@ -115,6 +115,7 @@ done
115115
%prefix/bin/cf-serverd
116116
%prefix/bin/cf-support
117117
%prefix/bin/cf-upgrade
118+
%prefix/bin/cf-watchd
118119
# Libraries
119120
%dir %prefix/lib
120121
%prefix/lib/lib*.so*
@@ -179,6 +180,7 @@ done
179180
/usr/local/sbin/cf-secret
180181
/usr/local/sbin/cf-serverd
181182
/usr/local/sbin/cf-support
183+
/usr/local/sbin/cf-watchd
182184

183185
# Symlinks to /usr/sbin (included in secure_path)
184186
/usr/sbin/cf-agent
@@ -192,6 +194,7 @@ done
192194
/usr/sbin/cf-secret
193195
/usr/sbin/cf-serverd
194196
/usr/sbin/cf-support
197+
/usr/sbin/cf-watchd
195198

196199
# Documentation
197200
%defattr(644,root,root,755)

‎packaging/cfengine-community/debian/cfengine-community.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/var/cfengine/bin/cf-serverd
1818
/var/cfengine/bin/cf-support
1919
/var/cfengine/bin/cf-upgrade
20+
/var/cfengine/bin/cf-watchd
2021
/var/cfengine/bin/getfacl
2122
/var/cfengine/lib/lib*.so.*
2223
/var/cfengine/lib/liblmdb.so

‎packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ chmod 755 $RPM_BUILD_ROOT%prefix/share/cf-support-nova-hub.sh
173173
# Create symlinks to /usr/local/sbin and /usr/sbin
174174
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
175175
mkdir -p $RPM_BUILD_ROOT/usr/sbin
176-
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
176+
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
177177
if [ -f $RPM_BUILD_ROOT%{prefix}/bin/$binary ]; then
178178
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
179179
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
@@ -221,6 +221,7 @@ exit 0
221221
%prefix/bin/cf-secret
222222
%prefix/bin/cf-serverd
223223
%prefix/bin/cf-support
224+
%prefix/bin/cf-watchd
224225
# Nova-only binaries
225226
%prefix/bin/cf-hub
226227
%prefix/bin/cf-reactor
@@ -363,6 +364,7 @@ exit 0
363364
/usr/local/sbin/cf-secret
364365
/usr/local/sbin/cf-serverd
365366
/usr/local/sbin/cf-support
367+
/usr/local/sbin/cf-watchd
366368
%if %{?rhel}%{!?rhel:0} >= 7
367369
/usr/local/sbin/cfbs
368370
%endif
@@ -381,6 +383,7 @@ exit 0
381383
/usr/sbin/cf-secret
382384
/usr/sbin/cf-serverd
383385
/usr/sbin/cf-support
386+
/usr/sbin/cf-watchd
384387
%if %{?rhel}%{!?rhel:0} >= 7
385388
/usr/sbin/cfbs
386389
%endif

‎packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/var/cfengine/bin/cf-secret
2222
/var/cfengine/bin/cf-serverd
2323
/var/cfengine/bin/cf-support
24+
/var/cfengine/bin/cf-watchd
2425
/var/cfengine/bin/rsync
2526
/var/cfengine/bin/cfengine3-nova-hub-init-d.sh
2627
/var/cfengine/bin/git

‎packaging/cfengine-nova/cfengine-nova.spec.aix.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
7373
%prefix/bin/cf-serverd
7474
%prefix/bin/cf-support
7575
%prefix/bin/cf-upgrade
76+
%prefix/bin/cf-watchd
7677
# Libraries
7778
%dir %prefix/lib
7879
%prefix/lib/lib*.so*

‎packaging/cfengine-nova/cfengine-nova.spec.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service
7676
# Create symlinks to /usr/local/sbin and /usr/sbin
7777
mkdir -p $RPM_BUILD_ROOT/usr/local/sbin
7878
mkdir -p $RPM_BUILD_ROOT/usr/sbin
79-
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
79+
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
8080
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary
8181
ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary
8282
done
@@ -128,6 +128,7 @@ exit 0
128128
%prefix/bin/cf-serverd
129129
%prefix/bin/cf-support
130130
%prefix/bin/cf-upgrade
131+
%prefix/bin/cf-watchd
131132
# Libraries
132133
%dir %prefix/lib
133134
%prefix/lib/lib*.so*
@@ -191,6 +192,7 @@ exit 0
191192
/usr/local/sbin/cf-secret
192193
/usr/local/sbin/cf-serverd
193194
/usr/local/sbin/cf-support
195+
/usr/local/sbin/cf-watchd
194196

195197
# Symlinks to /usr/sbin (included in secure_path)
196198
/usr/sbin/cf-agent
@@ -204,6 +206,7 @@ exit 0
204206
/usr/sbin/cf-secret
205207
/usr/sbin/cf-serverd
206208
/usr/sbin/cf-support
209+
/usr/sbin/cf-watchd
207210

208211
# Documentation
209212
%defattr(644,root,root,755)

‎packaging/cfengine-nova/cfengine-nova.wxs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
<Environment Id='Path' Name='Path' Value='[dir_bin]' Separator=';' Action='set' Part='last' System='yes' />
8888
<File Id='cf_serverd.exe' Name='cf-serverd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-serverd.exe' />
8989
</Component>
90+
<Component Id='cf_watchd.exe' Guid='D0017C79-0DE0-4AD6-99AC-55B2A84BF987' Win64='$(var.isWin64)'>
91+
<File Id='cf_watchd.exe' Name='cf-watchd.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\cf-watchd.exe' />
92+
</Component>
9093
<Component Id='diff.exe' Guid='A343B6FD-A0E9-468A-8678-84647C609DC6' Win64='$(var.isWin64)'>
9194
<File Id='diff.exe' Name='diff.exe' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\bin\diff.exe' />
9295
</Component>
@@ -201,6 +204,7 @@
201204
<ComponentRef Id='cf_promises.exe' />
202205
<ComponentRef Id='cf_runagent.exe' />
203206
<ComponentRef Id='cf_serverd.exe' />
207+
<ComponentRef Id='cf_watchd.exe' />
204208
<ComponentRef Id='cf_secret.exe' />
205209
<ComponentRef Id='cf_upgrade.exe' />
206210
<ComponentRef Id='mdb_copy.exe' />

‎packaging/cfengine-nova/debian/cfengine-nova.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/var/cfengine/bin/cf-secret
1818
/var/cfengine/bin/cf-support
1919
/var/cfengine/bin/cf-upgrade
20+
/var/cfengine/bin/cf-watchd
2021
/var/cfengine/lib/lib*.so.*
2122
/var/cfengine/lib/python/*
2223
/var/cfengine/lib/cfengine-enterprise.so

‎packaging/cfengine-nova/freebsd/pkg-plist.foot‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@unexec /bin/pkill -9 cf-execd > /dev/null 2>&1
1010
@unexec /bin/pkill -9 cf-monitord > /dev/null 2>&1
1111
@unexec /bin/pkill -9 cf-serverd > /dev/null 2>&1
12+
@unexec /bin/pkill -9 cf-watchd > /dev/null 2>&1
1213
@unexec /bin/pkill -9 cf-hub > /dev/null 2>&1
1314
@unexec /bin/pkill -9 cf-reactor > /dev/null 2>&1
1415
@unexec /bin/rm -rf /var/cfengine/rc.d > /dev/null 2>&1
@@ -25,3 +26,4 @@
2526
@unexec /bin/rm -f /var/cfengine/bin/cf-secret > /dev/null 2>&1
2627
@unexec /bin/rm -f /var/cfengine/bin/cf-serverd > /dev/null 2>&1
2728
@unexec /bin/rm -f /var/cfengine/bin/cf-support > /dev/null 2>&1
29+
@unexec /bin/rm -f /var/cfengine/bin/cf-watchd > /dev/null 2>&1

‎packaging/common/cfengine-hub/postinstall.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ fi
273273

274274
for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent \
275275
cf-hub cf-reactor \
276-
cf-net cf-check cf-support \
276+
cf-net cf-check cf-support cf-watchd \
277277
cfbs;
278278
do
279279
if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ] && [ -d /usr/local/sbin ]; then

0 commit comments

Comments
 (0)