Skip to content

Testing #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a6af5b7
restart config panel
ericgaspar Jun 7, 2023
474a69b
Update manifest.toml
ericgaspar Jun 7, 2023
3290278
Standard (#119)
ericgaspar Jun 7, 2023
9ec6b3a
fix
ericgaspar Jun 7, 2023
9f716ff
Update manifest.toml
ericgaspar Jun 7, 2023
3bf7a01
Auto-update README
yunohost-bot Jun 7, 2023
75686d6
Update tests.toml
ericgaspar Jun 7, 2023
d700931
Merge branch 'testing' of https://github.com/YunoHost-Apps/bookstack_…
ericgaspar Jun 7, 2023
1a3a940
Update tests.toml
ericgaspar Jun 7, 2023
f16b42f
Merge branch 'master' into testing
ericgaspar Jun 8, 2023
8c9eaee
remove standard
ericgaspar Jun 8, 2023
8d27df3
Update manifest.toml
ericgaspar Jun 8, 2023
35c3d93
Auto-update README
yunohost-bot Jun 8, 2023
81536d6
Update tests.toml
ericgaspar Jun 8, 2023
24f3281
Update manifest.toml
ericgaspar Jun 14, 2023
4701736
Update manifest.toml
ericgaspar Jun 22, 2023
9f79624
Update install
ericgaspar Jun 29, 2023
fdb5e0f
Merge branch 'master' into testing
ericgaspar Jun 30, 2023
76831c6
Update manifest.toml
ericgaspar Jun 30, 2023
7c23cc0
Auto-update README
yunohost-bot Jun 30, 2023
1675b5c
Merge branch 'master' into testing
ericgaspar Jul 5, 2023
aa03e7c
Update manifest.toml
ericgaspar Jul 5, 2023
eb9bbe1
Auto-update README
yunohost-bot Jul 5, 2023
f28f088
Merge branch 'master' into testing
ericgaspar Jul 6, 2023
d75242f
cleaning
ericgaspar Jul 6, 2023
4faf195
Update manifest.toml
ericgaspar Jul 6, 2023
5b7648d
Auto-update README
yunohost-bot Jul 6, 2023
7459a90
Update manifest.toml
ericgaspar Jul 13, 2023
42ae784
Auto-update README
yunohost-bot Jul 13, 2023
a226032
Merge branch 'master' into testing
ericgaspar Jul 13, 2023
5664d0a
Merge branch 'testing' of https://github.com/YunoHost-Apps/bookstack_…
ericgaspar Jul 13, 2023
f5d0a0e
Upgrade to v23.6.2 (#128)
yunohost-bot Jul 14, 2023
62ee912
Merge branch 'master' into testing
ericgaspar Jul 14, 2023
2fdd979
Auto-update README
yunohost-bot Jul 14, 2023
e61dea3
Update manifest.toml
ericgaspar Aug 17, 2023
0d8ae4a
Add maintenance
ericgaspar Aug 28, 2023
e877b69
Update config_panel.toml
ericgaspar Aug 28, 2023
aeedc03
Update config
ericgaspar Aug 28, 2023
3c42b2c
Update config_panel.toml
ericgaspar Aug 28, 2023
220087a
Update config
ericgaspar Aug 28, 2023
c7c7f5f
Update manifest.toml
ericgaspar Aug 28, 2023
2f4e5b9
Update config
ericgaspar Aug 28, 2023
7196443
Update config
ericgaspar Aug 28, 2023
acb7ff1
fix
ericgaspar Aug 28, 2023
2e9c9f8
Merge branch 'master' into testing
ericgaspar Aug 28, 2023
0a92bb8
Update manifest.toml
ericgaspar Aug 28, 2023
e02ceae
Auto-update README
yunohost-bot Aug 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
- Diagrams.net Integration


**Shipped version:** 23.06.2~ynh1
**Shipped version:** 23.06.2~ynh2

**Demo:** https://demo.bookstackapp.com

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate
- Multilingue


**Version incluse :** 23.06.2~ynh1
**Version incluse :** 23.06.2~ynh2

**Démo :** https://demo.bookstackapp.com

Expand Down
9 changes: 9 additions & 0 deletions config_panel.toml → config_panel.toml.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ version = "1.0"

[main]
name = "BookStack configuration"
services = ["__APP__"]

[main.maintenance_mode]
name = "Maintenance mode"

[main.maintenance_mode.maintenance_mode]
ask = "Enable maintenance mode"
type = "boolean"
default = "0"

[main.php_fpm_config]
name = "PHP-FPM configuration"
Expand Down
8 changes: 4 additions & 4 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "BookStack"
description.en = "Platform to create documentation/wiki content"
description.fr = "Plateforme pour créer du contenu de documentation/wiki"

version = "23.06.2~ynh1"
version = "23.06.2~ynh2"

maintainers = ["eric_G"]

Expand All @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/"
code = "https://github.com/BookStackApp/BookStack"

[integration]
yunohost = ">= 11.1.21"
yunohost = ">= 11.2"
architectures = "all"
multi_instance = true
ldap = true
Expand Down Expand Up @@ -46,8 +46,8 @@ ram.runtime = "50M"
default = "en"

[install.init_main_permission]
help.en = "If enabled, BookStack will be accessible by people who do not have an account. This can be changed later via the webadmin."
help.fr = "Si cette case est cochée, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
help.en = "Si défini sur visiteurs, BookStack will be accessible by people who do not have an account. This can be changed later via the webadmin."
help.fr = "Si visiteurs selectionné, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
type = "group"
default = "visitors"

Expand Down
24 changes: 24 additions & 0 deletions scripts/config
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
# SPECIFIC GETTERS FOR TOML SHORT KEY
#=================================================

get__maintenance_mode() {
# Maintenance mode status
if [ -f $install_dir/.maintenance ]
then
echo "1"
else
echo "0"
fi
}

get__fpm_footprint() {
# Free footprint value for php-fpm
# Check if current_fpm_footprint is an integer
Expand Down Expand Up @@ -49,6 +59,20 @@ get__free_footprint() {
# SPECIFIC SETTERS FOR TOML SHORT KEYS
#=================================================

set__maintenance_mode() {
if [ "$maintenance_mode" -eq "1" ]; then
# If maintenance_mode was set to 1, enable maintenance mode
(cd "$install_dir" && ynh_exec_as "$app" \
echo "Site under maintenance." > .maintenance)
ynh_print_info "Maintenance mode disabled"
elif [ "$maintenance_mode" -eq "0" ]; then
# If maintenance_mode was set to 0, disable maintenance mode
ynh_secure_remove --file=$install_dir/.maintenance
ynh_print_info "Maintenance mode enabled"
fi
ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode"
}

set__fpm_footprint() {
if [ "$fpm_footprint" != "specific" ]
then
Expand Down