Skip to content

Fixes #27942: Remove the need for a WebDav password #6744

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

Draft
amousset wants to merge 1 commit into
base: branches/rudder/9.1
Choose a base branch
from
+0 −29
Draft

Fixes #27942: Remove the need for a WebDav password #6744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 0 additions & 29 deletions relay/sources/apache/rudder-apache-relay-ssl.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ Alias /common /var/rudder/share/common
# avoid repetitive warning in the logs caused by upper directory configuration
SSLUserName SSL_SESSION_ID
<RequireAll>
{% if cert_validation %}
Require expr "%{SSL_CLIENT_VERIFY} == 'SUCCESS'"
{% endif %}
<RequireAny>
Include /opt/rudder/etc/rudder-networks-24.conf
</RequireAny>
Expand All @@ -119,18 +117,11 @@ Alias /uuid /opt/rudder/etc/uuid.hive
Alias /inventories /var/rudder/inventories/incoming
<Directory /var/rudder/inventories/incoming>
DAV on
{% if not cert_validation %}
AuthName "WebDAV Storage"
AuthType Basic
AuthUserFile /opt/rudder/etc/htpasswd-webdav-initial
{% endif %}

<Limit PUT>
<RequireAll>
{% if cert_validation %}
Require expr "%{SSL_CLIENT_VERIFY} == 'SUCCESS'"
{% else %}
Require valid-user
{% endif %}
<RequireAny>
# rudder-networks-24.conf is automatically generated according to the hosts allowed by rudder.
Expand All @@ -148,19 +139,10 @@ Alias /inventories /var/rudder/inventories/incoming
Alias /inventory-updates /var/rudder/inventories/accepted-nodes-updates
<Directory /var/rudder/inventories/accepted-nodes-updates>
DAV on
{% if not cert_validation %}
AuthName "WebDAV Storage"
AuthType Basic
AuthUserFile /opt/rudder/etc/htpasswd-webdav
{% endif %}

<Limit PUT>
<RequireAll>
{% if cert_validation %}
Require expr "%{SSL_CLIENT_VERIFY} == 'SUCCESS'"
{% else %}
Require valid-user
{% endif %}
<RequireAny>
# rudder-networks-24.conf is automatically generated according to the hosts allowed by rudder.
Include /opt/rudder/etc/rudder-networks-24.conf
Expand All @@ -177,19 +159,10 @@ Alias /inventory-updates /var/rudder/inventories/accepted-nodes-updates
Alias /reports /var/rudder/reports/incoming
<Directory /var/rudder/reports/incoming>
DAV on
{% if not cert_validation %}
AuthName "WebDAV Storage"
AuthType Basic
AuthUserFile /opt/rudder/etc/htpasswd-webdav
{% endif %}

<Limit PUT>
<RequireAll>
{% if cert_validation %}
Require expr "%{SSL_CLIENT_VERIFY} == 'SUCCESS'"
{% else %}
Require valid-user
{% endif %}
<RequireAny>
Include /opt/rudder/etc/rudder-networks-24.conf
</RequireAny>
Expand Down Expand Up @@ -229,9 +202,7 @@ ProxyPass /rudder/relay-api/ http://127.0.0.1:3030/rudder/relay-api/1/

<Location /rudder/relay-api/shared-files>
<RequireAll>
{% if cert_validation %}
Require expr "%{SSL_CLIENT_VERIFY} == 'SUCCESS'"
{% endif %}
<RequireAny>
Include /opt/rudder/etc/rudder-networks-24.conf
</RequireAny>
Expand Down