Fixes #9862: Generation hooks are not packaged #1164
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I don't really like the |
| @@ -9,6 +9,7 @@ opt/rudder/etc/plugins | |||
| opt/rudder/share/tools | |||
| opt/rudder/share/plugins | |||
| opt/rudder/share/upgrade-tools | |||
| opt/rudder/hooks.d | |||
| @@ -207,6 +207,7 @@ mkdir -p %{buildroot}%{rudderdir}/share/plugins/ | |||
| mkdir -p %{buildroot}%{rudderdir}/share/upgrade-tools/ | |||
| mkdir -p %{buildroot}%{rudderdir}/share/certificates/ | |||
| mkdir -p %{buildroot}%{rudderdir}/share/selinux/ | |||
| mkdir -p %{buildroot}%{rudderdir}/hooks.d/ | |||
| @@ -249,6 +250,8 @@ cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/rudder-vhos | |||
| cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/rudder-vhost-ssl.conf %{buildroot}/etc/%{apache_vhost_dir}/rudder-vhost-ssl.conf | |||
| cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/apache2-sysconfig %{buildroot}/etc/sysconfig/rudder-apache | |||
|
|
|||
| cp -r %{_builddir}/rudder-sources/rudder/rudder-core/src/main/resources/hooks.d %{buildroot}%{rudderdir}/ | |||
| @@ -75,6 +75,7 @@ binary-arch: install | |||
| dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/ reportsInfo.xml /opt/rudder/etc/ | |||
| dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-web/src/main/resources/ load-page/ /opt/rudder/share/ | |||
| dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-web/src/main/resources/ rudder-apache-common.conf /opt/rudder/etc/ | |||
| dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/ hooks.d/ /opt/rudder/ | |||
|
Commit modified |
amousset
force-pushed
the
bug_9862/generation_hooks_are_not_packaged
branch
from
bec2ce1
to
2f04d4e
Compare
|
Commit modified |
amousset
force-pushed
the
bug_9862/generation_hooks_are_not_packaged
branch
from
2f04d4e
to
846092b
Compare
|
OK, merging this PR |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://www.rudder-project.org/redmine/issues/9862