mirror of
https://github.com/YunoHost-Apps/baikal_ynh.git
synced 2024-09-03 18:16:11 +02:00
Testing (#68)
* 0.9.2 (#64)
* 0.9.2
* Auto-update README
* Update upgrade
* Remove patch
* Update install
* Update install
* Fix
* Auto-update README
* Fix
* Revert "Remove patch"
This reverts commit 760cfff3b3.
* Delete app-add-ldap-auth.patch
* Fix
* Create app-add-ldap-auth.patch
* Update app-add-ldap-auth.patch
* Update upgrade
* Fix
* Fix
* Update install
* Update upgrade
* Update upgrade
* Update upgrade
* Update manifest.json
* Update upgrade
* Update upgrade
* Update baikal.yaml
* Update baikal.yaml
* Update manifest.json
* Update change_url
* Update baikal.yaml
* Update nginx.conf
* Update upgrade
* Update upgrade
* Update upgrade
* Update upgrade
* Update scripts/_common.sh
Co-authored-by: Kayou <pierre@kayou.io>
* Update nginx.conf
* Update install
* Update upgrade
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Kayou <pierre@kayou.io>
* Update nginx.conf
* deskey -> encrypt_key
* Bullseye (#67)
* set relative path for --keep opt
* Auto-update README
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
* Reorder scripts (#69)
* reorder scripts
* Auto-update README
* Add fr
* Auto-update README
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
* Update manifest.json
* Auto-update README
* Update install
* Update manifest.json
* Auto-update README
* Update DESCRIPTION.md
* Auto-update README
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Kayou <pierre@kayou.io>
Co-authored-by: yalh76 <yalh@yahoo.com>
This commit is contained in:
Éric Gaspar
GitHub
parent
fc14479fe2
commit
d1428a8b5a
8 changed files with 49 additions and 42 deletions
|
|
@ -15,11 +15,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
|
||||
## Overview
|
||||
|
||||
[Baïkal](http://baikal-server.com/) is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic php capable server. The data can be stored in a MySQL or a SQLite database.
|
||||
[Baïkal](http://baikal-server.com/) is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic PHP capable server. The data are stored in a MySQL database.
|
||||
|
||||
Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself - with Baïkal.
|
||||
Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, macOS, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself with Baïkal.
|
||||
|
||||
**Shipped version:** 0.9.2~ynh2
|
||||
|
||||
**Shipped version:** 0.9.2~ynh1
|
||||
|
||||
**Demo:** https://demo.yunohost.org/baikal/admin/
|
||||
|
||||
|
|
@ -30,6 +31,7 @@ Baïkal allows to seamlessly access your contacts and calendars from every devic
|
|||
## Documentation and resources
|
||||
|
||||
* Official app website: <http://sabre.io/baikal/>
|
||||
* Official user documentation: <https://github.com/AlexandreMonroche/BaikalGuide>
|
||||
* Official admin documentation: <https://sabre.io/dav/>
|
||||
* Upstream app code repository: <https://github.com/sabre-io/Baikal>
|
||||
* YunoHost documentation for this app: <https://yunohost.org/app_baikal>
|
||||
|
|
|
|||
|
|
@ -15,11 +15,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
|||
|
||||
## Vue d'ensemble
|
||||
|
||||
[Baïkal](http://baikal-server.com/) is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic php capable server. The data can be stored in a MySQL or a SQLite database.
|
||||
[Baïkal](http://baikal-server.com/) est un serveur léger CalDAV+CardDAV. Il offre une interface Web étendue avec une gestion facile des utilisateurs, des carnets d'adresses et des calendriers. Il est rapide et simple à installer et ne nécessite qu'un serveur de base. Les données sont stockées dans une base de données MySQL.
|
||||
|
||||
Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself - with Baïkal.
|
||||
Baïkal permet d'accéder de manière transparente à vos contacts et calendriers depuis n'importe quel appareil. Il est compatible avec iOS, macOS, DAVx5 sur Android, Mozilla Thunderbird et toutes les autres applications compatibles CalDAV et CardDAV. Protégez votre vie privée en hébergeant vous-même des calendriers et contacts avec Baïkal.
|
||||
|
||||
**Version incluse :** 0.9.2~ynh2
|
||||
|
||||
**Version incluse :** 0.9.2~ynh1
|
||||
|
||||
**Démo :** https://demo.yunohost.org/baikal/admin/
|
||||
|
||||
|
|
@ -30,6 +31,7 @@ Baïkal allows to seamlessly access your contacts and calendars from every devic
|
|||
## Documentations et ressources
|
||||
|
||||
* Site officiel de l'app : <http://sabre.io/baikal/>
|
||||
* Documentation officielle utilisateur : <https://github.com/AlexandreMonroche/BaikalGuide>
|
||||
* Documentation officielle de l'admin : <https://sabre.io/dav/>
|
||||
* Dépôt de code officiel de l'app : <https://github.com/sabre-io/Baikal>
|
||||
* Documentation YunoHost pour cette app : <https://yunohost.org/app_baikal>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[Baïkal](http://baikal-server.com/) is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic php capable server. The data can be stored in a MySQL or a SQLite database.
|
||||
[Baïkal](http://baikal-server.com/) is a lightweight CalDAV+CardDAV server. It offers an extensive web interface with easy management of users, address books and calendars. It is fast and simple to install and only needs a basic PHP capable server. The data are stored in a MySQL database.
|
||||
|
||||
Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, Mac OS X, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself - with Baïkal.
|
||||
Baïkal allows to seamlessly access your contacts and calendars from every device. It is compatible with iOS, macOS, DAVx5 on Android, Mozilla Thunderbird and every other CalDAV and CardDAV capable application. Protect your privacy by hosting calendars and contacts yourself with Baïkal.
|
||||
3
doc/DESCRIPTION_fr.md
Normal file
3
doc/DESCRIPTION_fr.md
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[Baïkal](http://baikal-server.com/) est un serveur léger CalDAV+CardDAV. Il offre une interface Web étendue avec une gestion facile des utilisateurs, des carnets d'adresses et des calendriers. Il est rapide et simple à installer et ne nécessite qu'un serveur de base. Les données sont stockées dans une base de données MySQL.
|
||||
|
||||
Baïkal permet d'accéder de manière transparente à vos contacts et calendriers depuis n'importe quel appareil. Il est compatible avec iOS, macOS, DAVx5 sur Android, Mozilla Thunderbird et toutes les autres applications compatibles CalDAV et CardDAV. Protégez votre vie privée en hébergeant vous-même des calendriers et contacts avec Baïkal.
|
||||
|
|
@ -6,13 +6,14 @@
|
|||
"en": "Lightweight CalDAV and CardDAV server",
|
||||
"fr": "Serveur CalDAV et CardDAV léger"
|
||||
},
|
||||
"version": "0.9.2~ynh1",
|
||||
"version": "0.9.2~ynh2",
|
||||
"url": "http://baikal-server.com/",
|
||||
"upstream": {
|
||||
"license": "GPL-3.0",
|
||||
"website": "http://sabre.io/baikal/",
|
||||
"demo": "https://demo.yunohost.org/baikal/admin/",
|
||||
"admindoc": "https://sabre.io/dav/",
|
||||
"userdoc": "https://github.com/AlexandreMonroche/BaikalGuide",
|
||||
"code": "https://github.com/sabre-io/Baikal"
|
||||
},
|
||||
"license": "GPL-3.0",
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
"email": "julien.malik@paraiso.me"
|
||||
},
|
||||
"requirements": {
|
||||
"yunohost": ">= 4.3.0"
|
||||
"yunohost": ">= 11.0.9"
|
||||
},
|
||||
"multi_instance": false,
|
||||
"services": [
|
||||
|
|
|
|||
|
|
@ -95,14 +95,6 @@ chmod 750 "$final_path"
|
|||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
|
|
@ -112,6 +104,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
|
|||
ynh_add_fpm_config
|
||||
phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring NGINX web server..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC SETUP
|
||||
#=================================================
|
||||
|
|
@ -127,7 +127,6 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
|
|||
#=================================================
|
||||
ynh_script_progression --message="Adding a configuration file..." --weight=1
|
||||
|
||||
#bk_conf="${final_path}/config/baikal.yaml"
|
||||
path=${path_url%/}
|
||||
|
||||
ynh_add_config --template="../conf/baikal.yaml" --destination="$final_path/config/baikal.yaml"
|
||||
|
|
|
|||
|
|
@ -46,20 +46,6 @@ fi
|
|||
|
||||
#=================================================
|
||||
# STANDARD RESTORATION STEPS
|
||||
#=================================================
|
||||
# REINSTALL DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reinstalling dependencies..." --weight=5
|
||||
|
||||
ynh_install_app_dependencies $pkg_dependencies
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RECREATE THE DEDICATED USER
|
||||
#=================================================
|
||||
|
|
@ -96,6 +82,13 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
|
|||
chown $app: "$final_path/config/baikal.yaml"
|
||||
chmod 640 "$final_path/config/baikal.yaml"
|
||||
|
||||
#=================================================
|
||||
# REINSTALL DEPENDENCIES
|
||||
#=================================================
|
||||
ynh_script_progression --message="Reinstalling dependencies..." --weight=5
|
||||
|
||||
ynh_install_app_dependencies $pkg_dependencies
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE PHP-FPM CONFIGURATION
|
||||
#=================================================
|
||||
|
|
@ -103,6 +96,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
|
|||
|
||||
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -101,21 +101,13 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
|
|||
then
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=3
|
||||
|
||||
ynh_setup_source --dest_dir="$final_path" --keep="$final_path/Specific $final_path/config"
|
||||
ynh_setup_source --dest_dir="$final_path" --keep="Specific config"
|
||||
fi
|
||||
|
||||
chmod 750 "$final_path"
|
||||
chmod -R o-rwx "$final_path"
|
||||
chown -R $app:www-data "$final_path"
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# UPGRADE DEPENDENCIES
|
||||
#=================================================
|
||||
|
|
@ -131,6 +123,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
|
|||
# Create a dedicated PHP-FPM config
|
||||
ynh_add_fpm_config
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
|
||||
|
||||
# Create a dedicated NGINX config
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC UPGRADE
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue