Skip to content

Commit 05259b8

Browse files
Fix Debian and RPM packaging to properly install Lua and example files (#104)
* Fix Debian and RPM packaging to properly install Lua and example files - Fix debian/rules: Replace incorrect 'install -D ... -t' syntax with full destination paths. The -D flag requires a full destination path, not a target directory with -t flag. - Fix rpm spec: Correct examples directory path from %{_docdir}/examples to %{_docdir}/%{name}/examples to match actual installation paths. Add explicit lua directory creation and consistent file permissions. These fixes ensure that Lua files, example configs, and template files are properly installed in both Debian and RPM packages. * Add explicit permissions to Lua and example files in debian/rules Set -m 644 permissions for Lua files, example configs, and template files to match the RPM spec and ensure consistent file permissions across both packaging systems.
1 parent e1ccdbb commit 05259b8

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

debian/rules

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ override_dh_auto_install:
2323
BIN="/usr/bin/$$BOUNCER" CFG="/etc/crowdsec/bouncers" envsubst '$$BIN $$CFG' < "config/$$BOUNCER.service" > "debian/$$PKG/lib/systemd/system/$$BOUNCER.service"
2424
mkdir -p "debian/$$PKG/usr/lib/$$PKG/lua"; \
2525
mkdir -p "debian/$$PKG/usr/share/doc/$$PKG/examples"; \
26-
install -D "config/crowdsec.cfg" -t "debian/$$PKG/usr/share/doc/$$PKG/examples/"; \
27-
install -D "config/haproxy.cfg" -t "debian/$$PKG/usr/share/doc/$$PKG/examples/"; \
28-
install -D "lua/crowdsec.lua" -t "debian/$$PKG/usr/lib/$$PKG/lua/"; \
29-
install -D "lua/utils.lua" -t "debian/$$PKG/usr/lib/$$PKG/lua/"; \
30-
install -D "lua/template.lua" -t "debian/$$PKG/usr/lib/$$PKG/lua/"; \
26+
install -m 644 -D "config/crowdsec.cfg" "debian/$$PKG/usr/share/doc/$$PKG/examples/crowdsec.cfg"; \
27+
install -m 644 -D "config/haproxy.cfg" "debian/$$PKG/usr/share/doc/$$PKG/examples/haproxy.cfg"; \
28+
install -m 644 -D "lua/crowdsec.lua" "debian/$$PKG/usr/lib/$$PKG/lua/crowdsec.lua"; \
29+
install -m 644 -D "lua/utils.lua" "debian/$$PKG/usr/lib/$$PKG/lua/utils.lua"; \
30+
install -m 644 -D "lua/template.lua" "debian/$$PKG/usr/lib/$$PKG/lua/template.lua"; \
3131
mkdir -p "debian/$$PKG/var/lib/$$PKG/html"; \
32-
install -D "templates/ban.html" -t "debian/$$PKG/var/lib/$$PKG/html/"; \
33-
install -D "templates/captcha.html" -t "debian/$$PKG/var/lib/$$PKG/html/"; \
32+
install -m 644 -D "templates/ban.html" "debian/$$PKG/var/lib/$$PKG/html/ban.html"; \
33+
install -m 644 -D "templates/captcha.html" "debian/$$PKG/var/lib/$$PKG/html/captcha.html"; \
3434

3535
execute_after_dh_fixperms:
3636
@BOUNCER=crowdsec-spoa-bouncer; \

rpm/SPECS/crowdsec-haproxy-spoa-bouncer.spec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ BUILD_VERSION=%{local_version} make
3333
%install
3434
rm -rf %{buildroot}
3535
mkdir -p %{buildroot}%{_bindir}
36-
mkdir -p %{buildroot}%{_libdir}/%{name}
36+
mkdir -p %{buildroot}%{_libdir}/%{name}/lua
3737
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/html
38-
mkdir -p %{buildroot}%{_docdir}/examples
38+
mkdir -p %{buildroot}%{_docdir}/%{name}/examples
3939
install -m 755 -D %{binary_name} %{buildroot}%{_bindir}/%{binary_name}
4040
install -m 640 -D config/%{binary_name}.yaml %{buildroot}/etc/crowdsec/bouncers/%{binary_name}.yaml
4141
install -m 600 -D scripts/_bouncer.sh %{buildroot}/usr/lib/%{name}/_bouncer.sh
4242
install -m 644 -D config/crowdsec.cfg %{buildroot}/%{_docdir}/%{name}/examples/crowdsec.cfg
4343
install -m 644 -D config/haproxy.cfg %{buildroot}/%{_docdir}/%{name}/examples/haproxy.cfg
4444
mkdir -p %{buildroot}%{_unitdir}
4545
BIN=%{_bindir}/%{binary_name} CFG=/etc/crowdsec/bouncers envsubst '$BIN $CFG' < config/%{binary_name}.service > %{buildroot}%{_unitdir}/%{binary_name}.service
46-
install -D lua/crowdsec.lua %{buildroot}/usr/lib/%{name}/lua/crowdsec.lua
47-
install -D lua/utils.lua %{buildroot}/usr/lib/%{name}/lua/utils.lua
48-
install -D lua/template.lua %{buildroot}/usr/lib/%{name}/lua/template.lua
49-
install -D templates/ban.html %{buildroot}%{_localstatedir}/lib/%{name}/html/ban.html
50-
install -D templates/captcha.html %{buildroot}%{_localstatedir}/lib/%{name}/html/captcha.html
46+
install -m 644 -D lua/crowdsec.lua %{buildroot}/usr/lib/%{name}/lua/crowdsec.lua
47+
install -m 644 -D lua/utils.lua %{buildroot}/usr/lib/%{name}/lua/utils.lua
48+
install -m 644 -D lua/template.lua %{buildroot}/usr/lib/%{name}/lua/template.lua
49+
install -m 644 -D templates/ban.html %{buildroot}%{_localstatedir}/lib/%{name}/html/ban.html
50+
install -m 644 -D templates/captcha.html %{buildroot}%{_localstatedir}/lib/%{name}/html/captcha.html
5151

5252
%clean
5353
rm -rf %{buildroot}

0 commit comments

Comments
 (0)