mirror of
https://github.com/YunoHost-Apps/baikal_ynh.git
synced 2024-09-03 18:16:11 +02:00
Small fixes
This commit is contained in:
parent
871e82dda2
commit
f3432f2d96
5 changed files with 12 additions and 13 deletions
|
@ -1,7 +1,7 @@
|
|||
# Baïkal for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/baikal)  
|
||||
[](https://install-app.yunohost.org/?app=baikal)
|
||||
[](https://install-app.yunohost.org/?app=baikal)
|
||||
|
||||
> *This package allow you to install Baïkal quickly and simply on a YunoHost server.
|
||||
If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
|
||||
|
|
|
@ -11,18 +11,16 @@
|
|||
setup_private=0
|
||||
setup_public=0
|
||||
upgrade=1
|
||||
upgrade=1 from_commit=9331c8fae0a58639e824a1a77f4a5cbb46f91ac9
|
||||
upgrade=1 from_commit=7960d347424cb1cb931c91f2628dd829288184e1
|
||||
backup_restore=1
|
||||
multi_instance=0
|
||||
incorrect_path=1
|
||||
port_already_use=0
|
||||
change_url=1
|
||||
;;; Levels
|
||||
Level 5=auto
|
||||
;;; Options
|
||||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=9331c8fae0a58639e824a1a77f4a5cbb46f91ac9
|
||||
name=Merge pull request #44 from YunoHost-Apps/0.6.0
|
||||
; commit=7960d347424cb1cb931c91f2628dd829288184e1
|
||||
name=bump baikal to 0.5.3
|
||||
manifest_arg=domain=DOMAIN&path=PATH&password=mysecret&
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"en": "Lightweight CalDAV and CardDAV server",
|
||||
"fr": "Serveur CalDAV et CardDAV léger"
|
||||
},
|
||||
"version": "0.7.1~ynh1",
|
||||
"version": "0.7.1~ynh2",
|
||||
"url": "http://baikal-server.com/",
|
||||
"license": "GPL-3.0",
|
||||
"maintainer": {
|
||||
|
@ -19,7 +19,7 @@
|
|||
"multi_instance": false,
|
||||
"services": [
|
||||
"nginx",
|
||||
"php7.0-fpm",
|
||||
"php7.3-fpm",
|
||||
"mysql"
|
||||
],
|
||||
"arguments": {
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
- [ ] **Code review** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
- **CI succeeded** :
|
||||
[](https://ci-apps-hq.yunohost.org/jenkins/job/baikal_ynh%20PR-NUM-/)
|
||||
*Please replace '-NUM-' in this link by the PR number.*
|
||||
When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
|
||||
|
||||
## Package_check results
|
||||
---
|
||||
* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
|
||||
|
|
|
@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
|
|||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# CHECK VERSION
|
||||
|
@ -91,7 +92,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
|
|||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
|
@ -190,6 +190,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=2
|
|||
|
||||
# Upgrade from the legacy permissions system
|
||||
protected_uris=$(ynh_app_setting_get --app="$app" --key=protected_uris)
|
||||
|
||||
if [ -n "${protected_uris}" ]; then
|
||||
ynh_app_setting_delete --app="$app" --key=protected_uris
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue