mirror of
https://github.com/YunoHost-Apps/galene_ynh.git
synced 2024-09-03 18:36:31 +02:00
fix
This commit is contained in:
parent
c779405842
commit
352a6c0602
3 changed files with 36 additions and 20 deletions
|
@ -1,3 +1,22 @@
|
||||||
|
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
|
||||||
|
location __PATH__/ {
|
||||||
|
|
||||||
|
proxy_pass http://127.0.0.1:__PORT__/;
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Host $server_name;
|
||||||
|
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
|
||||||
|
# Include SSOWAT user panel.
|
||||||
|
include conf.d/yunohost_panel.conf.inc;
|
||||||
|
}
|
||||||
|
|
||||||
location /auth/ {
|
location /auth/ {
|
||||||
|
|
||||||
proxy_pass http://127.0.0.1:__PORT_LDAP__/;
|
proxy_pass http://127.0.0.1:__PORT_LDAP__/;
|
||||||
|
@ -12,18 +31,3 @@ location /auth/ {
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "upgrade";
|
proxy_set_header Connection "upgrade";
|
||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
|
||||||
|
|
||||||
proxy_pass http://127.0.0.1:__PORT__/;
|
|
||||||
proxy_redirect off;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Host $server_name;
|
|
||||||
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
}
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ userdoc = "https://galene.org/faq.html"
|
||||||
code = "https://github.com/jech/galene"
|
code = "https://github.com/jech/galene"
|
||||||
|
|
||||||
[integration]
|
[integration]
|
||||||
yunohost = ">= 11.1.17"
|
yunohost = ">= 11.1.18"
|
||||||
architectures = "all"
|
architectures = "all"
|
||||||
multi_instance = false
|
multi_instance = false
|
||||||
ldap = true
|
ldap = true
|
||||||
|
@ -75,6 +75,12 @@ ram.runtime = "50M"
|
||||||
autoupdate.upstream = "https://github.com/jech/galene-ldap"
|
autoupdate.upstream = "https://github.com/jech/galene-ldap"
|
||||||
autoupdate.strategy = "latest_github_commit"
|
autoupdate.strategy = "latest_github_commit"
|
||||||
|
|
||||||
|
[resources.sources.transferarchive]
|
||||||
|
url = "https://github.com/jech/galene-file-transfer/archive/8ad893eb75de0fb25958a77183ab52d19430d27a.tar.gz"
|
||||||
|
sha256 = "afdf2ee4df933824b92cfb3aec1e733b38e46571d007377116fdf789db8b7bc6"
|
||||||
|
autoupdate.upstream = "https://github.com/jech/galene-file-tranfer"
|
||||||
|
autoupdate.strategy = "latest_github_commit"
|
||||||
|
|
||||||
[resources.system_user]
|
[resources.system_user]
|
||||||
|
|
||||||
[resources.install_dir]
|
[resources.install_dir]
|
||||||
|
|
|
@ -35,6 +35,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --dest_dir="$install_dir/build"
|
ynh_setup_source --dest_dir="$install_dir/build"
|
||||||
ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap"
|
ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap"
|
||||||
|
ynh_setup_source --dest_dir="$install_dir/build_transferarchive" --source_id="transferarchive"
|
||||||
|
|
||||||
mkdir -p "$install_dir/live/data"
|
mkdir -p "$install_dir/live/data"
|
||||||
mkdir -p "$install_dir/live_ldap/data"
|
mkdir -p "$install_dir/live_ldap/data"
|
||||||
|
@ -63,10 +64,6 @@ ynh_script_progression --message="Building app..." --weight=1
|
||||||
ynh_exec_warn_less ynh_install_go --go_version=$go_version
|
ynh_exec_warn_less ynh_install_go --go_version=$go_version
|
||||||
ynh_use_go
|
ynh_use_go
|
||||||
|
|
||||||
pushd $install_dir/build/galene-password-generator/
|
|
||||||
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd $install_dir/build/
|
pushd $install_dir/build/
|
||||||
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/
|
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live/
|
||||||
popd
|
popd
|
||||||
|
@ -75,9 +72,18 @@ pushd $install_dir/build_ldap/
|
||||||
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/
|
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -ldflags='-s -w' -o $install_dir/live_ldap/
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
pushd $install_dir/build/galene-password-generator/
|
||||||
|
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
|
||||||
|
popd
|
||||||
|
|
||||||
|
pushd $install_dir/build_transferarchive/
|
||||||
|
ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
|
||||||
|
popd
|
||||||
|
|
||||||
ynh_remove_go
|
ynh_remove_go
|
||||||
ynh_secure_remove --file="$install_dir/build/"
|
ynh_secure_remove --file="$install_dir/build/"
|
||||||
ynh_secure_remove --file="$install_dir/build_ldap/"
|
ynh_secure_remove --file="$install_dir/build_ldap/"
|
||||||
|
ynh_secure_remove --file="$install_dir/build_transferarchive/"
|
||||||
ynh_secure_remove --file="$install_dir/.cache/"
|
ynh_secure_remove --file="$install_dir/.cache/"
|
||||||
ynh_secure_remove --file="$install_dir/go/"
|
ynh_secure_remove --file="$install_dir/go/"
|
||||||
ynh_secure_remove --file="$install_dir/.go-version"
|
ynh_secure_remove --file="$install_dir/.go-version"
|
||||||
|
|
Loading…
Add table
Reference in a new issue