Project

General

Profile

« Previous | Next » 

Revision c3a07d76

Added by Justin Sherrill almost 10 years ago

fixes #5845 - using new pulp httpd config files for 2.4

View differences:

templates/etc/httpd/conf.d/pulp_puppet.conf.erb
# -- HTTPS Repositories ---------
Alias /pulp/puppet /var/www/pulp_puppet/https/repos
Alias /pulp/puppet /var/www/pub/puppet/https/repos
<Directory /var/www/pulp_puppet/https/repos>
<Directory /var/www/pub/puppet/https/repos>
Options FollowSymLinks Indexes
</Directory>
# -- HTTP Repositories ----------
<Directory /var/www/pulp_puppet/http/repos>
<Directory /var/www/pub/puppet/http/repos>
Options FollowSymLinks Indexes
</Directory>
WSGIScriptAlias /api/v1 /srv/pulp/puppet_forge_api.wsgi
# -- Files Repositories ----------
Alias /pulp/puppet_files /var/www/pub/puppet/files
<Directory /var/www/pub/puppet/files>
SSLRequireSSL
SSLVerifyClient optional_no_ca
SSLVerifyDepth 2
SSLOptions +StdEnvVars +ExportCertData +FakeBasicAuth
Options FollowSymLinks Indexes
</Directory>
# The puppet module tool does url joins improperly. When we send it a path to a
# file like "/pulp/puppet/demo/system/releases/p/puppetlabs/puppetlabs-stdlib-3.1.0.tar.gz",
# it treats that like a relative path instead of absolute. The following redirect
# compensates for this. The only path that should be available under
# /pulp_puppet/forge/ is /pulp_puppet/forge/<consumer|repository>/consumer_id|repo_id>/api/v1/releases.json
# and so the following redirect will match any path that isn't the above.
RedirectMatch ^\/?pulp_puppet\/forge\/[^\/]+\/[^\/]+\/(?!api\/v1\/releases\.json)(.*)$ /$1
# for puppet < 3.3
WSGIScriptAlias /api/v1 /srv/pulp/puppet_forge_pre33_api.wsgi
# for puppet >= 3.3
WSGIScriptAlias /pulp_puppet/forge /srv/pulp/puppet_forge_post33_api.wsgi
WSGIPassAuthorization On
templates/etc/httpd/conf.d/pulp_rpm.conf.erb
SSLInsecureRenegotiation on
# -- HTTPS Repositories ---------
Alias /pulp/repos /var/www/pub/https/repos
Alias /pulp/repos /var/www/pub/yum/https/repos
<Directory /var/www/pub/https/repos>
# -- HTTPS Exports
Alias /pulp/exports /var/www/pub/yum/https/exports
<Directory /var/www/pub/yum/https>
WSGIAccessScript /srv/pulp/repo_auth.wsgi
......
</Directory>
# -- HTTP Repositories ---------
<Directory /var/www/pub/http/repos >
<Directory /var/www/pub/yum/http>
Options FollowSymLinks Indexes
</Directory>
......
Options FollowSymLinks Indexes
</Directory>
# -- HTTPS Exports
Alias /pulp/exports /var/www/pub/https/exports
<Directory /var/www/pub/https/exports>
WSGIAccessScript /srv/pulp/repo_auth.wsgi
SSLRequireSSL
SSLVerifyClient optional_no_ca
SSLVerifyDepth 2
SSLOptions +StdEnvVars +ExportCertData +FakeBasicAuth
Options FollowSymLinks Indexes
</Directory>
# --- HTTP Exports
<Directory /var/www/pub/http/exports >
Options FollowSymLinks Indexes
</Directory>
# -- GPG Keys -------------------
Alias /pulp/gpg /var/www/pub/gpg

Also available in: Unified diff