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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
slapos
Commits
b55ec93f
Commit
b55ec93f
authored
Jul 02, 2013
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix hardcoded path in nginx_conf
parent
0d4f4011
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-1
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+1
-1
No files found.
software/slaprunner/instance-runner.cfg
View file @
b55ec93f
...
@@ -190,7 +190,8 @@ bin_nginx = ${nginx:location}/sbin/nginx
...
@@ -190,7 +190,8 @@ bin_nginx = ${nginx:location}/sbin/nginx
bin_launcher = $${directory:bin}/launcher
bin_launcher = $${directory:bin}/launcher
# Utils
# Utils
path_shell = ${dash:location}/bin/dash
path_shell = ${dash:location}/bin/dash
# Misc.
etc_dir = $${directory:etc}
[nginx_conf]
[nginx_conf]
...
...
software/slaprunner/nginx_conf.in
View file @
b55ec93f
...
@@ -30,7 +30,7 @@ http {
...
@@ -30,7 +30,7 @@ http {
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
location / {
location / {
auth_basic "Restricted";
auth_basic "Restricted";
auth_basic_user_file
/srv/slapgrid-erp5/slappart2/etc
/.htpasswd;
auth_basic_user_file
{{ param_nginx_frontend['etc_dir'] }}
/.htpasswd;
proxy_pass http://{{ param_nginx_frontend['backend-ip'] }}:{{ param_nginx_frontend['backend-port'] }};
proxy_pass http://{{ param_nginx_frontend['backend-ip'] }}:{{ param_nginx_frontend['backend-port'] }};
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_redirect off;
...
...
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