Skip to content

ENT-14204: Package leech2 config at workdir .leech2 #2317

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

Open
larsewi wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −17
Open

ENT-14204: Package leech2 config at workdir .leech2 #2317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4892f61
Updated dependency 'leech2' from version 5.1.0 to 5.2.0
larsewi Jun 25, 2026
7fc0786
Package leech2 config at workdir .leech2 instead of state
larsewi Jun 25, 2026
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
4 changes: 2 additions & 2 deletions build-scripts/package-msi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ pre() {
esac

# Copy default leech2 config (ENT-14100)
install -d "$P"/state/.leech2
install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/state/.leech2/config.json "$P"/state/.leech2/
install -d "$P"/.leech2
install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/.leech2/config.json "$P"/.leech2/

# Copy WiX source file for MSI generation
cp "$BASEDIR"/buildscripts/packaging/cfengine-nova/cfengine-nova.wxs "$P"
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/leech2/cfbuild-leech2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define leech2_version 5.1.0
%define leech2_version 5.2.0

Summary: CFEngine Build Automation -- leech2
Name: cfbuild-leech2
Expand Down
2 changes: 1 addition & 1 deletion deps-packaging/leech2/distfiles
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f647ef8922b8a154e09a446da58c17fb44326c84fa14d2571e42fa6cfa2a5e31 leech2-5.1.0.tar.gz
b33711aeadf592c3b56dceda683191d83d23d9b0dbb2ef9b690004bcc5ed908d leech2-5.2.0.tar.gz
2 changes: 1 addition & 1 deletion deps-packaging/leech2/source
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/larsewi/leech2/releases/download/v5.1.0/
https://github.com/larsewi/leech2/releases/download/v5.2.0/
4 changes: 2 additions & 2 deletions 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 @@ -469,10 +469,10 @@ exit 0
%dir %prefix/outputs
%dir %prefix/inputs
%dir %prefix/state
%dir %prefix/state/.leech2
%dir %prefix/.leech2

# Mode must match the cfengine-nova package, which also ships this file
%defattr(600,root,root,700)
%prefix/state/.leech2/config.json
%prefix/.leech2/config.json

%changelog
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 @@ -36,6 +36,7 @@
/var/cfengine/lib/libpq.so
/var/cfengine/lib/libecpg.so
/var/cfengine/lib/libleech2.so
/var/cfengine/.leech2/config.json
/var/cfengine/bin/lch
/var/cfengine/lib/cfengine-*.so
/var/cfengine/lib/apr-util-1
Expand Down
4 changes: 2 additions & 2 deletions packaging/cfengine-nova/cfengine-nova.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ exit 0
%dir %prefix/inputs
%dir %prefix/modules
%dir %prefix/state
%dir %prefix/state/.leech2
%prefix/state/.leech2/config.json
%dir %prefix/.leech2
%prefix/.leech2/config.json


%changelog
12 changes: 5 additions & 7 deletions packaging/cfengine-nova/cfengine-nova.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,11 @@
<File Id='openssl.cnf' Name='openssl.cnf' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\ssl\openssl.cnf' />
</Component>
</Directory>
<!-- ===== Cfengine\state\.leech2 ===== -->
<Directory Id='dir_state' Name='state'>
<Directory Id='dir_state_leech2' Name='.leech2'>
<Component Id='leech2_config.json' Guid='1781E340-7772-4715-833D-DFAAE22A83EF' Win64='$(var.isWin64)'>
<File Id='leech2_config.json' Name='config.json' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\state\.leech2\config.json' />
</Component>
</Directory>
<!-- ===== Cfengine\.leech2 ===== -->
<Directory Id='dir_leech2' Name='.leech2'>
<Component Id='leech2_config.json' Guid='1781E340-7772-4715-833D-DFAAE22A83EF' Win64='$(var.isWin64)'>
<File Id='leech2_config.json' Name='config.json' KeyPath='yes' DiskId='1' Source='$(var.CfSourceDir)\.leech2\config.json' />
</Component>
</Directory>
</Directory>
</Directory>
Expand Down
2 changes: 1 addition & 1 deletion packaging/cfengine-nova/debian/cfengine-nova.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/var/cfengine/lib/liblmdb.so
/var/cfengine/lib/libleech2.so
/var/cfengine/bin/lch
/var/cfengine/state/.leech2/config.json
/var/cfengine/.leech2/config.json
/var/cfengine/share/doc
/var/cfengine/modules
/var/cfengine/inputs
Expand Down
Loading