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

Jump to bottom

Improving webserver snippets for galaxy #271

Closed
wants to merge 1 commit into from
Closed

Improving webserver snippets for galaxy #271

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions roles/pulp-webserver/templates/nginx.conf.j2
View file
Open in desktop
Expand Up @@ -81,9 +81,5 @@ http {

include conf.d/*;

location / {
Copy link
Member

Choose a reason for hiding this comment

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

The removal of this rule will break static media for projects outside of galaxy_ng. To fix, can a /static/ route match to pulp-api be added here to replace /. That would be driven by the role variable that allows users to configure the static url.

Copy link
Member Author

Choose a reason for hiding this comment

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

sounds good, in this case I will have to update the galaxy snippets otherwise it would break due duplication of /static/ route

# checks for static file, if not found proxy to app
try_files $uri =404;
}
}
}
2 changes: 1 addition & 1 deletion roles/pulp-webserver/templates/pulp-vhost.conf.j2
View file
Open in desktop
Expand Up @@ -32,6 +32,6 @@ Define pulp-api {{ pulp_api_host }}:{{ pulp_api_port }}
ProxyPass /pulp/content http://${pulp-content}/pulp/content
ProxyPassReverse /pulp/content http://${pulp-content}/pulp/content

IncludeOptional pulp/*.conf
IncludeOptional pulp/*
Copy link
Member

Choose a reason for hiding this comment

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

I tested this when I introduced it and it worker for me. I'd like to test this part to see what's causing it to not work in your env before we merge.


</VirtualHost>