1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/bookstack_ynh.git synced 2024-09-03 18:16:02 +02:00

Revert "Testing (#19)"

This reverts commit 78c6863a6d.
This commit is contained in:
ericgaspar 2021-04-15 09:27:17 +02:00
parent 78c6863a6d
commit c0e0ca20e1
9 changed files with 62 additions and 49 deletions

View file

@ -13,7 +13,7 @@ BookStack is a simple, self-hosted, easy-to-use platform for organising and stor
BookStack is built using PHP, on top of the Laravel framework and it uses MySQL to store data.
**Shipped version:** 21.04
**Shipped version:** 0.31.7
## Screenshots
@ -32,7 +32,7 @@ For the first time Login, use the default credentials `admin@admin.com` and `pas
## Documentation
* Official documentation: https://www.bookstackapp.com/docs/
* YunoHost documentation: https://yunohost.org/en/app_bookstack
* YunoHost documentation: https://yunohost.org/#/app_bookstack
## YunoHost specific features
@ -43,8 +43,8 @@ For the first time Login, use the default credentials `admin@admin.com` and `pas
#### Supported architectures
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/bookstack.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/bookstack.svg)](https://ci-apps-arm.yunohost.org/ci/apps/bookstack/)
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/bookstack/)
## Limitations

View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
## Overview
BookStack est une plate-forme simple, auto-hébergée et facile à utiliser pour organiser et stocker des informations.
**Version incluse :** 21.04
**Version incluse :** 0.31.7
## Screenshots
@ -30,7 +30,7 @@ Login using the default admin details `admin@admin.com` with a password of `pass
## Documentation
* Documentation officielle : https://www.bookstackapp.com/docs/
* Documentation YunoHost : https://yunohost.org/fr/app_bookstack
* Documentation YunoHost : https://yunohost.org/#/app_bookstack_fr
## Caractéristiques spécifiques YunoHost
@ -41,8 +41,8 @@ Login using the default admin details `admin@admin.com` with a password of `pass
#### Architectures supportées
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/bookstack.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/bookstack.svg)](https://ci-apps-arm.yunohost.org/ci/apps/bookstack/)
* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/bookstack/)
## Limitations

View file

@ -17,7 +17,8 @@
upgrade=1
upgrade=1 from_commit=a1db7396ceab19640e68d6a8cc05befd1f9c07ad
backup_restore=1
multi_instance=0
multi_instance=1
port_already_use=0
change_url=0
;;; Options
Email=
@ -26,3 +27,4 @@ Notification=none
; commit=a1db7396ceab19640e68d6a8cc05befd1f9c07ad
name=Testing (#11)
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v21.04.tar.gz
SOURCE_SUM=b0a9b8229a1983e0e8349f7ab63bfa4ea86c2a28de2f6c46463e5547e1077646
SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/v0.31.7.tar.gz
SOURCE_SUM=6c832378ec245a8af282c11643c8f1fe9b1786eb8cabcae2f2ef30aa08844db0
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true

View file

@ -6,7 +6,7 @@
"en": "Platform to create documentation/wiki content",
"fr": "Plateforme pour créer du contenu de documentation/wiki "
},
"version": "21.04~ynh1",
"version": "0.31.7~ynh1",
"url": "https://www.bookstackapp.com/",
"license": "MIT",
"maintainer": {
@ -14,9 +14,9 @@
"email": "liberodark@gmail.com"
},
"requirements": {
"yunohost": ">= 4.1.7"
"yunohost": ">= 4.1.0"
},
"multi_instance": false,
"multi_instance": true,
"services": [
"nginx",
"php7.3-fpm",
@ -26,11 +26,19 @@
"install": [{
"name": "domain",
"type": "domain",
"ask": {
"en": "Choose a domain name for BookStack",
"fr": "Choisissez un nom de domaine pour BookStack"
},
"example": "example.com"
},
{
"name": "path",
"type": "path",
"ask": {
"en": "Choose a path for BookStack",
"fr": "Choisissez un chemin pour BookStack"
},
"example": "/bookstack",
"default": "/bookstack"
},
@ -47,6 +55,10 @@
{
"name": "is_public",
"type": "boolean",
"ask": {
"en": "Is it a public site?",
"fr": "Est-ce un site public ?"
},
"help": {
"en": "If enabled, BookStack 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, BookStack sera accessible aux personnes nayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."

View file

@ -100,13 +100,16 @@ fi
# MODIFY A CONFIG FILE
#=================================================
path_url="$new_path"
domain="$new_domain"
mail_pwd=$(ynh_string_random --length=12)
cp -a ../conf/.env.example $final_path/.env
ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env"
ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/.env"
ynh_replace_string --match_string="__DOMAIN__" --replace_string="$new_domain" --target_file="$final_path/.env"
ynh_replace_string --match_string="__PATH__" --replace_string="$new_path" --target_file="$final_path/.env"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/.env"
ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$final_path/.env"
chmod 600 $final_path/.env
ynh_store_file_checksum $final_path/.env
#=================================================
# RELOAD NGINX

View file

@ -57,14 +57,6 @@ db_user=$db_name
ynh_app_setting_set --app=$app --key=db_name --value=$db_name
ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Configuring system user..." --weight=2
# Create a system user
ynh_system_user_create --username=$app --home_dir=$final_path
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
@ -82,6 +74,14 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Configuring system user..." --weight=2
# Create a system user
ynh_system_user_create --username=$app
#=================================================
# PHP-FPM CONFIGURATION
#=================================================
@ -106,6 +106,8 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar
mail_pwd=$(ynh_string_random --length=12)
ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
ynh_store_file_checksum $final_path/.env
#=================================================
# FINAL BOOKSTACK INSTALL
#=================================================
@ -126,8 +128,6 @@ popd
chown -R $app: $final_path
chmod -R 755 $final_path
chmod 600 $final_path/.env
#=================================================
# SETUP SSOWAT
#=================================================

View file

@ -47,14 +47,6 @@ test ! -d $final_path \
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# RECREATE THE DEDICATED USER
#=================================================
ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
# Create the dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
@ -62,6 +54,14 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
ynh_restore_file --origin_path="$final_path"
#=================================================
# RECREATE THE DEDICATED USER
#=================================================
ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
# Create the dedicated user (if not existing)
ynh_system_user_create --username=$app
#=================================================
# RESTORE USER RIGHTS
#=================================================
@ -70,8 +70,6 @@ ynh_restore_file --origin_path="$final_path"
chown -R $app: $final_path
chmod -R 755 $final_path
chmod 600 $final_path/.env
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================

View file

@ -45,14 +45,6 @@ ynh_clean_setup () {
# Exit if an error occurs during the execution of the script
ynh_abort_if_errors
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=2
# Create a dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
#=================================================
@ -88,6 +80,14 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config
ynh_add_nginx_config
#=================================================
# CREATE DEDICATED USER
#=================================================
ynh_script_progression --message="Making sure dedicated system user exists..." --weight=2
# Create a dedicated user (if not existing)
ynh_system_user_create --username=$app
#=================================================
# PHP-FPM CONFIGURATION
#=================================================
@ -125,8 +125,6 @@ popd
chown -R $app: $final_path
chmod -R 755 $final_path
chmod 600 $final_path/.env
#=================================================
# RELOAD NGINX
#=================================================