slaprunner: fix httpd configuration generation.

{{- parameters.project_public_folder -}} prevents newline.

slaprunner: fix httpd configuration generation.
{{- parameters.project_public_folder -}} prevents newline.
6ad02f35 · Cédric de Saint Martin · 8c9a97bf · 6ad02f35 · 6ad02f35
Commit 6ad02f35 authored Jan 20, 2015 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

software/slaprunner/common.cfg software/slaprunner/common.cfg +1 -1

software/slaprunner/httpd_conf.in software/slaprunner/httpd_conf.in +2 -2

No files found.
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -105,7 +105,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/httpd_conf.in
 download-only = true
-md5sum = 94bc5d6f1afc4e075d530fed496f47c2
+md5sum = b5d095f54f714d17dff12c0c5fe4afb7
 filename = httpd_conf.in
 mode = 0644


--- a/software/slaprunner/httpd_conf.in
+++ b/software/slaprunner/httpd_conf.in
@@ -90,7 +90,7 @@ RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
 RewriteCond %{REQUEST_URI} /git-receive-pack$

 <LocationMatch "^/git/">
-        SetEnv GIT_PROJECT_ROOT:{{- parameters.project_private_folder -}}
+        SetEnv GIT_PROJECT_ROOT:{{ parameters.project_private_folder }}
        Order Deny,Allow
        Deny from env=AUTHREQUIRED

@@ -101,7 +101,7 @@ RewriteCond %{REQUEST_URI} /git-receive-pack$
 </LocationMatch>

 <LocationMatch "^/git-public/">
-        SetEnv GIT_PROJECT_ROOT:{{- parameters.project_public_folder -}}
+        SetEnv GIT_PROJECT_ROOT:{{ parameters.project_public_folder }}
        Order Deny,Allow
        Deny from env=AUTHREQUIRED