Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
f0f25c14
Commit
f0f25c14
authored
Jun 14, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix git public and private url return 503
parent
ba48bbec
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/httpd_conf.in
software/slaprunner/httpd_conf.in
+1
-0
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+1
-0
No files found.
software/slaprunner/common.cfg
View file @
f0f25c14
...
@@ -54,7 +54,7 @@ mode = 0644
...
@@ -54,7 +54,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 =
66dba3331f49492d317e9c14d68d1bcb
md5sum =
a177a761d71257bec4d1ef1d2ee37ca4
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -119,7 +119,7 @@ recipe = hexagonit.recipe.download
...
@@ -119,7 +119,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
ignore-existing = true
url = ${:_profile_base_location_}/httpd_conf.in
url = ${:_profile_base_location_}/httpd_conf.in
download-only = true
download-only = true
md5sum =
505edf5a6a39edf0238bd42934503f1b
md5sum =
8067164fa87c7ca2c59d1625a34c5850
filename = httpd_conf.in
filename = httpd_conf.in
mode = 0644
mode = 0644
...
...
software/slaprunner/httpd_conf.in
View file @
f0f25c14
...
@@ -92,6 +92,7 @@ Alias /share {{ parameters.runner_home }}
...
@@ -92,6 +92,7 @@ Alias /share {{ parameters.runner_home }}
</Directory>
</Directory>
SetEnv GIT_HTTP_EXPORT_ALL
SetEnv GIT_HTTP_EXPORT_ALL
ScriptSock {{ parameters.cgid_sock }}
ScriptAlias /git/ {{ parameters.git_http_backend }}/
ScriptAlias /git/ {{ parameters.git_http_backend }}/
ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
...
...
software/slaprunner/instance-runner.cfg
View file @
f0f25c14
...
@@ -319,6 +319,7 @@ project_private_folder = $${runnerdirectory:private-project}
...
@@ -319,6 +319,7 @@ project_private_folder = $${runnerdirectory:private-project}
project_public_folder = $${runnerdirectory:public-project}
project_public_folder = $${runnerdirectory:public-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
cgid_sock = $${directory:run}/cgid.sock
#cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
#cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
httpd_cors_file = $${slaprunner-httpd-cors:location}
httpd_cors_file = $${slaprunner-httpd-cors:location}
...
...
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