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

Merge pull request #10 from YunoHost-Apps/testing

Browse source 
Update manifest, readme and fix php-fpm.ini error message
This commit is contained in:
antoine 2020-11-09 16:45:23 +01:00 committed by GitHub
commit d342b33dec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
README.md
View file

@ -2,8 +2,12 @@
![fluxbb_logo](sources/images/fluxbb_logo.png) ![fluxbb_logo](sources/images/fluxbb_logo.png)
[
![](https://dash.yunohost.org/integration/fluxbb.svg)
![](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg)
![](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg)
](https://dash.yunohost.org/appci/app/fluxbb)
[![Integration level](https://dash.yunohost.org/integration/FluxBB.svg)](https://dash.yunohost.org/appci/app/fluxbb)
[![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=fluxbb) [![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=fluxbb)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
@ -43,9 +47,8 @@ Can the app be used by multiple users? yes
#### Supported architectures #### Supported architectures
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/)
* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/fluxbb/)
## Limitations ## Limitations
@ -53,9 +56,9 @@ Can the app be used by multiple users? yes
## Additional information ## Additional information
* Other information you would add about this application * Other info you would like to add about this app.
**More information on the documentation page:** **More info on the documentation page:**
https://yunohost.org/packaging_apps https://yunohost.org/packaging_apps
## Links ## Links
@ -66,11 +69,11 @@ https://yunohost.org/packaging_apps
--- ---
Developers info Developer info
---------------- ----------------
**Only if you want to use a testing branch for coding, instead of merging directly into master.** **Only if you want to use a testing branch for coding, instead of merging directly into master.**
Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
``` ```

21
README_fr.md
View file

@ -2,14 +2,18 @@
![fluxbb_logo](sources/images/fluxbb_logo.png) ![fluxbb_logo](sources/images/fluxbb_logo.png)
[
![](https://dash.yunohost.org/integration/fluxbb.svg)
![](https://ci-apps.yunohost.org/ci/badges/fluxbb.status.svg)
![](https://ci-apps.yunohost.org/ci/badges/fluxbb.maintain.svg)
](https://dash.yunohost.org/appci/app/fluxbb)
[![Integration level](https://dash.yunohost.org/integration/FluxBB.svg)](https://dash.yunohost.org/appci/app/fluxbb)
[![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=fluxbb) [![Install FluxBB with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=fluxbb)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
> *Ce package vous permet d'installer FluxBB rapidement et simplement sur un serveur Yunohost. > *Ce package vous permet d'installer FluxBB 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.* Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
## Vue d'ensemble ## Vue d'ensemble
@ -36,16 +40,15 @@ Comment configurer cette application: via le panneau d'administration.
## Caractéristiques spécifiques YunoHost ## Caractéristiques spécifiques YunoHost
#### Support multi-utilisateurs #### Support multi-utilisateur
L'authentification LDAP et HTTP est-elle prise en charge? non L'authentification LDAP et HTTP est-elle prise en charge? non
L'application peut-elle être utilisée par plusieurs utilisateurs? oui L'application peut-elle être utilisée par plusieurs utilisateurs? oui
#### Supported architectures #### Architectures supportées
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/)
* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/fluxbb/)
## Limitations ## Limitations
@ -55,10 +58,10 @@ L'application peut-elle être utilisée par plusieurs utilisateurs? oui
* Change-url : une fois l'url modifiée, allez dans le panneau de configuration pour modifier le champ `Base URL` * Change-url : une fois l'url modifiée, allez dans le panneau de configuration pour modifier le champ `Base URL`
**Plus d'informations sur la page de documentation:** **Plus d'informations sur la page de documentation :**
https://yunohost.org/packaging_apps https://yunohost.org/packaging_apps
## Links ## Liens
* Signaler un bug: https://github.com/YunoHost-Apps/fluxbb_ynh/issues * Signaler un bug: https://github.com/YunoHost-Apps/fluxbb_ynh/issues
* Site de l'application: https://fluxbb.org/ * Site de l'application: https://fluxbb.org/

9
check_process
View file

@ -21,7 +21,8 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
#upgrade=1 from_commit=CommitHash # 1.5.11
upgrade=1 from_commit=6a8fea2965da32112d10a659637e3b1cd0b2c61c
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
incorrect_path=1 incorrect_path=1
@ -44,7 +45,7 @@
Email= Email=
Notification=none Notification=none
;;; Upgrade options ;;; Upgrade options
; commit=CommitHash ; commit=6a8fea2965da32112d10a659637e3b1cd0b2c61c
name=Name and date of the commit. name=1.5.11
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=en&is_public=1&password=password_fluxbb&port=666&

8
conf/php-fpm.conf
View file

@ -33,7 +33,7 @@ group = __USER__
; (IPv6 and IPv4-mapped) on a specific port; ; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket. ; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory. ; Note: This value is mandatory.
listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
; Set listen(2) backlog. ; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD) ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@ -419,9 +419,9 @@ chdir = __FINALPATH__
;php_admin_value[memory_limit] = 32M ;php_admin_value[memory_limit] = 32M
; Common values to change to increase file upload limit ; Common values to change to increase file upload limit
; php_admin_value[upload_max_filesize] = 50M php_admin_value[upload_max_filesize] = 50M
; php_admin_value[post_max_size] = 50M php_admin_value[post_max_size] = 50M
; php_admin_flag[mail.add_x_header] = Off php_admin_flag[mail.add_x_header] = Off
; Other common parameters ; Other common parameters
; php_admin_value[max_execution_time] = 600 ; php_admin_value[max_execution_time] = 600

10
conf/php-fpm.ini
View file

@ -1,10 +0,0 @@
; Common values to change to increase file upload limit
upload_max_filesize = 50M
post_max_size = 50M
mail.add_x_header = Off
; Other common parameters
; max_execution_time = 600
; max_input_time = 300
; memory_limit = 256M
; short_open_tag = On

12
manifest.json
View file

@ -3,14 +3,14 @@
"id": "fluxbb", "id": "fluxbb",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "FluxBB is fast, light, user-friendly forum software for your website.", "en": "A fast, light, user-friendly forum software",
"fr": "FluxBB est un forum de discussions écrit en PHP rapide et léger." "fr": "Un forum de discussions rapide et léger."
}, },
"version": "1.5.11", "version": "1.5.11~ynh1",
"url": "https://fluxbb.org/", "url": "https://fluxbb.org/",
"license": "GPL-2.0-only", "license": "GPL-2.0-only",
"maintainer": { "maintainer": {
"name": "antoine", "name": "Antoine",
"email": "antoine@miaou.org", "email": "antoine@miaou.org",
"url": "https://miaou.org" "url": "https://miaou.org"
}, },
@ -60,6 +60,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": "Visibility of the forum",
"fr": "La visibilité du forum"
},
"default": true "default": true
}, },
{ {

11
pull_request_template.md
View file

@ -11,11 +11,8 @@
- [ ] Upgrade from last version tested. - [ ] Upgrade from last version tested.
- [ ] Can be reviewed and tested. - [ ] Can be reviewed and tested.
## Validation ## Package_check results
--- ---
- [ ] **Code review** : *If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
- [ ] **Approval (LGTM)** :
- **CI succeeded** : [![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(USERNAME)/)
[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(-USER-)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(-USER-)/)
*Please replace '-NUM-' in this link by the PR number and -USER- by your user name on [Jenkins](https://ci-apps-dev.yunohost.org/jenkins/)*
When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

4
scripts/install
View file

@ -83,10 +83,10 @@ ynh_print_info "Configuring firewall..."
### - Remove the section "CLOSE A PORT" in the remove script ### - Remove the section "CLOSE A PORT" in the remove script
# Find a free port # Find a free port
port=$(ynh_find_port 8095) #port=$(ynh_find_port 8095)
# Open this port # Open this port
#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port #ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port
ynh_app_setting_set $app port $port #ynh_app_setting_set $app port $port
#================================================= #=================================================
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES

12
scripts/remove
View file

@ -17,7 +17,7 @@ ynh_print_info "Loading installation settings..."
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get $app domain) domain=$(ynh_app_setting_get $app domain)
port=$(ynh_app_setting_get $app port) #port=$(ynh_app_setting_get $app port)
db_name=$(ynh_app_setting_get $app db_name) db_name=$(ynh_app_setting_get $app db_name)
db_user=$db_name db_user=$db_name
final_path=$(ynh_app_setting_get $app final_path) final_path=$(ynh_app_setting_get $app final_path)
@ -95,11 +95,11 @@ ynh_print_info "Removing logrotate configuration"
# CLOSE A PORT # CLOSE A PORT
#================================================= #=================================================
if yunohost firewall list | grep -q "\- $port$" #if yunohost firewall list | grep -q "\- $port$"
then #then
ynh_print_info "Closing port $port" # ynh_print_info "Closing port $port"
ynh_exec_warn_less yunohost firewall disallow TCP $port # ynh_exec_warn_less yunohost firewall disallow TCP $port
fi #fi
#================================================= #=================================================
# SPECIFIC REMOVE # SPECIFIC REMOVE