diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 7ac92d4..a1c8e67 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # ProxiTok for YunoHost -[![Integration level](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Working status](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Working status](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![Install ProxiTok with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,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.9.2~ynh1 +**Shipped version:** 2.5.0.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 57cd8cd..a88d5c1 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # ProxiTok para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![Instalar ProxiTok con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Versión actual:** 2.4.9.2~ynh1 +**Versión actual:** 2.5.0.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index df9275a..7b320a4 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # ProxiTok YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![Instalatu ProxiTok YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Paketatutako bertsioa:** 2.4.9.2~ynh1 +**Paketatutako bertsioa:** 2.5.0.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8b2ee4c..d62a835 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # ProxiTok pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![Installer ProxiTok avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,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.9.2~ynh1 +**Version incluse :** 2.5.0.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index eb20c18..c53afd1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # ProxiTok para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![Instalar ProxiTok con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**Versión proporcionada:** 2.4.9.2~ynh1 +**Versión proporcionada:** 2.5.0.0~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..ff87c95 --- /dev/null +++ b/README_id.md @@ -0,0 +1,59 @@ + + +# ProxiTok untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) + +[![Pasang ProxiTok dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang ProxiTok secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Use Tiktok with an alternative frontend, inspired by Nitter. + +### Features + +- Privacy: All requests made to TikTok are server-side, so you will never connect to their servers +- See user's feed +- See trending and discovery tab +- See tags +- See video by id +- Themes +- RSS Feed for user, trending and tag (just add /rss to the url) + + +**Versi terkirim:** 2.5.0.0~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada ProxiTok](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug +atau +sudo yunohost app upgrade proxitok -u https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..f8163ff --- /dev/null +++ b/README_ru.md @@ -0,0 +1,59 @@ + + +# ProxiTok для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) + +[![Установите ProxiTok с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить ProxiTok быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Use Tiktok with an alternative frontend, inspired by Nitter. + +### Features + +- Privacy: All requests made to TikTok are server-side, so you will never connect to their servers +- See user's feed +- See trending and discovery tab +- See tags +- See video by id +- Themes +- RSS Feed for user, trending and tag (just add /rss to the url) + + +**Поставляемая версия:** 2.5.0.0~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана ProxiTok](./doc/screenshots/screenshot.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug +или +sudo yunohost app upgrade proxitok -u https://github.com/YunoHost-Apps/proxitok_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 13b123c..621fa75 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 ProxiTok -[![集成程度](https://dash.yunohost.org/integration/proxitok.svg)](https://dash.yunohost.org/appci/app/proxitok) ![工作状态](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/proxitok.svg)](https://ci-apps.yunohost.org/ci/apps/proxitok/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/proxitok.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/proxitok.maintain.svg) [![使用 YunoHost 安装 ProxiTok](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=proxitok) @@ -29,7 +29,7 @@ Use Tiktok with an alternative frontend, inspired by Nitter. - RSS Feed for user, trending and tag (just add /rss to the url) -**分发版本:** 2.4.9.2~ynh1 +**分发版本:** 2.5.0.0~ynh1 **演示:** diff --git a/config_panel.toml b/config_panel.toml.example similarity index 100% rename from config_panel.toml rename to config_panel.toml.example diff --git a/manifest.toml b/manifest.toml index 354c391..17675b8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ProxiTok" description.en = "Alternative frontend for TikTok" description.fr = "Frontend alternatif à TikTok" -version = "2.4.9.2~ynh1" +version = "2.5.0.0~ynh1" maintainers = [] @@ -16,7 +16,7 @@ demo = "https://proxitok.herokuapp.com/" code = "https://github.com/pablouser1/ProxiTok" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.27" architectures = "all" multi_instance = true ldap = false @@ -35,8 +35,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.4.9.2.tar.gz" - sha256 = "f39f3d2a720569b4967fb58bf35e08948231deaecc237bf37bae6927b6b69d3c" + url = "https://github.com/pablouser1/ProxiTok/archive/refs/tags/v2.5.0.0.tar.gz" + sha256 = "c0f23873519ed0cff9eeadeb212a64a672d7a7ab548386ef9b463c75b19fc743" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -51,4 +51,4 @@ ram.runtime = "50M" api.protected = true [resources.apt] - packages = "php8.2-xml php8.2-zip php8.2-redis php8.2-mbstring php8.2-curl" + packages = "php8.3-xml, php8.3-zip, php8.3-redis, php8.3-mbstring, php8.3-curl" diff --git a/scripts/backup b/scripts/backup index 18f83fe..c5c603d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 129b18c..4ba8cf7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # MODIFY URL IN NGINX CONF #================================================= diff --git a/scripts/install b/scripts/install index adbfb1d..46babd9 100755 --- a/scripts/install +++ b/scripts/install @@ -9,23 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 - -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -42,7 +25,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -52,7 +35,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app:$app "$install_dir/.env" diff --git a/scripts/upgrade b/scripts/upgrade index c236bc5..bc7e44c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,46 +9,13 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "$fpm_free_footprint" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "$fpm_usage" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" #--keep=".env" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" #--keep=".env" chown -R $app:www-data "$install_dir" @@ -58,7 +25,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -68,7 +35,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" +ynh_add_config --template=".env" --destination="$install_dir/.env" chmod 400 "$install_dir/.env" chown $app:$app "$install_dir/.env"