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 #4074: Fix the Apache vhost after a merge failure #348

Merged
merged 1 commit into from Oct 15, 2013
Merged

Fixes #4074: Fix the Apache vhost after a merge failure #348

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: 4 additions & 0 deletions rudder-web/src/main/resources/rudder-apache-common.conf
View file
Open in desktop
Expand Up @@ -7,7 +7,11 @@
DocumentRoot /var/www

# Nice loading page if the Java server is not ready
Alias /images /opt/rudder/share/load-page/images
Alias /files /opt/rudder/share/load-page/files

Copy link
Author

Choose a reason for hiding this comment

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

This somehow got lost during rebase... breaks the loading page (no css)

Alias /rudder-loading.html /opt/rudder/share/load-page/rudder-loading.html

ErrorDocument 503 /rudder-loading.html

# Enforce permissive access to the load page directory
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/resources/rudder-vhost-ssl.conf
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
Allow from all
</Proxy>

Include /opt/rudder/etc/rudder-apache-vhost.conf
Include /opt/rudder/etc/rudder-apache-common.conf

# Logs
ErrorLog /var/log/rudder/apache2/error.log
Expand Down
2 changes: 1 addition & 1 deletion rudder-web/src/main/resources/rudder-vhost.conf
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
# Rule 2 - Redirect to HTTP/S
RewriteRule ^/(.*)$ https://%{SERVER_NAME}/$1 [R]

Include /opt/rudder/etc/rudder-apache-vhost.conf
Include /opt/rudder/etc/rudder-apache-common.conf

# Logs
ErrorLog /var/log/rudder/apache2/error.log
Expand Down