mirror of
https://github.com/YunoHost-Apps/dotclear2_ynh.git
synced 2024-09-03 18:26:29 +02:00
Merge 11f6f25050 into 6baf817cd3
This commit is contained in:
Kayou
GitHub
commit
f7e23e29d3
15 changed files with 158 additions and 35 deletions
|
|
@ -5,4 +5,6 @@
|
|||
- [Irakurri README euskaraz](README_eu.md)
|
||||
- [Lire le README en français](README_fr.md)
|
||||
- [Le o README en galego](README_gl.md)
|
||||
- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
|
||||
- [Прочитать README на русский](README_ru.md)
|
||||
- [阅读中文（简体）的 README](README_zh_Hans.md)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ It shall NOT be edited by hand.
|
|||
|
||||
# DotClear 2 for YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ It shall NOT be edited by hand.
|
|||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Shipped version:** 2.27.3~ynh1
|
||||
**Shipped version:** 2.31.1~ynh1
|
||||
|
||||
**Demo:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ No se debe editar a mano.
|
|||
|
||||
# DotClear 2 para Yunohost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ No se debe editar a mano.
|
|||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Versión actual:** 2.27.3~ynh1
|
||||
**Versión actual:** 2.31.1~ynh1
|
||||
|
||||
**Demo:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ EZ editatu eskuz.
|
|||
|
||||
# DotClear 2 YunoHost-erako
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ EZ editatu eskuz.
|
|||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Paketatutako bertsioa:** 2.27.3~ynh1
|
||||
**Paketatutako bertsioa:** 2.31.1~ynh1
|
||||
|
||||
**Demoa:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
|
|||
|
||||
# DotClear 2 pour YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
|
|||
Dotclear est un logiciel de publication Web open source. L'objectif du projet Dotclear est de fournir un outil convivial permettant à chacun de publier sur le Web, quelles que soient ses compétences techniques.
|
||||
|
||||
|
||||
**Version incluse :** 2.27.3~ynh1
|
||||
**Version incluse :** 2.31.1~ynh1
|
||||
|
||||
**Démo :** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ NON debe editarse manualmente.
|
|||
|
||||
# DotClear 2 para YunoHost
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ NON debe editarse manualmente.
|
|||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Versión proporcionada:** 2.27.3~ynh1
|
||||
**Versión proporcionada:** 2.31.1~ynh1
|
||||
|
||||
**Demo:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
50
README_id.md
Normal file
50
README_id.md
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
<!--
|
||||
N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
|
||||
Ini TIDAK boleh diedit dengan tangan.
|
||||
-->
|
||||
|
||||
# DotClear 2 untuk YunoHost
|
||||
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
|
||||
|
||||
> *Paket ini memperbolehkan Anda untuk memasang DotClear 2 secara cepat dan mudah pada server YunoHost.*
|
||||
> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
|
||||
|
||||
## Ringkasan
|
||||
|
||||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Versi terkirim:** 2.31.1~ynh1
|
||||
|
||||
**Demo:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
## Tangkapan Layar
|
||||
|
||||
|
||||
|
||||
## Dokumentasi dan sumber daya
|
||||
|
||||
- Website aplikasi resmi: <https://dotclear.org>
|
||||
- Dokumentasi admin resmi: <https://dotclear.org/documentation/2.0>
|
||||
- Depot kode aplikasi hulu: <https://git.dotclear.org/dev/dotclear>
|
||||
- Gudang YunoHost: <https://apps.yunohost.org/app/dotclear2>
|
||||
- Laporkan bug: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
|
||||
|
||||
## Info developer
|
||||
|
||||
Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
|
||||
|
||||
Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
|
||||
|
||||
```bash
|
||||
sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
|
||||
atau
|
||||
sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
|
||||
50
README_ru.md
Normal file
50
README_ru.md
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
<!--
|
||||
Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
|
||||
Он НЕ ДОЛЖЕН редактироваться вручную.
|
||||
-->
|
||||
|
||||
# DotClear 2 для YunoHost
|
||||
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
*[Прочтите этот README на других языках.](./ALL_README.md)*
|
||||
|
||||
> *Этот пакет позволяет Вам установить DotClear 2 быстро и просто на YunoHost-сервер.*
|
||||
> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
|
||||
|
||||
## Обзор
|
||||
|
||||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**Поставляемая версия:** 2.31.1~ynh1
|
||||
|
||||
**Демо-версия:** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
## Снимки экрана
|
||||
|
||||
|
||||
|
||||
## Документация и ресурсы
|
||||
|
||||
- Официальный веб-сайт приложения: <https://dotclear.org>
|
||||
- Официальная документация администратора: <https://dotclear.org/documentation/2.0>
|
||||
- Репозиторий кода главной ветки приложения: <https://git.dotclear.org/dev/dotclear>
|
||||
- Магазин YunoHost: <https://apps.yunohost.org/app/dotclear2>
|
||||
- Сообщите об ошибке: <https://github.com/YunoHost-Apps/dotclear2_ynh/issues>
|
||||
|
||||
## Информация для разработчиков
|
||||
|
||||
Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing).
|
||||
|
||||
Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
|
||||
|
||||
```bash
|
||||
sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
|
||||
или
|
||||
sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug
|
||||
```
|
||||
|
||||
**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# YunoHost 上的 DotClear 2
|
||||
|
||||
[](https://dash.yunohost.org/appci/app/dotclear2)  
|
||||
[](https://ci-apps.yunohost.org/ci/apps/dotclear2/)  
|
||||
|
||||
[](https://install-app.yunohost.org/?app=dotclear2)
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills.
|
||||
|
||||
|
||||
**分发版本：** 2.27.3~ynh1
|
||||
**分发版本：** 2.31.1~ynh1
|
||||
|
||||
**演示：** <https://www.softaculous.com/demos/Dotclear>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
<?php
|
||||
class ldapDcAuth extends dcAuth
|
||||
use Dotclear\App;
|
||||
use Dotclear\Core\Auth;
|
||||
class ldapDcAuth extends Auth
|
||||
{
|
||||
# The user can't change his password
|
||||
protected $allow_pass_change = false;
|
||||
protected bool $allow_pass_change = false;
|
||||
|
||||
# LDAP parameter
|
||||
private $server = "localhost";
|
||||
private $port = "389";
|
||||
private $base = "dc=yunohost,dc=org";
|
||||
private string $server = "localhost";
|
||||
private string $port = "389";
|
||||
private string $base = "dc=yunohost,dc=org";
|
||||
|
||||
public function checkUser(string $user_id, ?string $pwd = NULL, ?string $user_key = NULL, bool $check_blog = true): bool
|
||||
{
|
||||
|
|
@ -56,9 +58,9 @@ class ldapDcAuth extends dcAuth
|
|||
}
|
||||
|
||||
# If the user exist, then we just update his password.
|
||||
if (dcCore::app()->userExists($user_id))
|
||||
if (App::users()->userExists($user_id))
|
||||
{
|
||||
$this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur);
|
||||
$this->sudo(array(App::users(), 'updUser'), $user_id, $cur);
|
||||
}
|
||||
# If not, we create him.
|
||||
# In order for him to connect,
|
||||
|
|
@ -69,7 +71,7 @@ class ldapDcAuth extends dcAuth
|
|||
$cur->user_lang = 'fr'; # Can change this, PR are welcome
|
||||
$cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome
|
||||
$cur->user_default_blog = 'default'; # Can change this, PR are welcome
|
||||
$this->sudo(array(dcCore::app(),'addUser'), $cur);
|
||||
$this->sudo(array(App::users(),'addUser'), $cur);
|
||||
# Possible roles:
|
||||
# admin "administrator"
|
||||
# contentadmin "manage all entries and comments"
|
||||
|
|
@ -100,7 +102,7 @@ class ldapDcAuth extends dcAuth
|
|||
$set_perms[$perm_id] = true;
|
||||
}
|
||||
}
|
||||
$this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
|
||||
$this->sudo(array(App::users(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true);
|
||||
}
|
||||
|
||||
$this->con->commit();
|
||||
|
|
|
|||
5
doc/POST_UPGRADE.d/2.30.0~ynh1.md
Normal file
5
doc/POST_UPGRADE.d/2.30.0~ynh1.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
There are a lot of broken plugins after the 2.30 migration.
|
||||
|
||||
In order to migrate your blog, we had to deactivate all plugins by creating a `_disabled` file inside each plugin folder located in `__INSTALL_DIR__/plugins/`.
|
||||
|
||||
Please remove these `_disabled` files one by one and make sure your blog is still working after each deletion.
|
||||
|
|
@ -7,7 +7,7 @@ name = "DotClear 2"
|
|||
description.en = "Blog publishing application"
|
||||
description.fr = "Moteur de blog"
|
||||
|
||||
version = "2.27.3~ynh1"
|
||||
version = "2.31.1~ynh1"
|
||||
|
||||
maintainers = ["kay0u"]
|
||||
|
||||
|
|
@ -56,14 +56,14 @@ ram.runtime = "50M"
|
|||
[resources.sources.latest]
|
||||
prefetch = false
|
||||
in_subdir = 2
|
||||
url = "https://download.dotclear.org/latest/dotclear-2.27.3.tar.gz"
|
||||
sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6"
|
||||
url = "https://download.dotclear.org/latest/dotclear-2.31.1.tar.gz"
|
||||
sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0"
|
||||
|
||||
[resources.sources.attic]
|
||||
prefetch = false
|
||||
in_subdir = 2
|
||||
url = "https://download.dotclear.org/attic/dotclear-2.27.3.tar.gz"
|
||||
sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6"
|
||||
url = "https://download.dotclear.org/attic/dotclear-2.31.1.tar.gz"
|
||||
sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0"
|
||||
|
||||
[resources.system_user]
|
||||
|
||||
|
|
|
|||
|
|
@ -95,8 +95,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_
|
|||
|
||||
cat << EOF >> $php_config
|
||||
|
||||
require dirname(__FILE__).'/class.auth.ldap.php';
|
||||
define('DC_AUTH_CLASS','ldapDcAuth');
|
||||
require_once dirname(__FILE__).'/class.auth.ldap.php';
|
||||
define('DC_AUTH_LDAP','ldapDcAuth');
|
||||
use Dotclear\Helper\Container\Factories;
|
||||
Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP);
|
||||
EOF
|
||||
|
||||
ynh_store_file_checksum --file=$php_config
|
||||
|
|
|
|||
|
|
@ -58,6 +58,15 @@ fi
|
|||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
|
||||
if ynh_compare_current_package_version --comparison lt --version 2.30.0~ynh1; then
|
||||
ynh_print_warn --message="Disable all plugins before the migration. To reactivate them, navigate to all plugins at $install_dir/plugins/, and remove each \"_disabled\" file one by one, and make sure you blog works as expected after each deletion"
|
||||
for folder in "$install_dir"/plugins/*/
|
||||
do
|
||||
ynh_print_warn --message="Plugin $folder disabled"
|
||||
touch "$folder"/_disabled
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Upgrading source files..."
|
||||
|
|
@ -116,8 +125,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_
|
|||
|
||||
cat << EOF >> $php_config
|
||||
|
||||
require dirname(__FILE__).'/class.auth.ldap.php';
|
||||
define('DC_AUTH_CLASS','ldapDcAuth');
|
||||
require_once dirname(__FILE__).'/class.auth.ldap.php';
|
||||
define('DC_AUTH_LDAP','ldapDcAuth');
|
||||
use Dotclear\Helper\Container\Factories;
|
||||
Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP);
|
||||
EOF
|
||||
|
||||
# Recalculate and store the checksum of the file for the next upgrade.
|
||||
|
|
|
|||
11
tests.toml
11
tests.toml
|
|
@ -6,8 +6,9 @@ test_format = 1.0
|
|||
|
||||
args.init_admin_permission="package_checker"
|
||||
|
||||
test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.name = "2.24.1~ynh1"
|
||||
test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.domain="domain.tld"
|
||||
test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.path="/dotclear2"
|
||||
test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.admin="package_checker"
|
||||
test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.is_public="true"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.name = "2.27.3~ynh1"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.domain="domain.tld"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.path="/dotclear2"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.admin="package_checker"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.is_public="true"
|
||||
test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.init_admin_permission="package_checker"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue