From 1376044a5f7725b26aa1287aa0baada482810e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Sep 2022 23:05:55 +0200 Subject: [PATCH 1/6] script order --- scripts/install | 16 ++++++++-------- scripts/restore | 24 +++++++++++------------- scripts/upgrade | 16 ++++++++-------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/scripts/install b/scripts/install index d9f48fd..5010801 100755 --- a/scripts/install +++ b/scripts/install @@ -77,14 +77,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -93,6 +85,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index e462a8c..86cc834 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,13 +43,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -69,6 +62,14 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=5 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -77,14 +78,11 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= -# SPECIFIC RESTORATION +# RESTORE THE NGINX CONFIGURATION #================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=5 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index a01144d..fe8bd41 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,14 +64,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -87,6 +79,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # ADD A CONFIGURATION #================================================= From 7bece7ee85ea9aff19557bd5cc20bd46067e9b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Sep 2022 23:06:13 +0200 Subject: [PATCH 2/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 625ac89..6b3afbf 100644 --- a/manifest.json +++ b/manifest.json @@ -16,7 +16,7 @@ }, "license": "AGPL-3.0-only", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { From cd36bc4e25b75551a885569d29b5f6e80c6b0cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Sep 2022 23:06:24 +0200 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6b3afbf..86bc672 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative frontend for TikTok", "fr": "Frontend alternatif à TikTok" }, - "version": "2.4.2.0~ynh1", + "version": "2.4.2.0~ynh2", "url": "https://proxitok.herokuapp.com", "upstream": { "license": "AGPL-3.0-only", From c17cee0824039d3c18e034e8bf552c8265434fe7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Sep 2022 21:06:29 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d09f36..8812812 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Shipped version:** 2.4.2.0~ynh1 +**Shipped version:** 2.4.2.0~ynh2 **Demo:** https://proxitok.herokuapp.com/ diff --git a/README_fr.md b/README_fr.md index 9826fcc..0169158 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Version incluse :** 2.4.2.0~ynh1 +**Version incluse :** 2.4.2.0~ynh2 **Démo :** https://proxitok.herokuapp.com/ From 43fb14d0f74bde34154ec366e972e1c598ef07c5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Sep 2022 08:40:17 +0200 Subject: [PATCH 5/6] 2.4.2.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2fe8373..c6ef130 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.4.2.0.tar.gz -SOURCE_SUM=5edcf8525c94a4a61fd1e3a3793de284d814e56dd6592bee205aced665a63c4f +SOURCE_URL=https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.4.2.1.tar.gz +SOURCE_SUM=6dd9099fc29878f425599b8b880b77b53fa803e539fa4ae5479d7c0f28dc4b56 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 86bc672..f8d6624 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative frontend for TikTok", "fr": "Frontend alternatif à TikTok" }, - "version": "2.4.2.0~ynh2", + "version": "2.4.2.1~ynh1", "url": "https://proxitok.herokuapp.com", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 4eb1b6e..09281fd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="8.0" # Composer version -YNH_COMPOSER_VERSION="2.3.10" +YNH_COMPOSER_VERSION="2.4.2" # dependencies used by the app pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-curl" From 18271af354e3364899cede923a2206114cb7da75 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Sep 2022 06:40:22 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8812812..3f2fd8e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Shipped version:** 2.4.2.0~ynh2 +**Shipped version:** 2.4.2.1~ynh1 **Demo:** https://proxitok.herokuapp.com/ diff --git a/README_fr.md b/README_fr.md index 0169158..ff74a18 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Version incluse :** 2.4.2.0~ynh2 +**Version incluse :** 2.4.2.1~ynh1 **Démo :** https://proxitok.herokuapp.com/