From d445b714e89335efc9bb493f77fe5fe91db7f6b8 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 24 Mar 2022 21:46:45 +0700 Subject: [PATCH 1/7] Update config.yaml --- conf/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.yaml b/conf/config.yaml index b3457e5..1a1a5bf 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -49,6 +49,6 @@ connectors: staticClients: - id: __OIDC_NAME__ redirectURIs: - - __OIDC_CALLBACK__ + - https://__OIDC_CALLBACK__ name: __OIDC_NAME__ secret: __OIDC_SECRET__ From b6e043b5e1d99332804af7eb140503fea6a80164 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 08:31:25 +0700 Subject: [PATCH 2/7] Redirect to stdout --- scripts/install | 2 +- scripts/upgrade | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index ea54c61..0bcc85d 100755 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ pushd "$final_path" ynh_use_go "$ynh_go" env # Build server from source - make build + make build 2>&1 # Setup a nice Yunohost logo cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png popd diff --git a/scripts/upgrade b/scripts/upgrade index 6cee910..48afeba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,14 +85,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --time --weight=1 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config - #================================================= # SPECIFIC UPGRADE #================================================= @@ -104,10 +96,13 @@ ynh_script_progression --message="Building the sources (it will take some time). ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" - # Build the sources + # Setup go exe and environnement ynh_use_go - unset GOPATH - make build + "$ynh_go" env + # Build server from source + make build 2>&1 + # Setup a nice Yunohost logo + cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png popd ynh_remove_go From 24c1ce4f90552395f9656b85d7476c74684612fb Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 13:42:37 +0700 Subject: [PATCH 3/7] Update ynh_install_go --- scripts/ynh_install_go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ynh_install_go b/scripts/ynh_install_go index fbc412c..e8d248f 100644 --- a/scripts/ynh_install_go +++ b/scripts/ynh_install_go @@ -75,6 +75,8 @@ ynh_use_go () { pushd $final_path $goenv_install_dir/bin/goenv local $go_version popd + + "$ynh_go" env } # Install a specific version of Go From c03ed1c1761c32b61aa077415886982b6a84cbfb Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 13:48:47 +0700 Subject: [PATCH 4/7] Test --- scripts/install | 2 +- scripts/ynh_install_go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 0bcc85d..c4c933c 100755 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,7 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" # Setup go exe and environnement ynh_use_go - "$ynh_go" env + /opt/goenv/versions/1.17.8/bin/go env # Build server from source make build 2>&1 # Setup a nice Yunohost logo diff --git a/scripts/ynh_install_go b/scripts/ynh_install_go index e8d248f..fbc412c 100644 --- a/scripts/ynh_install_go +++ b/scripts/ynh_install_go @@ -75,8 +75,6 @@ ynh_use_go () { pushd $final_path $goenv_install_dir/bin/goenv local $go_version popd - - "$ynh_go" env } # Install a specific version of Go From b1d41f2b265987590b24fc97b6d8be06ecfc6501 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 13:50:46 +0700 Subject: [PATCH 5/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c4c933c..9de8e3f 100755 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,7 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" # Setup go exe and environnement ynh_use_go - /opt/goenv/versions/1.17.8/bin/go env + go env # Build server from source make build 2>&1 # Setup a nice Yunohost logo From f7e81b6579058c83714019937e249eb44b9f5a09 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 21:01:26 +0700 Subject: [PATCH 6/7] Linter --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 48afeba..0aafd75 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -140,7 +140,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="OpenID Connect Provider" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE From d4c08b2deeb1ab8408f4f6c2f17e31bef33b28c6 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 25 Mar 2022 21:16:51 +0700 Subject: [PATCH 7/7] Update --- scripts/install | 1 - scripts/upgrade | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 9de8e3f..8a51bfc 100755 --- a/scripts/install +++ b/scripts/install @@ -117,7 +117,6 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" # Setup go exe and environnement ynh_use_go - go env # Build server from source make build 2>&1 # Setup a nice Yunohost logo diff --git a/scripts/upgrade b/scripts/upgrade index 0aafd75..190e6ec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,6 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION pushd "$final_path" # Setup go exe and environnement ynh_use_go - "$ynh_go" env # Build server from source make build 2>&1 # Setup a nice Yunohost logo