mirror of
https://github.com/YunoHost-Apps/yeswiki_ynh.git
synced 2024-09-03 18:05:56 +02:00
Small typos
This commit is contained in:
ericgaspar
parent
f8e845efb6
commit
90981a56f6
9 changed files with 51 additions and 40 deletions
11
README.md
11
README.md
|
|
@ -12,9 +12,16 @@
|
|||
|
||||
## Overview
|
||||
|
||||
Quick description of this app.
|
||||
YesWiki is a wiki designed to remain simple, very easy to install, in French translated into English, Spanish, Catalan, Flemish...
|
||||
|
||||
**Shipped version:** Cercopitheque 2020-06-05
|
||||
However, with a YesWiki we can build a website with multiple uses:
|
||||
- Gather all the information of a project or a group (function of "central station")
|
||||
- Mapping members or places in a participatory way
|
||||
- Share resources, lists, calendars thanks to powerful cooperative databases
|
||||
- Communicate information flows
|
||||
- Cultivate a bit of freedom...
|
||||
|
||||
**Shipped version:** Doryphore 2020-10-2-1
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
|||
11
README_fr.md
11
README_fr.md
|
|
@ -1,5 +1,3 @@
|
|||
<img src="/images/yeswiki_logo.svg" height="80px" alt="logo de YesWiki">
|
||||
|
||||
# YesWiki pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/yeswiki)  
|
||||
|
|
@ -12,7 +10,14 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
## Vue d'ensemble
|
||||
|
||||
Description rapide de cette application.
|
||||
YesWiki est un wiki conçu pour rester simple, très facile à installer, en français traduit en anglais, espagnol, catalan, flamand...
|
||||
|
||||
Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multiples :
|
||||
- Rassembler toutes les infos d'un projet ou d'un groupe (fonction de "gare centrale")
|
||||
- Cartographier des membres ou des lieux de façon participative
|
||||
- Partager des ressources, des listes, des agendas grâce à des bases de données coopératives puissantes
|
||||
- Faire communiquer des flux d'informations
|
||||
- Cultiver un bout de liberté...
|
||||
|
||||
**Version incluse :** Doryphore 2020-10-2-1
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
"id": "yeswiki",
|
||||
"packaging_format": 1,
|
||||
"description": {
|
||||
"en": "Wiki that is quick and easy to use, with a nice design and a French-speaking support community.",
|
||||
"fr": "Wiki facile et rapide à prendre en main, avec un design agréable et une communauté d'entraide francophone."
|
||||
"en": "Wiki that is quick and easy to use.",
|
||||
"fr": "Wiki facile et rapide à prendre en main."
|
||||
},
|
||||
"version": "2020-10-2-1~ynh1",
|
||||
"url": "https://yeswiki.net/",
|
||||
"license": "free",
|
||||
"license": "AGPL-3.0-only",
|
||||
"maintainer": {
|
||||
"name": "Plumf",
|
||||
"email": "plumf@open-plug.eu",
|
||||
|
|
|
|||
|
|
@ -67,4 +67,4 @@ ynh_mysql_dump_db --database="$db_name" > db.sql
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
|
||||
ynh_print_info --message="Backup script completed for YesWiki. (YunoHost will then actually copy those files to the archive)."
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
|
|||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=3
|
||||
ynh_script_progression --message="Backing up YesWiki before changing its URL (may take a while)..." --weight=3
|
||||
|
||||
# Backup the current version of the app
|
||||
ynh_backup_before_upgrade
|
||||
|
|
@ -72,23 +72,23 @@ fi
|
|||
#=================================================
|
||||
# MODIFY URL IN NGINX CONF
|
||||
#=================================================
|
||||
ynh_script_progression --message="Updating nginx web server configuration..." --weight=5
|
||||
ynh_script_progression --message="Updating NGINX web server configuration..." --weight=5
|
||||
|
||||
nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
|
||||
|
||||
# Change the path in the nginx config file
|
||||
# Change the path in the NGINX config file
|
||||
if [ $change_path -eq 1 ]
|
||||
then
|
||||
# Make a backup of the original nginx config file if modified
|
||||
# Make a backup of the original NGINX config file if modified
|
||||
ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
|
||||
# Set global variables for nginx helper
|
||||
# Set global variables for NGINX helper
|
||||
domain="$old_domain"
|
||||
path_url="$new_path"
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
fi
|
||||
|
||||
# Change the domain for nginx
|
||||
# Change the domain for NGINX
|
||||
if [ $change_domain -eq 1 ]
|
||||
then
|
||||
# Delete file checksum for the old conf file location
|
||||
|
|
@ -111,7 +111,7 @@ ynh_replace_string --match_string="https://$old_domain${old_path%/}" --replace_s
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..." --weight=15
|
||||
ynh_script_progression --message="Reloading NGINX web server..." --weight=15
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
@ -119,4 +119,4 @@ ynh_systemd_action --service_name=nginx --action=reload
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Change of URL completed for $app" --last
|
||||
ynh_script_progression --message="Change of URL completed for YesWiki" --last
|
||||
|
|
|
|||
|
|
@ -79,9 +79,9 @@ ynh_setup_source --dest_dir="$final_path"
|
|||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring nginx web server..." --weight=34
|
||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=34
|
||||
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -95,9 +95,9 @@ ynh_system_user_create --username=$app
|
|||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring php-fpm..." --weight=40
|
||||
ynh_script_progression --message="Configuring PHP-FPM..." --weight=40
|
||||
|
||||
# Create a dedicated php-fpm config
|
||||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
|||
# SETUP APPLICATION WITH CURL
|
||||
#=================================================
|
||||
|
||||
# Set right permissions for curl install
|
||||
# Set right permissions for cURL install
|
||||
chown -R $app: $final_path
|
||||
|
||||
# Set the app as temporarily public for curl call
|
||||
|
|
@ -159,7 +159,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=47
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..." --weight=49
|
||||
ynh_script_progression --message="Reloading NGINX web server..." --weight=49
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
@ -167,4 +167,4 @@ ynh_systemd_action --service_name=nginx --action=reload
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Installation of $app completed" --last
|
||||
ynh_script_progression --message="Installation of YesWiki completed" --last
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
|
|||
#=================================================
|
||||
# REMOVE APP MAIN DIR
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing app main directory..." --weight=11
|
||||
ynh_script_progression --message="Removing YesWiki main directory..." --weight=11
|
||||
|
||||
# Remove the app directory securely
|
||||
ynh_secure_remove --file="$final_path"
|
||||
|
|
@ -43,17 +43,17 @@ ynh_secure_remove --file="$final_path"
|
|||
#=================================================
|
||||
# REMOVE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing nginx web server configuration..." --weight=12
|
||||
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=12
|
||||
|
||||
# Remove the dedicated nginx config
|
||||
# Remove the dedicated NGINX config
|
||||
ynh_remove_nginx_config
|
||||
|
||||
#=================================================
|
||||
# REMOVE PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Removing php-fpm configuration..." --weight=13
|
||||
ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=13
|
||||
|
||||
# Remove the dedicated php-fpm config
|
||||
# Remove the dedicated PHP-FPM config
|
||||
ynh_remove_fpm_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -70,4 +70,4 @@ ynh_system_user_delete --username=$app
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Removal of $app completed" --last
|
||||
ynh_script_progression --message="Removal of YesWiki completed" --last
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
# IMPORT GENERIC HELPERS
|
||||
#=================================================
|
||||
|
||||
#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
|
||||
source ../settings/scripts/_common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
|
|
@ -56,7 +55,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
|||
#=================================================
|
||||
# RESTORE THE APP MAIN DIR
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the app main directory..." --weight=4
|
||||
ynh_script_progression --message="Restoring YesWiki main directory..." --weight=4
|
||||
|
||||
ynh_restore_file --origin_path="$final_path"
|
||||
|
||||
|
|
@ -100,7 +99,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
|
|||
#=================================================
|
||||
# RELOAD NGINX AND PHP-FPM
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=20
|
||||
ynh_script_progression --message="Reloading NGINX web server and PHP-FPM.." --weight=20
|
||||
|
||||
ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
|
@ -109,4 +108,4 @@ ynh_systemd_action --service_name=nginx --action=reload
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Restoration completed for $app" --last
|
||||
ynh_script_progression --message="Restoration completed for YesWiki" --last
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ fi
|
|||
#=================================================
|
||||
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
||||
#=================================================
|
||||
ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=5
|
||||
ynh_script_progression --message="Backing up YesWiki before upgrading (may take a while)..." --weight=5
|
||||
|
||||
# Backup the current version of the app
|
||||
ynh_backup_before_upgrade
|
||||
|
|
@ -88,9 +88,9 @@ fi
|
|||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=15
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=15
|
||||
|
||||
# Create a dedicated nginx config
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
|
|
@ -134,7 +134,7 @@ ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=29
|
|||
#=================================================
|
||||
# RELOAD NGINX
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reloading nginx web server..." --weight=31
|
||||
ynh_script_progression --message="Reloading NGINX web server..." --weight=31
|
||||
|
||||
ynh_systemd_action --service_name=nginx --action=reload
|
||||
|
||||
|
|
@ -142,4 +142,4 @@ ynh_systemd_action --service_name=nginx --action=reload
|
|||
# END OF SCRIPT
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Upgrade of $app completed" --last
|
||||
ynh_script_progression --message="Upgrade of YesWiki completed" --last
|
||||
|
|
|
|||
Loading…
Reference in a new issue