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
isaak yansane-sisk
slapos
Commits
83e98540
Commit
83e98540
authored
Jul 20, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: fix 401 http errors when no account exist
If no htpasswd file exist, redirect to account creation page
parent
86704f26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+8
-4
No files found.
software/slaprunner/common.cfg
View file @
83e98540
...
@@ -102,7 +102,7 @@ mode = 0644
...
@@ -102,7 +102,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/nginx_conf.in
url = ${:_profile_base_location_}/nginx_conf.in
download-only = true
download-only = true
md5sum =
00b902364c32ef21a28461716700fb2b
md5sum =
fac41d8819c17ebca78e4554932b1075
filename = nginx_conf.in
filename = nginx_conf.in
mode = 0644
mode = 0644
...
...
software/slaprunner/nginx_conf.in
View file @
83e98540
...
@@ -6,8 +6,8 @@ error_log {{ param_nginx_frontend['path_error_log'] }};
...
@@ -6,8 +6,8 @@ error_log {{ param_nginx_frontend['path_error_log'] }};
daemon off;
daemon off;
events {
events {
worker_connections 1024;
worker_connections 1024;
accept_mutex off;
accept_mutex off;
}
}
http {
http {
...
@@ -18,6 +18,7 @@ http {
...
@@ -18,6 +18,7 @@ http {
default upgrade;
default upgrade;
'' close;
'' close;
}
}
server {
server {
listen [{{ param_nginx_frontend['global-ip'] }}]:{{ param_nginx_frontend['global-port'] }} ssl;
listen [{{ param_nginx_frontend['global-ip'] }}]:{{ param_nginx_frontend['global-port'] }} ssl;
server_name _;
server_name _;
...
@@ -31,8 +32,12 @@ http {
...
@@ -31,8 +32,12 @@ http {
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
error_page 401 /login;
location / {
location / {
# When no .htpasswd exist, redirect the user to account creation page
if ( !-f {{ param_nginx_frontend['etc_dir'] }}/.htpasswd ) {
return 301 /setAccount ;
}
auth_basic "Restricted";
auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
proxy_redirect off;
proxy_redirect off;
...
@@ -52,7 +57,6 @@ http {
...
@@ -52,7 +57,6 @@ http {
proxy_pass http://unix:{{ socket }};
proxy_pass http://unix:{{ socket }};
}
}
location /shellinabox {
location /shellinabox {
proxy_pass http://unix:{{ shellinabox_socket }}:/;
proxy_pass http://unix:{{ shellinabox_socket }}:/;
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;
...
...
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