mirror of
https://github.com/YunoHost-Apps/gitlab_ynh.git
synced 2024-09-03 18:36:35 +02:00
Fix Nginx problem
This commit is contained in:
parent
0b52ed7eb3
commit
7422d5742e
5 changed files with 4 additions and 16 deletions
|
@ -1,4 +1,3 @@
|
||||||
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
|
||||||
location __PATH__/ {
|
location __PATH__/ {
|
||||||
proxy_pass http://localhost:__PORT__;
|
proxy_pass http://localhost:__PORT__;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
|
|
|
@ -23,17 +23,6 @@ else
|
||||||
your hardware and the result of the command \"uname -m\"." 1
|
your hardware and the result of the command \"uname -m\"." 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# CONFIGURE NGINX
|
|
||||||
#=================================================
|
|
||||||
config_nginx() {
|
|
||||||
if [ "$path_url" != "/" ]
|
|
||||||
then
|
|
||||||
ynh_replace_string "^#sub_path_only" "" "../conf/nginx.conf"
|
|
||||||
fi
|
|
||||||
ynh_add_nginx_config
|
|
||||||
}
|
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CREATE FOLDERS
|
# CREATE FOLDERS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -46,7 +35,7 @@ create_dir() {
|
||||||
#=================================================
|
#=================================================
|
||||||
config_gitlab() {
|
config_gitlab() {
|
||||||
create_dir
|
create_dir
|
||||||
|
|
||||||
gitlab_conf_path="$config_path/gitlab.rb"
|
gitlab_conf_path="$config_path/gitlab.rb"
|
||||||
|
|
||||||
ynh_backup_if_checksum_is_different $gitlab_conf_path
|
ynh_backup_if_checksum_is_different $gitlab_conf_path
|
||||||
|
|
|
@ -84,7 +84,7 @@ then
|
||||||
domain="$old_domain"
|
domain="$old_domain"
|
||||||
path_url="$new_path"
|
path_url="$new_path"
|
||||||
# Create a dedicated nginx config
|
# Create a dedicated nginx config
|
||||||
config_nginx
|
ynh_add_nginx_config
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Change the domain for nginx
|
# Change the domain for nginx
|
||||||
|
|
|
@ -70,7 +70,7 @@ ynh_app_setting_set $app unicorn_port $portUnicorn
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# Create a dedicated nginx config
|
# Create a dedicated nginx config
|
||||||
config_nginx
|
ynh_add_nginx_config
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CONFIGURE GITLAB
|
# CONFIGURE GITLAB
|
||||||
|
|
|
@ -55,7 +55,7 @@ path_url=$(ynh_normalize_url_path $path_url)
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
||||||
# Modify Nginx configuration file and copy it to Nginx conf directory
|
# Modify Nginx configuration file and copy it to Nginx conf directory
|
||||||
config_nginx
|
ynh_add_nginx_config
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CONFIGURE GITLAB
|
# CONFIGURE GITLAB
|
||||||
|
|
Loading…
Add table
Reference in a new issue