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
Kasra Jamshidi
slapos
Commits
bf6d4de2
Commit
bf6d4de2
authored
11 years ago
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix about basic auth to get closer from the wanted behaviour
parent
1ce017b8
master
1.0
apache-unified-frontend
arnau
cedric.ln-erp5-cluster
dream
drop_mt_index_in_BTreeFolder2
erp5
erp5-cluster
erp5-cluster-monitoring
erp5-component
erp5-component-libressl
erp5-component-subversion-1.7
erp5-component-subversion-1.8
erp5-postfix
erp5-rkm
erp5-scikit
erp5-z2.12
erp5_kernel_jupyter
frontend-monitor-slave-configuration
gcc-4.7
gitlab-test
gitlab-test-8.6.1
grid-computing
ipnb_st
ipython
ipython_notebook
ivan
jupyter_wendelin
kvm-iaas
monitor-stack
new-frontend
openblas-make-ext-options
palo
palo_etl_wip
patch-1
postgres
rafael_agent
re6st-master
reafs/heads/ipython
scikit-notmerge
shebang_limitation
shellinabox_password_promise_delay
slapos-master-cluster
slapprunner-shellinabox-wip
slaprunner
systematic
systematic-nginx
testnode_software_link
ttrm
webrunner.custom-personal
wendelin_notebook
1.0.33
1.0.32
1.0.31
1.0.30
1.0.29
1.0.28
1.0.27
1.0.26
1.0.25
1.0.24
1.0.23
1.0.22
1.0.21
1.0.20
1.0.19
1.0.18
1.0.17
1.0.16
1.0.15
1.0.14
1.0.13
1.0.12
1.0.11
1.0.10
1.0.9
1.0.8.1
1.0.8
1.0.7
1.0.6
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
vifib-20150331
vifib-20150203
vifib-20150130
vifib-20150123
vifib-20150116
vifib-20141222
slapos.cookbook-0.103
slapos.cookbook-0.102
slapos.cookbook-0.101
slapos.cookbook-0.100
slapos.cookbook-0.99
slapos.cookbook-0.98
slapos.cookbook-0.97
slapos.cookbook-0.96
slapos.cookbook-0.95
slapos.cookbook-0.94
slapos.cookbook-0.93
slapos.cookbook-0.92
slapos.cookbook-0.91
slapos.cookbook-0.90
slapos.cookbook-0.89
slapos.cookbook-0.88
slapos.cookbook-0.87
slapos.cookbook-0.86
slapos.cookbook-0.85
slapos-0.271
slapos-0.270
slapos-0.269
slapos-0.268
slapos-0.267
slapos-0.266
slapos-0.265
slapos-0.264
slapos-0.263
slapos-0.262
slapos-0.261
slapos-0.260
slapos-0.259.2
slapos-0.259.1
slapos-0.259
slapos-0.258
slapos-0.257
slapos-0.256
slapos-0.255
slapos-0.254
slapos-0.253.3
slapos-0.253.2
slapos-0.253.1
slapos-0.253
slapos-0.252.1
slapos-0.252
slapos-0.251
slapos-0.250.2
slapos-0.250.1
slapos-0.250
slapos-0.249.1
slapos-0.249
slapos-0.248.1
slapos-0.248
slapos-0.247
slapos-0.246
slapos-0.245
slapos-0.244
slapos-0.243
slapos-0.242
slapos-0.241
slapos-0.240.0
slapos-0.240
slapos-0.239
slapos-0.238
slapos-0.237
slapos-0.236
slapos-0.235
slapos-0.234
slapos-0.233
slapos-0.232
slapos-0.231
slapos-0.230
slapos-0.229
slapos-0.228
slapos-0.227
slapos-0.226
slapos-0.225
slapos-0.224
slapos-0.223.1
slapos-0.223
slapos-0.222
slapos-0.221
slapos-0.220
slapos-0.219
slapos-0.218.2
slapos-0.218.1
slapos-0.218
slapos-0.217
slapos-0.217-B1
slapos-0.216
slapos-0.215
slapos-0.214
slapos-0.213
slapos-0.212
slapos-0.211
slapos-0.210
slapos-0.209
slapos-0.208
slapos-0.207
slapos-0.206
slapos-0.205
slapos-0.204
slapos-0.203
slapos-0.202
slapos-0.201
slapos-0.200
slapos-0.199
slapos-0.199-hotfix-20140409
slapos-0.198
slapos-0.197
slapos-0.196
slapos-0.194-RC3
slapos-0.194-RC2
slapos-0.194-RC1
mr80_review_2
frontend_parameter_doc_review1
erp5-cluster-0.1.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+5
-8
No files found.
software/slaprunner/nginx_conf.in
View file @
bf6d4de2
...
...
@@ -55,11 +55,11 @@ http {
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
error_page 401
@
login;
error_page 401
/
login;
location / {
proxy_pass
http://{{ param_nginx_frontend['runner-ip'] }}:{{ param_nginx_frontend['runner-port'] }};
proxy_pass http://{{ param_nginx_frontend['runner-ip'] }}:{{ param_nginx_frontend['runner-port'] }};
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
auth_basic
"Restricted";
auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
proxy_redirect off;
proxy_buffering off;
...
...
@@ -70,7 +70,7 @@ http {
proxy_set_header X-Forwarded-Host $http_host;
}
location ~ ^(/login|/doLogin|/static|/setAccount|/configAccount|/slapgridResult) {
proxy_pass
http://{{ param_nginx_frontend['runner-ip'] }}:{{ param_nginx_frontend['runner-port'] }};
proxy_pass http://{{ param_nginx_frontend['runner-ip'] }}:{{ param_nginx_frontend['runner-port'] }};
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
...
...
@@ -83,7 +83,7 @@ http {
location /shellinabox {
proxy_pass http://[::1]:{{ shellinabox_port }}/;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
auth_basic
"Restricted";
auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
proxy_redirect off;
proxy_buffering off;
...
...
@@ -91,8 +91,5 @@ http {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location @login {
rewrite .* /login permanent;
}
}
}
This diff is collapsed.
Click to expand it.
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