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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos
Commits
32b40ae2
Commit
32b40ae2
authored
Sep 02, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix in httpd.conf for git repositories paths
parent
e6ec959b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/httpd_conf.in
software/slaprunner/httpd_conf.in
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-1
No files found.
software/slaprunner/common.cfg
View file @
32b40ae2
...
@@ -43,7 +43,7 @@ mode = 0644
...
@@ -43,7 +43,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
2245e0f538b4c8e1ace71488038264ba
md5sum =
b5644037da14e79576840975415ee1a4
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -103,7 +103,7 @@ mode = 0644
...
@@ -103,7 +103,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/httpd_conf.in
url = ${:_profile_base_location_}/httpd_conf.in
download-only = true
download-only = true
md5sum =
ac92f32bd9a0d8c39657b80d4a80f5cc
md5sum =
444399390eb19c7e23dd06593c067b4d
filename = httpd_conf.in
filename = httpd_conf.in
mode = 0644
mode = 0644
...
...
software/slaprunner/httpd_conf.in
View file @
32b40ae2
...
@@ -80,10 +80,9 @@ ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
...
@@ -80,10 +80,9 @@ ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
RewriteCond %{REQUEST_URI} /git-receive-pack$
RewriteCond %{REQUEST_URI} /git-receive-pack$
RewriteRule ^/git/ - [E=AUTHREQUIRED:yes,E=GIT_PROJECT_ROOT:{{- parameters.project_private_folder -}}]
RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes,E=GIT_PROJECT_ROOT:{{- parameters.project_public_folder -}}]
<LocationMatch "^/git/">
<LocationMatch "^/git/">
SetEnv GIT_PROJECT_ROOT:{{- parameters.project_private_folder -}}
Order Deny,Allow
Order Deny,Allow
Deny from env=AUTHREQUIRED
Deny from env=AUTHREQUIRED
...
@@ -94,6 +93,7 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes,E=GIT_PROJECT_ROOT:{{- parameter
...
@@ -94,6 +93,7 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes,E=GIT_PROJECT_ROOT:{{- parameter
</LocationMatch>
</LocationMatch>
<LocationMatch "^/git-public/">
<LocationMatch "^/git-public/">
SetEnv GIT_PROJECT_ROOT:{{- parameters.project_public_folder -}}
Order Deny,Allow
Order Deny,Allow
Deny from env=AUTHREQUIRED
Deny from env=AUTHREQUIRED
...
...
software/slaprunner/instance-runner.cfg
View file @
32b40ae2
...
@@ -324,7 +324,7 @@ etc_dir = $${directory:etc}
...
@@ -324,7 +324,7 @@ etc_dir = $${directory:etc}
var_dir = $${directory:var}
var_dir = $${directory:var}
project_folder = $${directory:project}
project_folder = $${directory:project}
project_private_folder = $${runnerdirectory:private-project}
project_private_folder = $${runnerdirectory:private-project}
project_public_folder = $${runnerdirectory:p
rivate
-project}
project_public_folder = $${runnerdirectory:p
ublic
-project}
runner_home = $${runnerdirectory:home}
runner_home = $${runnerdirectory:home}
git_http_backend = ${git:location}/libexec/git-core/git-http-backend
git_http_backend = ${git:location}/libexec/git-core/git-http-backend
cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
...
...
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