YunoHost-Apps/anarchism_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/anarchism_ynh.git synced 2024-09-03 18:05:55 +02:00
Code Issues Activity Actions

Merge pull request #7 from YunoHost-Apps/15.3-3

Browse source 
15.3 3
This commit is contained in:
Kayou 2021-02-01 14:25:13 +01:00 committed by GitHub
commit 97cf4fde5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 91 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -1,7 +1,7 @@
# Anarchism for YunoHost # 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) [![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.png)](https://install-app.yunohost.org/?app=anarchism) [![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)* *[Lire ce readme en français.](./README_fr.md)*
@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview ## Overview
This is an anarchist FAQ. Its aim is to present what anarchism really stands for and indicate why you should become an anarchist. 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-2 **Shipped version:** 15.3-3
## Screenshots ## Screenshots
@ -29,8 +29,8 @@ This is an anarchist FAQ. Its aim is to present what anarchism really stands for
#### Multi-users support #### Multi-users support
Are LDAP and HTTP auth supported? **No** * Are LDAP and HTTP auth supported? **No**
Can the app be used by multiple users? **Yes** * Can the app be used by multiple users? **Yes**
#### Supported architectures #### Supported architectures
@ -40,7 +40,6 @@ Can the app be used by multiple users? **Yes**
## Links ## Links
* Report a bug: https://github.com/YunoHost-Apps/anarchism_ynh/issues * Report a bug: https://github.com/YunoHost-Apps/anarchism_ynh/issues
* App website: Link to the official website of this app
* Upstream app repository: https://salsa.debian.org/debian/anarchism/ * Upstream app repository: https://salsa.debian.org/debian/anarchism/
* YunoHost website: https://yunohost.org/ * YunoHost website: https://yunohost.org/

57
README_fr.md Normal file
View file

@ -0,0 +1,57 @@
# 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)
[![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)*
> *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.*
## 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
## Captures d'écran
![](https://salsa.debian.org/debian/anarchism/raw/debian/15.3-2/debian/anarchism.svg)
## Démo
* [Démo officielle](http://anarchism.pageabode.com/afaq/index.html)
## 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%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/anarchism/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/anarchism%20%28Apps%29.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
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.
```
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
```

3
check_process
View file

@ -18,11 +18,8 @@
upgrade=1 upgrade=1
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
incorrect_path=1
port_already_use=0 port_already_use=0
change_url=1 change_url=1
;;; Levels
Level 5=auto
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://salsa.debian.org/debian/anarchism/-/archive/debian/15.3-2/anarchism-debian-15.3-2.tar.gz SOURCE_URL=https://salsa.debian.org/debian/anarchism/-/archive/debian/15.3-3/anarchism-debian-15.3-3.tar.gz
SOURCE_SUM=b925d609c186cbf51bba5c035aae767e2758d54b738794d739c9aa3cfeb2f703 SOURCE_SUM=7d1d7b829774441ef4772f62eed90f4d2842f60f9825ea1cd1b33b473a3edeba
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

18
manifest.json
View file

@ -6,15 +6,15 @@
"en": "An exhaustive exploration of Anarchist theory and practice.", "en": "An exhaustive exploration of Anarchist theory and practice.",
"fr": "Exploration exhaustive de la théorie et de la pratique anarchiste." "fr": "Exploration exhaustive de la théorie et de la pratique anarchiste."
}, },
"version": "15.3-2~ynh1", "version": "15.3-3~ynh1",
"url": "https://salsa.debian.org/debian/anarchism/", "url": "https://salsa.debian.org/debian/anarchism/",
"licence": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"maintainer": { "maintainer": {
"name": "kay0u", "name": "kay0u",
"email": "pierre@kayou.io" "email": "pierre@kayou.io"
}, },
"requirements": { "requirements": {
"yunohost": ">= 3.5" "yunohost": ">= 3.8.1"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -26,8 +26,8 @@
"name": "domain", "name": "domain",
"type": "domain", "type": "domain",
"ask": { "ask": {
"en": "Choose a domain name for ynhexample", "en": "Choose a domain name for Anarchism",
"fr": "Choisissez un nom de domaine pour ynhexample" "fr": "Choisissez un nom de domaine pour Anarchism"
}, },
"example": "example.com" "example": "example.com"
}, },
@ -35,8 +35,8 @@
"name": "path", "name": "path",
"type": "path", "type": "path",
"ask": { "ask": {
"en": "Choose a path for ynhexample", "en": "Choose a path for Anarchism",
"fr": "Choisissez un chemin pour ynhexample" "fr": "Choisissez un chemin pour Anarchism"
}, },
"example": "/anarchism", "example": "/anarchism",
"default": "/anarchism" "default": "/anarchism"
@ -48,6 +48,10 @@
"en": "Is it a public application?", "en": "Is it a public application?",
"fr": "Est-ce une application publique ?" "fr": "Est-ce une application publique ?"
}, },
"help": {
"en": "If enabled, Anarchism will be accessible by people who do not have an account. This can be changed later via the webadmin.",
"fr": "Si cette case est cochée, Anarchism sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
},
"default": true "default": true
} }
] ]

