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
Jean-Paul Smets
slapos
Commits
a9aba585
Commit
a9aba585
authored
Aug 09, 2016
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: remove redirect the user to account creation page from nginx config
parent
445a6b90
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+0
-15
No files found.
software/slaprunner/common.cfg
View file @
a9aba585
...
@@ -110,7 +110,7 @@ recipe = hexagonit.recipe.download
...
@@ -110,7 +110,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
ignore-existing = true
url = ${:_profile_base_location_}/nginx_conf.in
url = ${:_profile_base_location_}/nginx_conf.in
download-only = true
download-only = true
md5sum =
94d83ef3eb89c2d75c8c079ab12b4518
md5sum =
2b06f7eb9a1d45d250d4b92a944db925
filename = nginx_conf.in
filename = nginx_conf.in
mode = 0644
mode = 0644
...
...
software/slaprunner/nginx_conf.in
View file @
a9aba585
...
@@ -35,21 +35,6 @@ http {
...
@@ -35,21 +35,6 @@ http {
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
location / {
location / {
# When no .htpasswd exist, redirect the user to account creation page
if ( !-f {{ param_nginx_frontend['etc_dir'] }}/.htpasswd ) {
# redirect URL is different wether nginx is accessed directly or behind apache.
# nginx does not support nested if or multiple conditions, so we use this well known hack.
set $test no_htpasswd;
}
if ( $host = [{{ param_nginx_frontend['global-ip'] }}] ) {
set $test "${test}_backend_access";
}
if ( $test = no_htpasswd) {
return 301 $scheme://$host/setAccount ;
}
if ( $test = no_htpasswd_backend_access) {
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;
...
...
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