From aad038c61747cd5f60b7c72acf49f2006a88aafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Dec 2022 21:57:01 +0100 Subject: [PATCH 1/5] Update nginx.conf --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 95c0833..af39f1a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/html/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.html; # Include SSOWAT user panel. From 3003f86f859e567a9e6a085d63e5172750797711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Dec 2022 22:00:07 +0100 Subject: [PATCH 2/5] Create DISCLAIMER.md --- doc/DISCLAIMER.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/DISCLAIMER.md diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 From 0fe7b45a0399cb8a30068f6b550be810fd5ff3ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 11 Dec 2022 21:00:12 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 56 ++++++++++++++++++++-------------------------------- README_fr.md | 54 +++++++++++++++++++------------------------------- 2 files changed, 41 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 7f95c9d..bd2d2d6 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,43 @@ + + # Anarchism for YunoHost -[![Integration level](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) -[![Install anarchism with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=anarchism) +[![Integration level](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![Working status](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) +[![Install Anarchism with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=anarchism) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Anarchism quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *This package allows you to install Anarchism quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview + This is an anarchist FAQ. Its aim is to present what anarchism really stands for and indicate why you should become an anarchist. -**Shipped version:** 15.3-3 +**Shipped version:** 15.3-3~ynh3 ## Screenshots -![](https://salsa.debian.org/debian/anarchism/raw/debian/15.3-2/debian/anarchism.svg) +![Screenshot of Anarchism](./doc/screenshots/anarchism.gif) -## Demo +## Documentation and resources -* [Official demo](http://anarchism.pageabode.com/afaq/index.html) +* YunoHost documentation for this app: +* Report a bug: -## Documentation +## Developer info - * Official documentation: https://salsa.debian.org/debian/anarchism - -## YunoHost specific features - -#### Multi-users support - - * Are LDAP and HTTP auth supported? **No** - * Can the app be used by multiple users? **Yes** - -#### Supported architectures - -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/anarchism.svg)](https://ci-apps.yunohost.org/ci/apps/anarchism/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/anarchism.svg)](https://ci-apps-arm.yunohost.org/ci/apps/anarchism/) - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/anarchism_ynh/issues - * Upstream app repository: https://salsa.debian.org/debian/anarchism/ - * YunoHost website: https://yunohost.org/ - ---- - -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug or sudo yunohost app upgrade anarchism -u https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 96061cf..70f764c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,57 +1,43 @@ + + # Anarchism pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/anarchism.svg)](https://dash.yunohost.org/appci/app/anarchism) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/anarchism.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/anarchism.maintain.svg) [![Installer Anarchism avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=anarchism) -*[Read this readme in english.](./README.md)* +*[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Anarchism rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* +> *Ce package vous permet d'installer Anarchism rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble + Ceci est une FAQ anarchiste. Son objectif est de présenter ce que représente vraiment l'anarchisme et d'indiquer pourquoi vous devriez devenir anarchiste. -**Version incluse :** 15.3-3 +**Version incluse :** 15.3-3~ynh3 ## Captures d'écran -![](https://salsa.debian.org/debian/anarchism/raw/debian/15.3-2/debian/anarchism.svg) +![Capture d'écran de Anarchism](./doc/screenshots/anarchism.gif) -## Démo +## Documentations et ressources -* [Démo officielle](http://anarchism.pageabode.com/afaq/index.html) +* Documentation YunoHost pour cette app : +* Signaler un bug : -## Documentation - - * Documentation officielle : https://salsa.debian.org/debian/anarchism - -## Caractéristiques spécifiques YunoHost - -#### Support multi-utilisateur - -* L'authentification LDAP et HTTP est-elle prise en charge ? **Non** -* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** - -#### Architectures supportées - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/anarchism.svg)](https://ci-apps.yunohost.org/ci/apps/anarchism/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/anarchism.svg)](https://ci-apps-arm.yunohost.org/ci/apps/anarchism/) - -## Liens - - * Signaler un bug : https://github.com/YunoHost-Apps/anarchism_ynh/issues - * Dépôt de l'application principale : https://salsa.debian.org/debian/anarchism/ - * Site web YunoHost : https://yunohost.org/ - ---- - -## Developers info +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug ou sudo yunohost app upgrade anarchism -u https://github.com/YunoHost-Apps/anarchism_ynh/tree/testing --debug ``` + +**Plus d'infos sur le packaging d'applications :** From 0a4b7f51a0c4386e2bb9a41f2714c9f71967890a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Dec 2022 22:01:58 +0100 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/manifest.json b/manifest.json index 4e9ce03..8c73067 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,13 @@ }, "version": "15.3-3~ynh3", "url": "https://salsa.debian.org/debian/anarchism/", + "upstream": { + "license": "GPL-2.0-or-later", + "website": "https://salsa.debian.org/debian/anarchism/", + "demo": "http://anarchism.pageabode.com/afaq/index.html", + "admindoc": "https://salsa.debian.org/debian/anarchism", + "code": "https://salsa.debian.org/debian/anarchism/" + }, "license": "GPL-2.0-or-later", "maintainer": { "name": "kay0u", From 05a4d0d4b237488ecd7380d1f6e190a1347214e3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 11 Dec 2022 21:02:09 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 5 +++++ README_fr.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index bd2d2d6..2ae066d 100644 --- a/README.md +++ b/README.md @@ -19,12 +19,17 @@ This is an anarchist FAQ. Its aim is to present what anarchism really stands for **Shipped version:** 15.3-3~ynh3 +**Demo:** http://anarchism.pageabode.com/afaq/index.html + ## Screenshots ![Screenshot of Anarchism](./doc/screenshots/anarchism.gif) ## Documentation and resources +* Official app website: +* Official admin documentation: +* Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 70f764c..a862e96 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,12 +19,17 @@ Ceci est une FAQ anarchiste. Son objectif est de présenter ce que représente v **Version incluse :** 15.3-3~ynh3 +**Démo :** http://anarchism.pageabode.com/afaq/index.html + ## Captures d'écran ![Capture d'écran de Anarchism](./doc/screenshots/anarchism.gif) ## Documentations et ressources +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : * Signaler un bug :