move hubupdate.sh to libexec (#4000)

Author: mmetc

debian/crowdsec-hubupdate.service

@@ -4,5 +4,5 @@ Description=CrowdSec Hub update
 [Service]
 Type=oneshot
 Environment=LC_ALL=C LANG=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ExecStart=/usr/lib/crowdsec/hubupdate.sh
+ExecStart=/usr/libexec/crowdsec/hubupdate.sh
 

debian/rules

@@ -24,6 +24,9 @@ override_dh_auto_install:
 
 	mkdir -p debian/crowdsec/usr/lib/crowdsec/plugins/
 	mkdir -p debian/crowdsec/etc/crowdsec/notifications/
+	mkdir -p debian/crowdsec/usr/libexec/crowdsec/
+
+	# keep the plugin dir in /usr/lib/crowdsec as it's referenced in config.yaml
 
 	install -m 551 \
 		cmd/notification-slack/notification-slack \
@@ -52,7 +55,7 @@ override_dh_auto_install:
 	cp config/console.yaml debian/crowdsec/etc/crowdsec/console.yaml
 	cp -a config/patterns debian/crowdsec/etc/crowdsec
 	cp config/detect.yaml debian/crowdsec/var/lib/crowdsec/data/detect.yaml
-	install -m 755 debian/hubupdate.sh debian/crowdsec/usr/lib/crowdsec/hubupdate.sh
+	install -m 755 debian/hubupdate.sh debian/crowdsec/usr/libexec/crowdsec/hubupdate.sh
 
 override_dh_fixperms:
 	dh_fixperms

rpm/SPECS/crowdsec.spec

@@ -50,7 +50,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/plugins/
 
 install -m 755 -D cmd/crowdsec/crowdsec %{buildroot}%{_bindir}/%{name}
 install -m 755 -D cmd/crowdsec-cli/cscli %{buildroot}%{_bindir}/cscli
-install -m 755 -D debian/hubupdate.sh %{buildroot}%{_libdir}/%{name}/
+install -m 755 -D debian/hubupdate.sh %{buildroot}%{_libexecdir}/%{name}/
 install -m 644 -D debian/crowdsec.service %{buildroot}%{_unitdir}/%{name}.service
 install -m 644 -D debian/crowdsec-hubupdate.service %{buildroot}%{_unitdir}/%{name}-hubupdate.service
 install -m 644 -D debian/crowdsec-hubupdate.timer %{buildroot}%{_unitdir}/%{name}-hubupdate.timer
@@ -63,6 +63,8 @@ install -m 644 -D config/console.yaml %{buildroot}%{_sysconfdir}/crowdsec
 install -m 644 -D config/context.yaml %{buildroot}%{_sysconfdir}/crowdsec/console/
 install -m 644 -D %{SOURCE1} %{buildroot}%{_presetdir}
 
+# plugins could go to _libexecdir but we'll leave them in _libdir because it's referenced in config.yaml
+
 install -m 551 cmd/notification-slack/notification-slack %{buildroot}%{_libdir}/%{name}/plugins/
 install -m 551 cmd/notification-http/notification-http %{buildroot}%{_libdir}/%{name}/plugins/
 install -m 551 cmd/notification-splunk/notification-splunk %{buildroot}%{_libdir}/%{name}/plugins/
@@ -84,7 +86,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_bindir}/cscli
-%{_libdir}/%{name}/hubupdate.sh
+%{_libexecdir}/%{name}/hubupdate.sh
 %{_libdir}/%{name}/plugins/notification-slack
 %{_libdir}/%{name}/plugins/notification-http
 %{_libdir}/%{name}/plugins/notification-splunk