Skip to content

Commit

Permalink
Install WSGI scripts to /usr/share/pulp/wsgi instead of /srv.
Browse files Browse the repository at this point in the history
  • Loading branch information
Randy Barlow committed Jan 13, 2016
1 parent 283b205 commit 9bc5a8a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pulp-dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
LINKS = (
('pulp_puppet_plugins/etc/httpd/conf.d/pulp_puppet.conf', '/etc/httpd/conf.d/pulp_puppet.conf'),
('pulp_puppet_plugins/etc/pulp/vhosts80/puppet.conf', '/etc/pulp/vhosts80/puppet.conf'),
('pulp_puppet_plugins/srv/pulp/puppet_forge.wsgi', '/srv/pulp/puppet_forge.wsgi'),
('pulp_puppet_plugins/usr/share/pulp/wsgi/puppet_forge.wsgi', '/usr/share/pulp/wsgi/puppet_forge.wsgi'),
# Puppet Support Admin Extensions
('pulp_puppet_extensions_admin/etc/pulp/admin/conf.d/puppet.conf', '/etc/pulp/admin/conf.d/puppet.conf'),
# handlers
Expand Down
6 changes: 3 additions & 3 deletions pulp-puppet.spec
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ pushd pulp_puppet_plugins
popd

mkdir -p %{buildroot}/%{_sysconfdir}/pulp/vhosts80
mkdir -p %{buildroot}/srv/pulp
mkdir -p %{buildroot}/%{_datadir}/pulp/wsgi
mkdir -p %{buildroot}/%{_var}/lib/pulp/published/puppet/http
mkdir -p %{buildroot}/%{_var}/lib/pulp/published/puppet/https

cp -R pulp_puppet_plugins/etc/httpd %{buildroot}/%{_sysconfdir}
cp pulp_puppet_plugins/etc/pulp/vhosts80/puppet.conf %{buildroot}/%{_sysconfdir}/pulp/vhosts80/
# WSGI app
cp -R pulp_puppet_plugins/srv/pulp/puppet_forge.wsgi %{buildroot}/srv/pulp/
cp -R pulp_puppet_plugins/usr/share/pulp/wsgi/puppet_forge.wsgi %{buildroot}%{_datadir}/pulp/wsgi
%endif # End pulp_server if block

pushd pulp_puppet_handlers
Expand Down Expand Up @@ -179,7 +179,7 @@ to provide Puppet specific support.
%{python_sitelib}/pulp_puppet/plugins/
%config(noreplace) %{_sysconfdir}/httpd/conf.d/pulp_puppet.conf
%{python_sitelib}/pulp_puppet_plugins*.egg-info
/srv/pulp/puppet_forge.wsgi
%{_datadir}/pulp/wsgi/puppet_forge.wsgi

%defattr(-,apache,apache,-)
%{_var}/lib/pulp/published/puppet/
Expand Down
8 changes: 4 additions & 4 deletions pulp_puppet_plugins/etc/httpd/conf.d/pulp_puppet.conf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RedirectMatch ^\/?pulp_puppet\/forge\/[^\/]+\/[^\/]+\/(?!api\/v1\/releases\.json
WSGIDaemonProcess pulp_forge user=apache group=apache processes=3 display-name=%{GROUP}
WSGIProcessGroup pulp_forge
WSGIApplicationGroup pulp_forge
WSGIScriptAlias /api/v1 /srv/pulp/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIScriptAlias /pulp_puppet/forge /srv/pulp/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIScriptAlias /v3 /srv/pulp/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIPassAuthorization On
WSGIScriptAlias /api/v1 /usr/share/pulp/wsgi/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIScriptAlias /pulp_puppet/forge /usr/share/pulp/wsgi/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIScriptAlias /v3 /usr/share/pulp/wsgi/puppet_forge.wsgi process-group=pulp_forge application-group=pulp_forge
WSGIPassAuthorization On

0 comments on commit 9bc5a8a

Please sign in to comment.