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.

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

Jump to bottom

Fixes #16122: Stop listenning for inventories on port 80 #2572

Merged
merged 1 commit into from
Nov 6, 2019
Merged

Fixes #16122: Stop listenning for inventories on port 80 #2572

merged 1 commit into from
Nov 6, 2019

Conversation

amousset
Copy link
Member

@amousset amousset commented Nov 5, 2019

amousset
amousset commented Nov 5, 2019
View reviewed changes
relay/sources/apache/rudder-apache-relay-common.conf
@@ -1,12 +1,5 @@
DocumentRoot /var/www

<FilesMatch "\.(cgi|shtml|phtml|php)$">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see no reason behind this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed

peckpeck
peckpeck reviewed Nov 6, 2019
View reviewed changes
relay/sources/apache/rudder-apache-relay-common.conf
@@ -17,79 +10,3 @@ DocumentRoot /var/www
</IfModule>
</IfModule>

# Expose the server UUID through http
Alias /uuid /opt/rudder/etc/uuid.hive
<Directory /opt/rudder/etc>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this used by the inventory code ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to always use https in 5.0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also checked usage of relay API, we are using https or ${inventory_protocol} (which is https now) everywhere.

@Normation-Quality-Assistant
Copy link
Contributor

This PR breaks qa-test

-- stdout -- 
Branch 'branches/rudder/6.0' set up to track remote branch 'branches/rudder/6.0' from 'NRM'.
Your branch is up to date with 'NRM/branches/rudder/6.0'.
Already up to date.
Already up to date.
[...]
Switched to a new branch '6.0_test'
+ '[' --merge = --rust ']'
+ '[' --merge = --scala ']'
+ webapp/sources/rudder/rudder-core/src/test/resources/hooks.d/test-hooks.sh
+ export PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ PYTHONPATH=./relay/sources/rudder-pkg/lib/rudder-pkg/:./relay/sources/rudder-pkg/lib:
+ find . '!' -name convertOpenLDAPSchema.py -name '*.py'
+ xargs pylint -E --persistent=n --disable=C,R,import-error,no-member,no-name-in-module
No config file found, using default configuration

You should run ./qa-test in your repository to make sure it works.
You can also run rudder-dev merge https://github.com/Normation/rudder/pull/2572 --test to test with upmerging.
After this, you can remove the qa: Can't merge ta
-- Your faithful QA (https://ci.normation.com/jenkins/job/merge-accepted-pr/16765/console)

@amousset
Copy link
Member Author

amousset commented Nov 6, 2019

OK, merging this PR

@amousset amousset merged commit ab3da06 into Normation:branches/rudder/6.0 Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peckpeck peckpeck peckpeck approved these changes

Assignees
No one assigned
Labels
qa: Can't merge
Projects
None yet
Milestone
No milestone
3 participants
@amousset @Normation-Quality-Assistant @peckpeck