11
scripts/backup
View file

@ -23,7 +23,7 @@ ynh_abort_if_errors
#================================================= #=================================================
# LOAD SETTINGS # LOAD SETTINGS
#================================================= #=================================================
ynh_script_progression --message="Loading installation settings..." --weight=1 ynh_print_info --message="Loading installation settings..."
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -31,18 +31,19 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
#================================================= #=================================================
# STANDARD BACKUP STEPS # DECLARE DATA AND CONF FILES TO BACKUP
#=================================================
ynh_print_info --message="Declaring files to be backed up..."
#================================================= #=================================================
# BACKUP THE APP MAIN DIR # BACKUP THE APP MAIN DIR
#================================================= #=================================================
ynh_script_progression --message="Backing up the main app directory..." --weight=1
ynh_backup --src_path="$final_path" ynh_backup --src_path="$final_path"
#================================================= #=================================================
# BACKUP THE NGINX CONFIGURATION # BACKUP THE NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Backing up nginx web server configuration..." --weight=1
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
@ -50,4 +51,4 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================
ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

4
scripts/change_url
View file

@ -50,7 +50,7 @@ fi
#================================================= #=================================================
# MODIFY URL IN NGINX CONF # MODIFY URL IN NGINX CONF
#================================================= #=================================================
ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
@ -81,7 +81,7 @@ fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

9
scripts/install
View file

@ -64,7 +64,7 @@ ynh_setup_source --dest_dir="$final_path"
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Configuring nginx web server..." --weight=1 ynh_script_progression --message="Configuring NGINX web server..." --weight=1
# Create a dedicated nginx config # Create a dedicated nginx config
ynh_add_nginx_config ynh_add_nginx_config
@ -81,19 +81,18 @@ chown -R root: $final_path
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
ynh_script_progression --message="Configuring SSOwat..." --weight=1 ynh_script_progression --message="Configuring permissions..." --weight=1
# Make app public if necessary # Make app public if necessary
if [ $is_public -eq 1 ] if [ $is_public -eq 1 ]
then then
# unprotected_uris allows SSO credentials to be passed anyway. ynh_permission_update --permission="main" --add="visitors"
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

2
scripts/remove
View file

@ -32,7 +32,7 @@ ynh_secure_remove --file="$final_path"
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
# Remove the dedicated nginx config # Remove the dedicated nginx config
ynh_remove_nginx_config ynh_remove_nginx_config

3
scripts/restore
View file

@ -68,9 +68,8 @@ chown -R root: $final_path
#================================================= #=================================================
# RELOAD NGINX AND PHP-FPM # RELOAD NGINX AND PHP-FPM
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=php7.0-fpm --action=reload
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload
#================================================= #=================================================

30
scripts/upgrade
View file

@ -43,7 +43,7 @@ fi
# If this folder exists, delete the old version of anarchism, and replace it with the new way to installing it. # If this folder exists, delete the old version of anarchism, and replace it with the new way to installing it.
if [ -d "/usr/share/doc/anarchism/html" ]; then if [ -d "/usr/share/doc/anarchism/html" ]; then
ynh_package_remove anarchism ynh_remove_app_dependencies anarchism
final_path=/var/www/$app final_path=/var/www/$app
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
fi fi
@ -68,18 +68,6 @@ ynh_clean_setup () {
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
#=================================================
# CHECK THE PATH
#=================================================
# Normalize the URL path syntax
# N.B. : this is for app installations before YunoHost 2.7
# where this value might be something like /foo/ or foo/
# instead of /foo ....
# If nobody installed your app before 2.7, then you may
# safely remove this line
path_url=$(ynh_normalize_url_path --path_url=$path_url)
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -97,7 +85,7 @@ fi
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1 ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated nginx config # Create a dedicated nginx config
ynh_add_nginx_config ynh_add_nginx_config
@ -111,22 +99,10 @@ ynh_add_nginx_config
# Set permissions on app files # Set permissions on app files
chown -R root: $final_path chown -R root: $final_path
#=================================================
# SETUP SSOWAT
#=================================================
ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# unprotected_uris allows SSO credentials to be passed anyway
ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
ynh_script_progression --message="Reloading nginx web server..." --weight=1 ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload