Merge pull request #27 from YunoHost-Apps/main

log fix

ALL_README.md

@@ -1,7 +1,9 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [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_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Cors Proxy for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/cac-proxy.svg)](https://dash.yunohost.org/appci/app/cac-proxy) ![Working status](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Working status](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
 
 [![Install Cors Proxy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
 
@@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
 - Two engines: a lightweight and one based on chrome to support websites running javascript
 
 
-**Shipped version:** 1.2.1~ynh2
+**Shipped version:** 1.2.1~ynh4
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,54 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Cors Proxy para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+
+[![Instalar Cors Proxy con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarCors Proxy rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Cookie Aware Cors Proxy is an http proxy letting the browser itself manages cookies and redirects.
+Most other cores proxy directly respond to redirects, and doesn't send cookies, thus breaking the flow.
+
+With Cookie Aware Cors Proxy, you can call a website not supporting CORS from your own web application, and get the html result.
+
+### Features
+- Translates cookies and redirect locations from the target website to have the browser continue to call the proxy and not directly the website 
+- Extensive and dynamic support for log and debug information
+- Two engines: a lightweight and one based on chrome to support websites running javascript
+
+
+**Versión actual:** 1.2.1~ynh4
+
+## Capturas
+
+![Captura de Cors Proxy](./doc/screenshots/fnac-logs.png)
+
+## Documentaciones y recursos
+
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/gcollin/cookie-aware-cors-proxy>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/cac-proxy>
+- Reportar un error: <https://github.com/YunoHost-Apps/cac-proxy_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade cac-proxy -u https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Cors Proxy YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/cac-proxy.svg)](https://dash.yunohost.org/appci/app/cac-proxy) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
 
 [![Instalatu Cors Proxy YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
 
@@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
 - Two engines: a lightweight and one based on chrome to support websites running javascript
 
 
-**Paketatutako bertsioa:** 1.2.1~ynh2
+**Paketatutako bertsioa:** 1.2.1~ynh4
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Cors Proxy pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/cac-proxy.svg)](https://dash.yunohost.org/appci/app/cac-proxy) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
 
 [![Installer Cors Proxy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
 
@@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
 - Two engines: a lightweight and one based on chrome to support websites running javascript
 
 
-**Version incluse :** 1.2.1~ynh2
+**Version incluse :** 1.2.1~ynh4
 
 ## Captures d’écran
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Cors Proxy para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/cac-proxy.svg)](https://dash.yunohost.org/appci/app/cac-proxy) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
 
 [![Instalar Cors Proxy con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
 
@@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
 - Two engines: a lightweight and one based on chrome to support websites running javascript
 
 
-**Versión proporcionada:** 1.2.1~ynh2
+**Versión proporcionada:** 1.2.1~ynh4
 
 ## Capturas de pantalla
 

README_id.md

@@ -0,0 +1,54 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Cors Proxy untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+
+[![Pasang Cors Proxy dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Cors Proxy 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
+
+Cookie Aware Cors Proxy is an http proxy letting the browser itself manages cookies and redirects.
+Most other cores proxy directly respond to redirects, and doesn't send cookies, thus breaking the flow.
+
+With Cookie Aware Cors Proxy, you can call a website not supporting CORS from your own web application, and get the html result.
+
+### Features
+- Translates cookies and redirect locations from the target website to have the browser continue to call the proxy and not directly the website 
+- Extensive and dynamic support for log and debug information
+- Two engines: a lightweight and one based on chrome to support websites running javascript
+
+
+**Versi terkirim:** 1.2.1~ynh4
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Cors Proxy](./doc/screenshots/fnac-logs.png)
+
+## Dokumentasi dan sumber daya
+
+- Repositori kode aplikasi hulu: <https://github.com/gcollin/cookie-aware-cors-proxy>
+- Gudang YunoHost: <https://apps.yunohost.org/app/cac-proxy>
+- Laporkan bug: <https://github.com/YunoHost-Apps/cac-proxy_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade cac-proxy -u https://github.com/YunoHost-Apps/cac-proxy_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -3,9 +3,9 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Cors Proxy
+# YunoHost 上的 Cors Proxy
 
-[![集成程度](https://dash.yunohost.org/integration/cac-proxy.svg)](https://dash.yunohost.org/appci/app/cac-proxy) ![工作状态](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/cac-proxy.svg)](https://ci-apps.yunohost.org/ci/apps/cac-proxy/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/cac-proxy.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/cac-proxy.maintain.svg)
 
 [![使用 YunoHost 安装 Cors Proxy](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cac-proxy)
 
@@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo
 - Two engines: a lightweight and one based on chrome to support websites running javascript
 
 
-**分发版本：** 1.2.1~ynh2
+**分发版本：** 1.2.1~ynh4
 
 ## 截图
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Cors Proxy"
 description.en = "An advanced https proxy allowing you to call other websites from your own web application."
 description.fr = "Un proxy https avancé vous permettant d'appeler d'autres sites depuis votre propre application web."
 
-version = "1.2.1~ynh2"
+version = "1.2.1~ynh4"
 
 maintainers = ["Gerard Collin"]
 
@@ -16,7 +16,7 @@ license = "MIT"
 code = "https://github.com/gcollin/cookie-aware-cors-proxy"
 
 [integration]
-yunohost = ">= 11.0.0"
+yunohost = ">= 11.1.9"
 architectures = ["amd64"]
 multi_instance = false
 ldap = "not_relevant"

scripts/remove

@@ -28,8 +28,11 @@ ynh_remove_systemd_config
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-# Remove the log files
+
-ynh_secure_remove --file="/var/log/$app"
+
+
+
+
 
 _remove_restart_script_and_sudoers
 

scripts/restore

@@ -29,9 +29,6 @@ if [ -n "$public_key" ]; then
     _install_restart_script_and_sudoers
 fi
 
-mkdir --parents /var/log/$app
-chown $app:adm /var/log/$app
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
@@ -52,6 +49,8 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
+mkdir --parents /var/log/$app
+
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 yunohost service add $app --description="A Cors proxy letting the browser manages cookies and redirects." --log="/var/log/$app/$app.log"

scripts/upgrade

@@ -50,7 +50,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]; then
     ynh_script_progression --message="Upgrading source files..." --weight=6
 
     # Download, check integrity, uncompress and patch the source from amd64.src
-    ynh_setup_source --dest_dir="$install_dir/package"
+    ynh_setup_source --dest_dir="$install_dir/package" --full_replace=1
 fi
 
 chmod -R o-rwx "$install_dir"