From c37acdab9053fb6b5185de704c158de8676dcabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 24 Apr 2022 15:01:05 +0200 Subject: [PATCH 01/14] 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 760cfff3b3f7b25d449c412589a796c763f6e5a1. * 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 * Update nginx.conf * Update install * Update upgrade Co-authored-by: yunohost-bot Co-authored-by: Kayou --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 +++ .github/workflows/updater.sh | 134 ++++++++++++++++++++++++ README.md | 75 +++++-------- README_fr.md | 45 ++++++++ check_process | 13 +-- conf/app.src | 4 +- conf/baikal.yaml | 18 ++-- conf/nginx.conf | 19 ++-- doc/DESCRIPTION.md | 3 + doc/screenshots/baikal-in-use.png | Bin 0 -> 87009 bytes manifest.json | 21 ++-- pull_request_template.md | 16 --- scripts/_common.sh | 4 +- scripts/actions/reset_admin_password | 8 +- scripts/backup | 2 +- scripts/change_url | 12 +-- scripts/install | 72 +++++++------ scripts/remove | 19 ++-- scripts/restore | 52 ++++----- scripts/upgrade | 109 +++++++------------ sources/patches/app-add-ldap-auth.patch | 41 ++++---- 22 files changed, 463 insertions(+), 275 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE.md create mode 100755 .github/PULL_REQUEST_TEMPLATE.md create mode 100755 .github/workflows/updater.sh create mode 100644 README_fr.md create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/screenshots/baikal-in-use.png delete mode 100644 pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100755 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100755 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100755 index 0000000..50c6881 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,134 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +# Remove this exit command when you are ready to run this Action +#exit 1 + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +# Later down the script, we assume the version has only digits and dots +# Sometimes the release name starts with a "v", so let's filter it out. +# You may need more tweaks here if the upstream repository has different naming conventions. +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *"baikal-"*".zip") + src="app" + ;; + *) + src="" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=$extension +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/README.md b/README.md index 1f62aff..8773d2d 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,43 @@ + + # Baïkal for YunoHost [![Integration level](https://dash.yunohost.org/integration/baikal.svg)](https://dash.yunohost.org/appci/app/baikal) ![](https://ci-apps.yunohost.org/ci/badges/baikal.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/baikal.maintain.svg) [![Install Baïkal with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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.* +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Baïkal quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -[Baïkal](http://baikal-server.com/) is a CalDAV and CardDAV server, based on -sabre/dav, that includes an administration interface for easy management. -**Shipped version:** 0.7.1 +[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 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. + +**Shipped version:** 0.9.2~ynh1 + +**Demo:** https://demo.yunohost.org/baikal/admin/ ## Screenshots -![](http://www.baikal-server.com/res/img/screenshots/dashboard.png) +![](./doc/screenshots/baikal-in-use.png) -## Demo +## Documentation and resources -* [YunoHost demo](https://demo.yunohost.org/baikal/admin/) - * Accounts: - * `demo/demo` then `admin/demo` +* Official app website: http://sabre.io/baikal/ +* 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 +* Report a bug: https://github.com/YunoHost-Apps/baikal_ynh/issues -## Configuration +## Developer info -## Documentation - - * Official documentation: http://sabre.io/baikal/ - * YunoHost documentation: https://yunohost.org/en/app_baikal - -## YunoHost specific features - -In addition to Baïkal core features, the following are made available with this package: - - * Serve `/.well-known` paths for CalDAV and CardDAV on the domain - -#### Multi-users support - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/baikal.svg)](https://ci-apps.yunohost.org/ci/apps/baikal/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/baikal.svg)](https://ci-apps-arm.yunohost.org/ci/apps/baikal/) - -## Limitations - -## Additional information - -* There is a breaking change in the management of the administrator password when upgrading to 0.7.0 You must change the admin password! -* To be able to change the admin password, please visit the page: `https://you.domain.tld/yunohost/admin/#/apps/baikal/actions` and set a new password. - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/baikal_ynh/issues - * Baïkal website: http://baikal-server.com/ - * Upstream app repository: https://github.com/sabre-io/Baikal - * YunoHost website: https://yunohost.org/ - ---- - -## Developers infos - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/baikal_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/baikal_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -68,3 +45,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/baikal_ynh/tree/testi or sudo yunohost app upgrade baikal -u https://github.com/YunoHost-Apps/baikal_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..7847b6e --- /dev/null +++ b/README_fr.md @@ -0,0 +1,45 @@ +# Baïkal pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/baikal.svg)](https://dash.yunohost.org/appci/app/baikal) ![](https://ci-apps.yunohost.org/ci/badges/baikal.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/baikal.maintain.svg) +[![Installer Baïkal avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=baikal) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer Baïkal 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.* + +## 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 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. + +**Version incluse :** 0.9.2~ynh1 + +**Démo :** https://demo.yunohost.org/baikal/admin/ + +## Captures d'écran + +![](./doc/screenshots/baikal-in-use.png) + +## Documentations et ressources + +* Site officiel de l'app : http://sabre.io/baikal/ +* 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 +* Signaler un bug : https://github.com/YunoHost-Apps/baikal_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/baikal_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/baikal_ynh/tree/testing --debug +ou +sudo yunohost app upgrade baikal -u https://github.com/YunoHost-Apps/baikal_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/check_process b/check_process index db9882c..3f57549 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - password="mysecret" + domain="domain.tld" + path="/path" + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -11,7 +11,8 @@ setup_private=0 setup_public=0 upgrade=1 - upgrade=1 from_commit=099f63413f120982232a77fd4ff5f62530d546ad + #0.7.1~ynh2 + upgrade=1 from_commit=7c074c7b18322cde08c4eb57ffbc5ae174b7ae65 backup_restore=1 multi_instance=0 change_url=1 @@ -19,6 +20,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=099f63413f120982232a77fd4ff5f62530d546ad - name=Testing (#57) + ; commit=7c074c7b18322cde08c4eb57ffbc5ae174b7ae65 + name=Testing #60 manifest_arg=domain=DOMAIN&path=PATH&password=mysecret& diff --git a/conf/app.src b/conf/app.src index 7eb737e..ee5cd22 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/sabre-io/Baikal/releases/download/0.7.1/baikal-0.7.1.zip -SOURCE_SUM=dade7d8dd740ed66f6d87368a6ceff845938ba57d7f45063f8b9cea6278c1c0a +SOURCE_URL=https://github.com/sabre-io/Baikal/releases/download/0.9.2/baikal-0.9.2.zip +SOURCE_SUM=5feb8488c74fe6b625680654f3d51cdb080dcc6180c1b558543cb25f18f38c65 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/baikal.yaml b/conf/baikal.yaml index 09fb85c..fd35a3d 100644 --- a/conf/baikal.yaml +++ b/conf/baikal.yaml @@ -1,5 +1,5 @@ system: - configured_version: '0.7.1' + configured_version: '0.9.2' timezone: '__TIMEZONE__' card_enabled: true cal_enabled: true @@ -8,16 +8,16 @@ system: admin_passwordhash: __PASSWORD_HASH__ auth_realm: BaikalDAV base_uri: '__PATH__' -# Auth Backend LDAP-UserBind; LDAP URI + # Auth Backend LDAP-UserBind; LDAP URI dav_ldap_uri: 'ldap://127.0.0.1/' -# Auth Backend LDAP-UserBind; Template for userbind -# %n => username -# %u => user part of username when it is an email -# %u => domain part of username when it is an email + # Auth Backend LDAP-UserBind; Template for userbind + # %n => username + # %u => user part of username when it is an email + # %u => domain part of username when it is an email dav_ldap_dn_template: 'uid=%n,ou=users,dc=yunohost,dc=org' -# Auth Backend LDAP-UserBind; attribute for displayname + # Auth Backend LDAP-UserBind; attribute for displayname dav_ldap_displayname_attr: 'cn' -# Auth Backend LDAP-UserBind; attribute for email + # Auth Backend LDAP-UserBind; attribute for email dav_ldap_email_attr: 'mail' database: encryption_key: '__DESKEY__' @@ -25,5 +25,5 @@ database: mysql: true mysql_host: 'localhost' mysql_dbname: '__DB_NAME__' - mysql_username: '__DB_NAME__' + mysql_username: '__DB_USER__' mysql_password: '__DB_PWD__' diff --git a/conf/nginx.conf b/conf/nginx.conf index 518275c..303f01c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,9 @@ location = /.well-known/carddav { - return 301 https://$server_name__PATH__/card.php; + return 301 https://$server_name__PATH__/dav.php; } location = /.well-known/caldav { - return 301 https://$server_name__PATH__/cal.php; + return 301 https://$server_name__PATH__/dav.php; } #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; @@ -12,11 +12,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/html/; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; location ~ ^(.+\.php)(.*)$ { @@ -27,7 +22,15 @@ location __PATH__/ { fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; } - location ~ ^__PATH__/(\.|Core|Specific) { + #location ~ ^__PATH__/(\.|Core|Specific) { + # deny all; + #} + + location ~ ^__PATH__/(\.ht|Core|Specific|config) { deny all; + return 404; } } + + + \ No newline at end of file diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..832cca8 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +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 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. \ No newline at end of file diff --git a/doc/screenshots/baikal-in-use.png b/doc/screenshots/baikal-in-use.png new file mode 100644 index 0000000000000000000000000000000000000000..5095a53962236d8e847329d7b7f62e7799e1c80c GIT binary patch literal 87009 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 4.1.7" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -37,8 +43,7 @@ }, { "name": "password", - "type": "password", - "example": "mysecret" + "type": "password" } ] } diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 0a198cf..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how you fix that* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## 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!"* diff --git a/scripts/_common.sh b/scripts/_common.sh index 6eef4b8..e77b284 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,9 @@ #================================================= # dependencies used by the app -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" -pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql" +pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/actions/reset_admin_password b/scripts/actions/reset_admin_password index c2b0be8..9086523 100644 --- a/scripts/actions/reset_admin_password +++ b/scripts/actions/reset_admin_password @@ -43,15 +43,15 @@ ynh_script_progression --message="Changing the password..." --weight=1 bk_conf="${final_path}/config/baikal.yaml" -ynh_backup_if_checksum_is_different --file="${final_path}/config/baikal.yaml" +ynh_backup_if_checksum_is_different --file="$final_path/config/baikal.yaml" -ynh_replace_string --match_string="${password_hash_old}" --replace_string="${password_hash}" --target_file="$bk_conf" +ynh_replace_string --match_string="${password_hash_old}" --replace_string="${password_hash}" --target_file="$final_path/config/baikal.yaml" ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash -ynh_store_file_checksum --file="${final_path}/config/baikal.yaml" +ynh_store_file_checksum --file="$final_path/config/baikal.yaml" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Execution completed" --last \ No newline at end of file +ynh_script_progression --message="Execution completed" --last diff --git a/scripts/backup b/scripts/backup index 3a806bb..e20a222 100644 --- a/scripts/backup +++ b/scripts/backup @@ -62,4 +62,4 @@ ynh_mysql_dump_db --database="$db_name" > db.sql # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for Baïkal. (YunoHost will then actually copy those files to the archive)." +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 4d491c8..54431ae 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -94,20 +94,20 @@ fi #================================================= # UPDATE CONFIGURATION #================================================= -ynh_script_progression --message="Updating Baïkal configuration..." +ynh_script_progression --message="Updating $app configuration..." --weight=2 -ynh_backup_if_checksum_is_different --file="${final_path}/config/baikal.yaml" +ynh_backup_if_checksum_is_different --file="$final_path/config/baikal.yaml" -ynh_replace_string --match_string="base_uri: '$old_path'" --replace_string="base_uri: '$new_path'" --target_file="${final_path}/config/baikal.yaml" +ynh_replace_string --match_string="base_uri: '$old_path'" --replace_string="base_uri: '$new_path'" --target_file="$final_path/config/baikal.yaml" -ynh_store_file_checksum --file="${final_path}/config/baikal.yaml" +ynh_store_file_checksum --file="$final_path/config/baikal.yaml" #================================================= # GENERIC FINALISATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -115,4 +115,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for Baïkal" --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index ebbd114..09ba1c9 100644 --- a/scripts/install +++ b/scripts/install @@ -22,13 +22,16 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH password=$YNH_APP_ARG_PASSWORD +timezone=$(cat /etc/timezone) +deskey=$(ynh_string_random 24) +password_hash=$(echo -n admin:BaikalDAV:$password | sha256sum | cut -d ' ' -f 1) app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." +ynh_script_progression --message="Validating installation parameters..." --weight=1 final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" @@ -49,6 +52,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=encrypt_key --value="$deskey" +ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" #================================================= # STANDARD MODIFICATIONS @@ -59,14 +64,23 @@ ynh_script_progression --message="Installing dependencies..." --weight=5 ynh_install_app_dependencies $pkg_dependencies +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_script_progression --message="Creating a MySQL database..." +ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid $app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -77,67 +91,51 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +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..." +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=3 - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." +ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config ynh_add_fpm_config +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC SETUP #================================================= # INITIALIZE DATABASE #================================================= -ynh_script_progression --message="Configuring Baïkal..." --weight=3 +ynh_script_progression --message="Configuring $app..." --weight=3 -ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name \ - < "${final_path}/Core/Resources/Db/MySQL/db.sql" +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ + < "$final_path/Core/Resources/Db/MySQL/db.sql" #================================================= # CONFIGURE BAIKAL #================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=1 -bk_conf="${final_path}/config/baikal.yaml" -timezone=$(cat /etc/timezone) -password_hash=$(echo -n admin:BaikalDAV:$password | sha256sum | cut -d ' ' -f 1) -ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash +#bk_conf="${final_path}/config/baikal.yaml" path=${path_url%/} -deskey=$(ynh_string_random 24) -ynh_app_setting_set --app=$app --key=encrypt_key --value="$deskey" -ynh_add_config --template="../conf/baikal.yaml" --destination="$bk_conf" +ynh_add_config --template="../conf/baikal.yaml" --destination="$final_path/config/baikal.yaml" +chown $app: "$final_path/config/baikal.yaml" +chmod 640 "$final_path/config/baikal.yaml" # Disable installation -touch "${final_path}/Specific/INSTALL_DISABLED" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions -chown -R root: "$final_path" -chown $app "$final_path/config/baikal.yaml" -chmod 640 "$final_path/config/baikal.yaml" +touch "$final_path/Specific/INSTALL_DISABLED" #================================================= # SETUP SSOWAT @@ -152,7 +150,7 @@ ynh_permission_create --permission="admin" --url="/admin" --allowed="all_users" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -160,4 +158,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of Baïkal completed" --last +ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index 1c3060c..7da7426 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,12 +12,13 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= @@ -25,15 +26,15 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Removing the MySQL database" --weight=2 +ynh_script_progression --message="Removing the MySQL database" --weight=1 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=4 +ynh_script_progression --message="Removing dependencies..." --weight=3 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -41,7 +42,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing Baïkal main directory" +ynh_script_progression --message="Removing app main directory" --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -49,7 +50,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration" +ynh_script_progression --message="Removing NGINX web server configuration" --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -57,7 +58,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing PHP-FPM configuration" +ynh_script_progression --message="Removing PHP-FPM configuration" --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config @@ -67,7 +68,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user" +ynh_script_progression --message="Removing the dedicated system user" --weight=1 # Delete a system user ynh_system_user_delete --username=$app @@ -76,4 +77,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of Baïkal completed" --last +ynh_script_progression --message="Removal of $app completed" --last diff --git a/scripts/restore b/scripts/restore index 820e1de..e87e437 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,7 +19,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -27,6 +27,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) +db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -34,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -57,45 +56,50 @@ 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" -#================================================= -# RESTORE THE APP MAIN DIR -#================================================= -ynh_script_progression --message="Restoring Baïkal main directory..." - -ynh_restore_file --origin_path="$final_path" - -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=2 - -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # 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 +ynh_system_user_create --username=$app --home_dir="$final_path" + +#================================================= +# RESTORE THE APP MAIN DIR +#================================================= +ynh_script_progression --message="Restoring the app main directory..." --weight=3 + +ynh_restore_file --origin_path="$final_path" + +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=2 + +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RESTORE USER RIGHTS #================================================= # Set permissions -chown -R root: "$final_path" -chown $app "$final_path/config/baikal.yaml" +chown $app: "$final_path/config/baikal.yaml" chmod 640 "$final_path/config/baikal.yaml" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -104,7 +108,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload @@ -113,4 +117,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for Baïkal" --last +ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 21ab67d..5920455 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,9 +20,11 @@ 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) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +phpversion=$YNH_PHP_VERSION password_hash=$(ynh_app_setting_get --app=$app --key=password_hash) +deskey=$(ynh_app_setting_get --app=$app --key=encrypt_key) #================================================= # CHECK VERSION @@ -30,10 +32,24 @@ password_hash=$(ynh_app_setting_get --app=$app --key=password_hash) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=4 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If final_path doesn't exist, create it if [ -z "$final_path" ]; then @@ -47,6 +63,7 @@ if [ -z "$db_name" ]; then ynh_app_setting_set --app=$app --key=db_name --value=$db_name fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all @@ -60,18 +77,12 @@ if ! ynh_permission_exists --permission="admin"; then fi #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Backing up Baïkal before upgrading (may take a while)..." --weight=4 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # STANDARD UPGRADE STEPS @@ -83,26 +94,17 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=3 - # Keep the Specific and config folders intact: https://sabre.io/baikal/upgrade/ - mkdir -p "$final_path/config" - temp_folder=$(mktemp -d) - mv "$final_path/Specific" "$temp_folder" - mv "$final_path/config" "$temp_folder" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" - - ynh_secure_remove --file="$final_path/Specific" - ynh_secure_remove --file="$final_path/config" - - mv "$temp_folder/Specific" "$final_path" - mv "$temp_folder/config" "$final_path" - ynh_secure_remove --file="$temp_folder" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/Specific $final_path/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..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -114,14 +116,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5 ynh_install_app_dependencies $pkg_dependencies -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -136,12 +130,14 @@ ynh_add_fpm_config # UPGRADE BAIKAL #================================================= +# We keep this to allow upgrade the config file in case it needs to be changed. + if [ "$upgrade_type" == "UPGRADE_APP" ] then #================================================= # UPGRADE BAIKAL CONFIGURATION #================================================= - ynh_script_progression --message="Upgrading Baïkal configuration..." --weight=2 + ynh_script_progression --message="Upgrading the configuration file..." --weight=2 if [ -z "$password_hash" ]; then password=$(ynh_app_setting_get --app=$app --key=password) @@ -149,48 +145,17 @@ then ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash fi - bk_conf="${final_path}/config/baikal.yaml" timezone=$(cat /etc/timezone) path=${path_url%/} - deskey=$(ynh_app_setting_get --app=$app --key=encrypt_key) - ynh_app_setting_set --app=$app --key=encrypt_key --value="$deskey" - - ynh_add_config --template="../conf/baikal.yaml" --destination="$bk_conf" - - #================================================= - # UPGRADE BAIKAL - #================================================= - ynh_script_progression --message="Upgrading Baïkal..." - - # Run Baikal upgrade - php"${phpversion}" "${final_path}/bin/upgrade.sh" - - # Cleanup old baikal-admin sessions - # since we may have changed owner of the session file - grep --files-with-matches --recursive "CSRF_TOKEN|s:" /var/lib/php/sessions | xargs rm -f - - # Store the config file checksum into the app settings - ynh_store_file_checksum --file="$bk_conf" - # Remove checksums of old files - ynh_delete_file_checksum --file="${final_path}/Specific/config.php" - ynh_delete_file_checksum --file="${final_path}/Specific/config.system.php" + ynh_add_config --template="../conf/baikal.yaml" --destination="$final_path/config/baikal.yaml" + chown $app: "$final_path/config/baikal.yaml" + chmod 640 "$final_path/config/baikal.yaml" fi -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions -chown -R root: "$final_path" -chown $app "$final_path/config/baikal.yaml" -chmod 640 "$final_path/config/baikal.yaml" - #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -198,4 +163,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of Baïkal completed" --last +ynh_script_progression --message="Upgrade of $app completed" --last diff --git a/sources/patches/app-add-ldap-auth.patch b/sources/patches/app-add-ldap-auth.patch index eb51c42..d5849b7 100644 --- a/sources/patches/app-add-ldap-auth.patch +++ b/sources/patches/app-add-ldap-auth.patch @@ -2,12 +2,14 @@ diff --git a/Core/Frameworks/Baikal/Core/Server.php b/Core/Frameworks/Baikal/Cor index e96fe39..b90b49e 100644 --- a/Core/Frameworks/Baikal/Core/Server.php +++ b/Core/Frameworks/Baikal/Core/Server.php -@@ -133,6 +133,8 @@ class Server { +@@ -133,8 +133,8 @@ if ($this->authType === 'Basic') { $authBackend = new \Baikal\Core\PDOBasicAuth($this->pdo, $this->authRealm); -+ } elseif ($this->authType === 'LDAP-UserBind') { -+ $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm); +- } elseif ($this->authType === 'Apache') { +- $authBackend = new \Sabre\DAV\Auth\Backend\Apache(); ++ } elseif ($this->authType === 'LDAP-UserBind') { ++ $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm); } else { $authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo); $authBackend->setRealm($this->authRealm); @@ -15,10 +17,14 @@ diff --git a/Core/Frameworks/Baikal/Model/Config/Standard.php b/Core/Frameworks/ index 1ef5a51..32ec217 100644 --- a/Core/Frameworks/Baikal/Model/Config/Standard.php +++ b/Core/Frameworks/Baikal/Model/Config/Standard.php -@@ -51,6 +51,22 @@ class Standard extends \Baikal\Model\Config { - "type" => "string", - "comment" => "HTTP authentication type for WebDAV; default Digest" - ], +@@ -37,6 +37,26 @@ + "card_enabled" => true, + "cal_enabled" => true, + "dav_auth_type" => "Digest", ++ "dav_ldap_uri" => "ldapi:///", ++ "dav_ldap_dn_template" => "uid=%n,dc=example,dc=com", ++ "dav_ldap_displayname_attr" => "cn", ++ "dav_ldap_email_attr" => "mail", + "dav_ldap_uri" => [ + "type" => "string", + "comment" => "URI to LDAP Server (for ldap-userbind auth); default ldapi:///" @@ -35,25 +41,14 @@ index 1ef5a51..32ec217 100644 + "type" => "string", + "comment" => "LDAP-attribute for email; default mail" + ], - "admin_passwordhash" => [ - "type" => "string", - "comment" => "Baïkal Web admin password hash; Set via Baïkal Web Admin", -@@ -64,6 +80,10 @@ class Standard extends \Baikal\Model\Config { - "card_enabled" => true, - "cal_enabled" => true, - "dav_auth_type" => "Digest", -+ "dav_ldap_uri" => "ldapi:///", -+ "dav_ldap_dn_template" => "uid=%n,dc=example,dc=com", -+ "dav_ldap_displayname_attr" => "cn", -+ "dav_ldap_email_attr" => "mail", - "admin_passwordhash" => "", - "auth_realm" => "BaikalDAV", - "base_uri" => "" -@@ -103,7 +123,31 @@ class Standard extends \Baikal\Model\Config { + "admin_passwordhash" => "", + "failed_access_message" => "user %u authentication failure for Baikal", + // While not editable as will change admin & any existing user passwords, +@@ -79,7 +99,31 @@ $oMorpho->add(new \Formal\Element\Listbox([ "prop" => "dav_auth_type", "label" => "WebDAV authentication type", -- "options" => ["Digest", "Basic"] +- "options" => ["Digest", "Basic", "Apache"], + "options" => ["Digest", "Basic", "LDAP-UserBind"] + ])); + From c0eb4bca96076fd495d18b0e84113526e613a74f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 21 May 2022 12:16:22 +0200 Subject: [PATCH 02/14] Update nginx.conf --- conf/nginx.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 303f01c..d29b7e1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -31,6 +31,3 @@ location __PATH__/ { return 404; } } - - - \ No newline at end of file From 29d25147e566bd6cd07c6f1d285deca325d37ebe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 21 May 2022 12:19:15 +0200 Subject: [PATCH 03/14] deskey -> encrypt_key --- conf/baikal.yaml | 2 +- scripts/install | 4 ++-- scripts/upgrade | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/conf/baikal.yaml b/conf/baikal.yaml index fd35a3d..b6504a9 100644 --- a/conf/baikal.yaml +++ b/conf/baikal.yaml @@ -20,7 +20,7 @@ system: # Auth Backend LDAP-UserBind; attribute for email dav_ldap_email_attr: 'mail' database: - encryption_key: '__DESKEY__' + encryption_key: '__ENCRYPT_KEY__' sqlite_file: "absolute/path/to/Specific/db/db.sqlite" mysql: true mysql_host: 'localhost' diff --git a/scripts/install b/scripts/install index 09ba1c9..9169e1b 100644 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH password=$YNH_APP_ARG_PASSWORD timezone=$(cat /etc/timezone) -deskey=$(ynh_string_random 24) +encrypt_key=$(ynh_string_random 24) password_hash=$(echo -n admin:BaikalDAV:$password | sha256sum | cut -d ' ' -f 1) app=$YNH_APP_INSTANCE_NAME @@ -52,7 +52,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=encrypt_key --value="$deskey" +ynh_app_setting_set --app=$app --key=encrypt_key --value="$encrypt_key" ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5920455..f92c1e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$YNH_PHP_VERSION password_hash=$(ynh_app_setting_get --app=$app --key=password_hash) -deskey=$(ynh_app_setting_get --app=$app --key=encrypt_key) +encrypt_key=$(ynh_app_setting_get --app=$app --key=encrypt_key) #================================================= # CHECK VERSION @@ -63,6 +63,13 @@ if [ -z "$db_name" ]; then ynh_app_setting_set --app=$app --key=db_name --value=$db_name fi +# If password_hash doesn't exist, create it +if [ -z "$password_hash" ]; then + password=$(ynh_app_setting_get --app=$app --key=password) + password_hash=$(echo -n admin:BaikalDAV:$password | md5sum | cut -d ' ' -f 1) + ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then @@ -139,12 +146,6 @@ then #================================================= ynh_script_progression --message="Upgrading the configuration file..." --weight=2 - if [ -z "$password_hash" ]; then - password=$(ynh_app_setting_get --app=$app --key=password) - password_hash=$(echo -n admin:BaikalDAV:$password | md5sum | cut -d ' ' -f 1) - ynh_app_setting_set --app=$app --key=password_hash --value=$password_hash - fi - timezone=$(cat /etc/timezone) path=${path_url%/} ynh_add_config --template="../conf/baikal.yaml" --destination="$final_path/config/baikal.yaml" From fc4e787ebace9179c887d155e3033cee8fcc7ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 17 Aug 2022 07:31:48 +0200 Subject: [PATCH 04/14] Bullseye (#67) * set relative path for --keep opt * Auto-update README Co-authored-by: yunohost-bot --- README.md | 1 + README_fr.md | 3 ++- manifest.json | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 45169ae..1cc011a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Baïkal allows to seamlessly access your contacts and calendars from every devic **Shipped version:** 0.9.2~ynh1 + **Demo:** https://demo.yunohost.org/baikal/admin/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index e392cf5..8629bfa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 0.9.2~ynh1 +**Version incluse :** 0.9.2~ynh1 + **Démo :** https://demo.yunohost.org/baikal/admin/ diff --git a/manifest.json b/manifest.json index 5a99050..7c8e85f 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "julien.malik@paraiso.me" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index f92c1e8..3b87c8b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,7 +101,7 @@ 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" From 5bdff292a5f4e1caa48ad7f3d34f10866bb14925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Sep 2022 19:30:18 +0200 Subject: [PATCH 05/14] Reorder scripts (#69) * reorder scripts * Auto-update README * Add fr * Auto-update README Co-authored-by: yunohost-bot --- README.md | 4 ++-- README_fr.md | 4 ++-- doc/DESCRIPTION.md | 4 ++-- doc/DESCRIPTION_fr.md | 3 +++ scripts/install | 16 ++++++++-------- scripts/restore | 28 ++++++++++++++-------------- scripts/upgrade | 16 ++++++++-------- 7 files changed, 39 insertions(+), 36 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/README.md b/README.md index 1cc011a..8e62878 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ 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~ynh1 diff --git a/README_fr.md b/README_fr.md index 8629bfa..78c0a32 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,9 +15,9 @@ 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~ynh1 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 832cca8..8028a2c 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..39a251e --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -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. \ No newline at end of file diff --git a/scripts/install b/scripts/install index 9169e1b..c229c00 100644 --- a/scripts/install +++ b/scripts/install @@ -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 #================================================= diff --git a/scripts/restore b/scripts/restore index e87e437..6c05c96 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3b87c8b..6464025 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,14 +108,6 @@ 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 #================================================= From 88b60add61e40cef3745291e0d539df059ce8f4e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Sep 2022 08:22:44 +0200 Subject: [PATCH 06/14] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7c8e85f..0d8a26d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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", From a72ba90c27d176a14b7bb6f3cb5c5b92911cea7f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 10 Sep 2022 06:22:49 +0000 Subject: [PATCH 07/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8e62878..97a0ec4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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~ynh1 +**Shipped version:** 0.9.2~ynh2 **Demo:** https://demo.yunohost.org/baikal/admin/ diff --git a/README_fr.md b/README_fr.md index 78c0a32..826f336 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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~ynh1 +**Version incluse :** 0.9.2~ynh2 **Démo :** https://demo.yunohost.org/baikal/admin/ From 8bc6e5744f14599d39f2db3943d5801ae1b35ce8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Sep 2022 08:34:28 +0200 Subject: [PATCH 08/14] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index c229c00..3a0cd5f 100644 --- a/scripts/install +++ b/scripts/install @@ -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" From 5bf1b1da8848b9ecb76e77fcf10559bbb3a9d8ff Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Sep 2022 14:31:04 +0200 Subject: [PATCH 09/14] Update manifest.json --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index 0d8a26d..5954e63 100644 --- a/manifest.json +++ b/manifest.json @@ -13,6 +13,7 @@ "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", From eaf022073572113d6040442febf93901e3f868e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 10 Sep 2022 12:31:14 +0000 Subject: [PATCH 10/14] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 97a0ec4..ce778e0 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Baïkal allows to seamlessly access your contacts and calendars from every devic ## Documentation and resources * Official app website: +* Official user documentation: * Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: diff --git a/README_fr.md b/README_fr.md index 826f336..790d012 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,7 @@ Baïkal permet d'accéder de manière transparente à vos contacts et calendrier ## Documentations et ressources * Site officiel de l'app : +* Documentation officielle utilisateur : * Documentation officielle de l'admin : * Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : From 566209f94af064853f0331f0842514cff343ae76 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Sep 2022 14:34:16 +0200 Subject: [PATCH 11/14] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 8028a2c..22618a9 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -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 are stored in a MySQL 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, 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. \ No newline at end of file From e11ccf56dacc586a6407ed518b01978b837b354e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 10 Sep 2022 12:34:27 +0000 Subject: [PATCH 12/14] Auto-update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce778e0..d8ce8c9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ 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 are stored in a MySQL 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, 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. From 39369b32040c3cf7edc42d975f078cc5590d96ed Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 22 Sep 2022 03:39:33 +0200 Subject: [PATCH 13/14] Apply last example_ynh --- .github/workflows/updater.sh | 84 ++++++++++++++++++------------------ check_process | 1 + conf/app.src | 1 + manifest.json | 2 +- scripts/_common.sh | 19 ++++++-- scripts/backup | 6 ++- scripts/change_url | 10 ++--- scripts/install | 18 +++++--- scripts/remove | 52 +++++++++++----------- scripts/restore | 31 +++++++------ scripts/upgrade | 19 ++++---- 11 files changed, 134 insertions(+), 109 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 50c6881..fd14205 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -9,9 +9,6 @@ # Since each app is different, maintainers can adapt its contents so as to perform # automatic actions when a new upstream release is detected. -# Remove this exit command when you are ready to run this Action -#exit 1 - #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS #================================================= @@ -25,9 +22,9 @@ assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ # Later down the script, we assume the version has only digits and dots # Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. +# You may need more tweaks here if the upstream repository has different naming conventions. if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} + version=${version:1} fi # Setting up the environment variables @@ -40,12 +37,12 @@ echo "PROCEED=false" >> $GITHUB_ENV # Proceed only if the retrieved version is greater than the current one if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 + echo "::warning ::No new version available" + exit 0 # Proceed only if a PR for this new version does not already exist elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 + echo "::warning ::A branch already exists for this update" + exit 0 fi # Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) @@ -61,55 +58,56 @@ echo "${#assets[@]} available asset(s)" # Let's loop over the array of assets URLs for asset_url in ${assets[@]}; do -echo "Handling asset at $asset_url" + echo "Handling asset at $asset_url" -# Assign the asset to a source file in conf/ directory -# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) -# Leave $src empty to ignore the asset -case $asset_url in - *"baikal-"*".zip") - src="app" - ;; - *) - src="" - ;; -esac + # Assign the asset to a source file in conf/ directory + # Here we base the source file name upon a unique keyword in the assets url (admin vs. update) + # Leave $src empty to ignore the asset + case $asset_url in + *"baikal-"*".zip") + src="app" + ;; + *) + src="" + ;; + esac -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then + # If $src is not empty, let's process the asset + if [ ! -z "$src" ]; then -# Create the temporary directory -tempdir="$(mktemp -d)" + # Create the temporary directory + tempdir="$(mktemp -d)" -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + # Download sources and calculate checksum + filename=${asset_url##*/} + curl --silent -4 -L $asset_url -o "$tempdir/$filename" + checksum=$(sha256sum "$tempdir/$filename" | head -c 64) -# Delete temporary directory -rm -rf $tempdir + # Delete temporary directory + rm -rf $tempdir -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi + # Get extension + if [[ $filename == *.tar.gz ]]; then + extension=tar.gz + else + extension=${filename##*.} + fi -# Rewrite source file -cat < conf/$src.src + # Rewrite source file + cat < conf/$src.src SOURCE_URL=$asset_url SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true EOT -echo "... conf/$src.src updated" + echo "... conf/$src.src updated" -else -echo "... asset ignored" -fi + else + echo "... asset ignored" + fi done diff --git a/check_process b/check_process index 3f57549..9b1daae 100644 --- a/check_process +++ b/check_process @@ -15,6 +15,7 @@ upgrade=1 from_commit=7c074c7b18322cde08c4eb57ffbc5ae174b7ae65 backup_restore=1 multi_instance=0 + port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index ee5cd22..c419b03 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 5954e63..c1c0231 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/_common.sh b/scripts/_common.sh index e77b284..76bfd01 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,14 +3,19 @@ #================================================= # COMMON VARIABLES #================================================= +# PHP APP SPECIFIC +#================================================= # dependencies used by the app -YNH_PHP_VERSION="8.0" +YNH_PHP_VERSION=8.0 -pkg_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" +php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap" + +# dependencies used by the app (must be on a single line) +pkg_dependencies="$php_dependencies" #================================================= -# EXPERIMENTAL HELPERS +# PERSONAL HELPERS #================================================= # Check if an URL is already handled @@ -44,3 +49,11 @@ is_url_handled() { return 1 fi } + +#================================================= +# EXPERIMENTAL HELPERS +#================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index e20a222..86cad22 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,13 +6,17 @@ # IMPORT GENERIC HELPERS #================================================= -# source ../settings/scripts/_common.sh +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/change_url b/scripts/change_url index 54431ae..bb5917c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -67,19 +67,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location diff --git a/scripts/install b/scripts/install index 3a0cd5f..39b34c0 100644 --- a/scripts/install +++ b/scripts/install @@ -6,13 +6,17 @@ # IMPORT GENERIC HELPERS #================================================= -source ./_common.sh +source _common.sh source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} +# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -22,19 +26,20 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH password=$YNH_APP_ARG_PASSWORD + +app=$YNH_APP_INSTANCE_NAME + timezone=$(cat /etc/timezone) encrypt_key=$(ynh_string_random 24) password_hash=$(echo -n admin:BaikalDAV:$password | sha256sum | cut -d ' ' -f 1) -app=$YNH_APP_INSTANCE_NAME - #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -77,7 +82,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= ynh_script_progression --message="Creating a MySQL database..." --weight=2 -db_name=$(ynh_sanitize_dbid $app) +db_name=$(ynh_sanitize_dbid --db_name=$app) 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 @@ -119,8 +124,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring $app..." --weight=3 -ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ - < "$final_path/Core/Resources/Db/MySQL/db.sql" +ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < "$final_path/Core/Resources/Db/MySQL/db.sql" #================================================= # CONFIGURE BAIKAL diff --git a/scripts/remove b/scripts/remove index 7da7426..cefdd0b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,11 +26,35 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Removing the MySQL database" --weight=1 +ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#================================================= +# REMOVE APP MAIN DIR +#================================================= +ynh_script_progression --message="Removing app main directory..." --weight=3 + +# Remove the app directory securely +ynh_secure_remove --file="$final_path" + +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 + +# Remove the dedicated NGINX config +ynh_remove_nginx_config + +#================================================= +# REMOVE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 + +# Remove the dedicated PHP-FPM config +ynh_remove_fpm_config + #================================================= # REMOVE DEPENDENCIES #================================================= @@ -39,36 +63,12 @@ ynh_script_progression --message="Removing dependencies..." --weight=3 # Remove metapackage and its dependencies ynh_remove_app_dependencies -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory" --weight=3 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration" --weight=1 - -# Remove the dedicated NGINX config -ynh_remove_nginx_config - -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration" --weight=1 - -# Remove the dedicated PHP-FPM config -ynh_remove_fpm_config - #================================================= # GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user" --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user ynh_system_user_delete --username=$app diff --git a/scripts/restore b/scripts/restore index 6c05c96..17e7a91 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -13,13 +14,16 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -65,28 +69,18 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=2 - -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - -#================================================= -# RESTORE USER RIGHTS -#================================================= - # Set permissions chown $app: "$final_path/config/baikal.yaml" chmod 640 "$final_path/config/baikal.yaml" +#================================================= +# SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=5 +# Define and install dependencies ynh_install_app_dependencies $pkg_dependencies #================================================= @@ -103,6 +97,15 @@ ynh_script_progression --message="Restoring the NGINX web server configuration.. ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=2 + +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6464025..fe9e335 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,13 +22,14 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) password_hash=$(ynh_app_setting_get --app=$app --key=password_hash) encrypt_key=$(ynh_app_setting_get --app=$app --key=encrypt_key) #================================================= # CHECK VERSION #================================================= +ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) @@ -40,12 +41,14 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# STANDARD UPGRADE STEPS #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -91,8 +94,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." - # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# STANDARD UPGRADE STEPS #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -101,7 +102,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=3 - ynh_setup_source --dest_dir="$final_path" --keep="Specific config" + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" --keep="config/baikal.yaml" fi chmod 750 "$final_path" @@ -134,16 +136,13 @@ ynh_add_nginx_config #================================================= # SPECIFIC UPGRADE #================================================= -# UPGRADE BAIKAL +# UPGRADE BAIKAL CONFIGURATION #================================================= # We keep this to allow upgrade the config file in case it needs to be changed. if [ "$upgrade_type" == "UPGRADE_APP" ] then - #================================================= - # UPGRADE BAIKAL CONFIGURATION - #================================================= ynh_script_progression --message="Upgrading the configuration file..." --weight=2 timezone=$(cat /etc/timezone) @@ -153,6 +152,8 @@ then chmod 640 "$final_path/config/baikal.yaml" fi +#================================================= +# GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= From c608f7572bafc076688ea0bb8db8100fad65e129 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 22 Sep 2022 22:57:12 +0200 Subject: [PATCH 14/14] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index c1c0231..e44cbab 100644 --- a/manifest.json +++ b/manifest.json @@ -18,8 +18,8 @@ }, "license": "GPL-3.0", "maintainer": { - "name": "julien", - "email": "julien.malik@paraiso.me" + "name": "", + "email": "" }, "requirements": { "yunohost": ">= 11.0.9"