Commit 030d0c69 authored by MARGERY David's avatar MARGERY David
Browse files

Reduce diff to master due to cherry-pick conflicts

parent 3d179c6c
# Copyright (c) 2009-2011 Cyril Rohr, INRIA Rennes - Bretagne Atlantique
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
Autotest.add_discovery { "rails" }
Autotest.add_discovery { "rspec2" }
......@@ -96,7 +96,7 @@ Listen 8080
<% sites.each_index do |site_index| %>
<Location /sites/<%= sites[site_index] %>/internal/oarapi>
RequestHeader set X-Api-Version "sid"
RequestHeader set Host "oar-api.<%= sites[site_index] %>.grid5000.fr"
RequestHeader set Host "api.grid5000.fr"
ProxyPreserveHost On
ProxyPass https://127.0.0.1:880<%= site_index+1 %>/sid/sites/<%= sites[site_index] %>/internal/oarapi retry=0
</Location>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment