Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
6ad02f35
Commit
6ad02f35
authored
Jan 20, 2015
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix httpd configuration generation.
{{- parameters.project_public_folder -}} prevents newline.
parent
8c9a97bf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
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.
software/slaprunner/common.cfg
View file @
6ad02f35
...
...
@@ -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
...
...
software/slaprunner/httpd_conf.in
View file @
6ad02f35
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment