Skip to content
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.

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

Fixes #5532: Revert "package list-compatible-inputs in rudder-webapp pac... #481

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion rudder-webapp/SPECS/rudder-webapp.spec
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/rudder-vhos
cp %{_sourcedir}/rudder-sources/rudder/rudder-web/src/main/resources/apache2-sysconfig %{buildroot}/etc/sysconfig/rudder-apache
cp %{SOURCE2} %{buildroot}%{rudderdir}/jetty7/contexts/
cp %{SOURCE3} %{buildroot}%{rudderdir}/etc/
cp %{_sourcedir}/rudder-sources/ncf/tree/10_ncf_internals/list-compatible-inputs %{buildroot}%{rudderdir}/share/tools/list-compatible-inputs

%if 0%{?sles_version}
# On SLES, change the Apache DocumentRoot to the OS default
Expand Down
1 change: 0 additions & 1 deletion rudder-webapp/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ binary-arch: install
dh_install --SOURCEDIR=$(CURDIR)/BUILD/ rudder-vhost-ssl /etc/apache2/sites-available/
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder.xml /opt/rudder/jetty7/contexts/
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/ rudder-networks.conf /opt/rudder/etc/
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/ncf/tree/10_ncf_internals/ list-compatible-inputs /opt/rudder/share/tools/

# Install upgrade tools
dh_install --SOURCEDIR=$(CURDIR)/SOURCES/rudder-sources/rudder/rudder-core/src/main/resources/Migration/ dbMigration-2.4-2.4-set-migration-needed-flag-for-EventLog.sql /opt/rudder/share/upgrade-tools/
Expand Down