From d664ba0f1be13b370b49bde35b7e21bf9b51566b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:34:28 +0100 Subject: [PATCH 01/44] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From 48e58f44965f82ffed47b010020a60c3ffd215bf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Feb 2023 22:34:31 +0000 Subject: [PATCH 02/44] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 2fd9f62..facb628 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # DotClear 2 for YunoHost [![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 3dc4715..3c01153 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # DotClear 2 pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + [![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) *[Read this readme in english.](./README.md)* From 321e2b6fe3876b0a1834e186233f92adb58d6a90 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Aug 2023 16:35:47 +0000 Subject: [PATCH 03/44] Upgrade to v2.27.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index a838d6d..b78a417 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.24.1.zip -SOURCE_SUM=7d6c75d0b0d5c6f6aefaf663a32a6d0df24f9a915f96327676ba4157329a3390 +SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.27.1.zip +SOURCE_SUM=5f80ffca818424b7ff7da79d4d00edfd8785e98dafd0562b0f964a5808728d63 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c5df817..7809a4a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Blog publishing application", "fr": "Moteur de blog" }, - "version": "2.24.1~ynh1", + "version": "2.27.1~ynh1", "license": "GPL-2.0-or-later", "url": "https://dotclear.org/", "upstream": { From dcec3c6444bf0ad0a2c3e1ab447bed987ce32004 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 14 Aug 2023 16:35:52 +0000 Subject: [PATCH 04/44] 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 facb628..6e4807f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Blog publishing application -**Shipped version:** 2.24.1~ynh1 +**Shipped version:** 2.27.1~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index 3c01153..b79d569 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Moteur de blog -**Version incluse :** 2.24.1~ynh1 +**Version incluse :** 2.27.1~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 2d6fce8ce7854d3f7cb79950aa0b105cd15849b8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 14 Aug 2023 19:01:25 +0200 Subject: [PATCH 05/44] PHP8.2 --- scripts/_common.sh | 2 ++ scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 944a65e..092a127 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,8 @@ # COMMON VARIABLES #================================================= +phpversion=8.2 + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index cb124d7..6f6bf78 100755 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$phpversion #================================================= # SPECIFIC SETUP diff --git a/scripts/upgrade b/scripts/upgrade index 6ef5931..440903d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -177,7 +177,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$phpversion #================================================= # SPECIFIC UPGRADE From 9ba5395970bc827fc23378059d80f2581089fa92 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 17:52:30 +0200 Subject: [PATCH 06/44] Packaging v2 --- check_process | 22 -------- conf/app.src | 7 --- conf/nginx.conf | 2 +- conf/php-fpm.conf | 2 +- manifest.json | 55 ------------------- manifest.toml | 68 ++++++++++++++++++++++++ scripts/_common.sh | 2 - scripts/backup | 21 +------- scripts/change_url | 91 +------------------------------ scripts/install | 125 ++++++------------------------------------- scripts/remove | 40 -------------- scripts/restore | 51 +++--------------- scripts/upgrade | 130 +++++++-------------------------------------- tests.toml | 5 ++ 14 files changed, 119 insertions(+), 502 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src delete mode 100644 manifest.json create mode 100644 manifest.toml create mode 100644 tests.toml diff --git a/check_process b/check_process deleted file mode 100644 index 8e1aba9..0000000 --- a/check_process +++ /dev/null @@ -1,22 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - admin="john" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index b78a417..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=http://download.dotclear.org/latest/dotclear-2.27.1.zip -SOURCE_SUM=5f80ffca818424b7ff7da79d4d00edfd8785e98dafd0562b0f964a5808728d63 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index b26a6dc..c5d0284 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/ ; + alias __INSTALL_DIR__/ ; index index.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab1a471..13a53b0 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -358,7 +358,7 @@ request_terminate_timeout = 1d ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot -chdir = __FINALPATH__ +chdir = __INSTALL_DIR__ ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 7809a4a..0000000 --- a/manifest.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "DotClear 2", - "id": "dotclear2", - "packaging_format": 1, - "description": { - "en": "Blog publishing application", - "fr": "Moteur de blog" - }, - "version": "2.27.1~ynh1", - "license": "GPL-2.0-or-later", - "url": "https://dotclear.org/", - "upstream": { - "license": "GPL-2.0-or-later", - "website": "https://dotclear.org", - "demo": "https://www.softaculous.com/demos/Dotclear", - "admindoc": "https://dotclear.org/documentation/2.0", - "code": "https://git.dotclear.org/dev/dotclear" - }, - "maintainer": { - "name": "kay0u", - "email": "pierre@kayou.io" - }, - "requirements": { - "yunohost": ">= 11.0.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php7.3-fpm", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/dotclear2", - "default": "/dotclear2" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, - { - "name": "admin", - "type": "user" - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..6b7b920 --- /dev/null +++ b/manifest.toml @@ -0,0 +1,68 @@ +packaging_format = 2 + +id = "dotclear2" +name = "DotClear 2" +description.en = "Blog publishing application" +description.fr = "Moteur de blog" + +version = "2.27.1~ynh1" + +maintainers = ["kay0u"] + +[upstream] +license = "GPL-2.0-or-later" +website = "https://dotclear.org" +demo = "https://www.softaculous.com/demos/Dotclear" +admindoc = "https://dotclear.org/documentation/2.0" +code = "https://git.dotclear.org/dev/dotclear" +cpe = "cpe:2.3:a:dotclear:dotclear" +fund = "https://dotclear.org/donate" + +[integration] +yunohost = ">= 11.0.0" +architectures = "all" +multi_instance = true +ldap = true +sso = false +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + type = "domain" + + [install.path] + type = "path" + default = "/dotclear2" + + [install.init_main_permission] + type = "group" + default = "visitors" + + [install.admin] + type = "user" + +[resources] + [resources.sources.latest] + prefetch = false + url = "http://download.dotclear.org/latest/dotclear-2.27.1.zip" + sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" + + [resources.sources.attic] + prefetch = false + url = "http://download.dotclear.org/attic/dotclear-2.27.1.zip" + sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.database] + type = "mysql" + + [resources.apt] + packages = ["php8.2", "php8.2-fpm"] diff --git a/scripts/_common.sh b/scripts/_common.sh index 092a127..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -phpversion=8.2 - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 2fa3523..04eed75 100755 --- a/scripts/backup +++ b/scripts/backup @@ -10,25 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -app=$YNH_APP_INSTANCE_NAME - -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -38,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index cd8e436..40f93a7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,62 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." - -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) - -# Add settings here as needed by your application -db_name=$(ynh_app_setting_get --app=$app --key=db_name) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -72,29 +16,7 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# 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 - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi +ynh_change_url_nginx_config #================================================= # SPECIFIC MODIFICATIONS @@ -116,7 +38,7 @@ ynh_mysql_execute_as_root --sql="UPDATE dc_setting SET setting_value='$new_theme #================================================= ynh_script_progression --message="Updating configuration file..." -php_config=$final_path/inc/config.php +php_config=$install_dir/inc/config.php ynh_backup_if_checksum_is_different --file="$php_config" @@ -129,15 +51,6 @@ ynh_store_file_checksum --file="$php_config" chmod 400 "$php_config" chown $app:$app "$php_config" -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 6f6bf78..b9a5f84 100755 --- a/scripts/install +++ b/scripts/install @@ -9,86 +9,26 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC -admin=$YNH_APP_ARG_ADMIN - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -ynh_script_progression --message="Validating installation parameters..." - -final_path=/var/www/$app -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 - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." - -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=admin --value=$admin - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# 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..." --weight=2 - -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 -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=4 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path - # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz -src_url=$(grep 'SOURCE_URL=' "../conf/app.src" | cut -d= -f2-) +src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[latest].url") if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string --match_string="latest" --replace_string="attic" --target_file="../conf/app.src" + ynh_setup_source --dest_dir="$install_dir" --source_id="attic" +else + ynh_setup_source --dest_dir="$install_dir" --source_id="latest" fi -# 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" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" # https://dotclear.org/documentation/2.0/admin/install -mkdir -p "$final_path/"{cache,public} -setfacl -m d:u:www-data:rwx "$final_path/"{cache,public} +mkdir -p "$install_dir/"{cache,public} +setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} #================================================= # NGINX CONFIGURATION @@ -104,7 +44,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion +ynh_add_fpm_config #================================================= # SPECIFIC SETUP @@ -113,14 +53,14 @@ ynh_add_fpm_config --phpversion=$phpversion #================================================= ynh_script_progression --message="Adding a configuration file..." -php_config=$final_path/inc/config.php +php_config=$install_dir/inc/config.php master_key=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=master_key --value=$master_key cp $php_config.in $php_config -admin_url="${path_url%/}/admin/" +admin_url="${path%/}/admin/" email=$(ynh_user_get_info --username=$admin --key=mail) @@ -145,6 +85,7 @@ blog_media_admin="false" blog_media="false" blog_pages="false" blog_blogroll="false" + ynh_app_setting_set --app=$app --key=blog_admin --value=$blog_admin ynh_app_setting_set --app=$app --key=blog_contentadmin --value=$blog_contentadmin ynh_app_setting_set --app=$app --key=blog_usage --value=$blog_usage @@ -156,7 +97,7 @@ ynh_app_setting_set --app=$app --key=blog_media --value=$blog_media ynh_app_setting_set --app=$app --key=blog_pages --value=$blog_pages ynh_app_setting_set --app=$app --key=blog_blogroll --value=$blog_blogroll -ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$final_path/inc/class.auth.ldap.php" +ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_dir/inc/class.auth.ldap.php" cat << EOF >> $php_config @@ -172,16 +113,6 @@ chown $app:$app "$php_config" #================================================= # SETUP APPLICATION WITH CURL #================================================= -ynh_script_progression --message="Setuping application with CURL..." - -# Set the app as temporarily public for curl call -ynh_script_progression --message="Configuring SSOwat..." -# Making the app public for curl -ynh_permission_update --permission="main" --add="visitors" - -# Reload Nginx -ynh_systemd_action --service_name=nginx --action=reload - ynh_script_progression --message="Finalizing installation..." --weight=14 firstname=$(ynh_user_get_info --username=$admin --key=firstname) @@ -195,9 +126,6 @@ installUrl="/admin/install/index.php" ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$lastname" "u_login=$admin" "u_pwd=$password" "u_pwd2=$password" -# Remove the public access -ynh_permission_update --permission="main" --remove="visitors" - #================================================= # GENERIC FINALIZATION #================================================= @@ -206,30 +134,7 @@ ynh_permission_update --permission="main" --remove="visitors" ynh_script_progression --message="Configuring Fail2Ban..." # Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $final_path/inc/class.auth.ldap.php .* client: , .*https://$domain${path_url%/}/admin/auth.php" - -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" -fi - -# Only the admin can access the admin panel of the app (if the app has an admin panel) -ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." - -ynh_systemd_action --service_name=nginx --action=reload +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: , .*https://$domain${path%/}/admin/auth.php" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index f2a4bf0..768ea30 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,36 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." - -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) - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Removing the MySQL database..." - -# 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..." - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -63,16 +33,6 @@ ynh_script_progression --message="Removing Fail2Ban configuration..." # Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 619a437..ee62cc6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,35 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." - -app=$YNH_APP_INSTANCE_NAME - -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) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - #================================================= # STANDARD RESTORATION STEPS #================================================= @@ -48,28 +19,20 @@ ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=2 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" # https://dotclear.org/documentation/2.0/admin/install -mkdir -p "$final_path/"{cache,public} -setfacl -m d:u:www-data:rwx "$final_path/"{cache,public} +mkdir -p "$install_dir/"{cache,public} +setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -94,8 +57,6 @@ ynh_systemd_action --action=restart --service_name=fail2ban #================================================= ynh_script_progression --message="Restoring the MySQL database..." --weight=3 -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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 440903d..6486b5d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,34 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." - -app=$YNH_APP_INSTANCE_NAME - -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=admin) -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) -password=$(ynh_app_setting_get --app=$app --key=password) -master_key=$(ynh_app_setting_get --app=$app --key=master_key) - -blog_admin=$(ynh_app_setting_get --app=$app --key=blog_admin) -blog_contentadmin=$(ynh_app_setting_get --app=$app --key=blog_contentadmin) -blog_usage=$(ynh_app_setting_get --app=$app --key=blog_usage) -blog_publish=$(ynh_app_setting_get --app=$app --key=blog_publish) -blog_delete=$(ynh_app_setting_get --app=$app --key=blog_delete) -blog_categories=$(ynh_app_setting_get --app=$app --key=blog_categories) -blog_media_admin=$(ynh_app_setting_get --app=$app --key=blog_media_admin) -blog_media=$(ynh_app_setting_get --app=$app --key=blog_media) -blog_pages=$(ynh_app_setting_get --app=$app --key=blog_pages) -blog_blogroll=$(ynh_app_setting_get --app=$app --key=blog_blogroll) - #================================================= # CHECK VERSION #================================================= @@ -44,20 +16,6 @@ ynh_script_progression --message="Checking version..." 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 - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -65,38 +23,6 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name -fi - -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path -fi - -if [ -n "$(ynh_app_setting_get --app=$app --key=is_public)" ]; then - ynh_app_setting_delete --app=$app --key=protected_uris - - # Removing skipped/unprotected_uris under certain conditions, remove the visitors group added during the migration process of 3.7 - # Remove unprotected_uris. If the app was public, add visitors again to the main permission - if ynh_permission_has_user --permission=main --user=visitors - then - ynh_app_setting_delete --app=$app --key=unprotected_uris - ynh_permission_update --permission "main" --add "visitors" - else - ynh_app_setting_delete --app=$app --key=unprotected_uris - fi - ynh_app_setting_delete --app=$app --key=is_public -fi - -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - if [ -z "$blog_admin" ] || [ -z "$blog_contentadmin" ] || [ -z "$blog_usage" ] || @@ -117,51 +43,43 @@ if [ -z "$blog_admin" ] || blog_media="false" blog_pages="false" blog_blogroll="false" - ynh_app_setting_set --app=$app --key=blog_admin --value=$blog_admin - ynh_app_setting_set --app=$app --key=blog_contentadmin --value=$blog_contentadmin + ynh_app_setting_set --app=$app --key=blog_admin --value=$blog_admin + ynh_app_setting_set --app=$app --key=blog_contentadmin --value=$blog_contentadmin ynh_app_setting_set --app=$app --key=blog_usage --value=$blog_usage ynh_app_setting_set --app=$app --key=blog_publish --value=$blog_publish ynh_app_setting_set --app=$app --key=blog_delete --value=$blog_delete ynh_app_setting_set --app=$app --key=blog_categories --value=$blog_categories - ynh_app_setting_set --app=$app --key=blog_media_admin --value=$blog_media_admin + ynh_app_setting_set --app=$app --key=blog_media_admin --value=$blog_media_admin ynh_app_setting_set --app=$app --key=blog_media --value=$blog_media ynh_app_setting_set --app=$app --key=blog_pages --value=$blog_pages ynh_app_setting_set --app=$app --key=blog_blogroll --value=$blog_blogroll fi -#================================================= -# 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 --home_dir=$final_path - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= if [ "$upgrade_type" == "UPGRADE_APP" ] then - # Download, check integrity, uncompress and patch the source from app.src - # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz - src_url=$(grep 'SOURCE_URL=' "../conf/app.src" | cut -d= -f2-) - if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_replace_string "latest" "attic" ../conf/app.src - fi ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz + src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[latest].url") + if ! curl --output /dev/null --silent --head --fail "$src_url"; then + ynh_setup_source --dest_dir="$install_dir" --source_id="attic" + else + ynh_setup_source --dest_dir="$install_dir" --source_id="latest" + fi fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" # https://dotclear.org/documentation/2.0/admin/install -mkdir -p "$final_path/"{cache,public} -setfacl -m d:u:www-data:rwx "$final_path/"{cache,public} +mkdir -p "$install_dir/"{cache,public} +setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} #================================================= # NGINX CONFIGURATION @@ -177,7 +95,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion +ynh_add_fpm_config #================================================= # SPECIFIC UPGRADE @@ -186,13 +104,13 @@ ynh_add_fpm_config --phpversion=$phpversion #================================================= ynh_script_progression --message="Updating a configuration file..." -php_config=$final_path/inc/config.php +php_config=$install_dir/inc/config.php ynh_backup_if_checksum_is_different --file=$php_config cp $php_config.in $php_config -admin_url="${path_url%/}/admin/" +admin_url="${path%/}/admin/" email=$(ynh_user_get_info --username=$admin --key=mail) @@ -207,7 +125,7 @@ ynh_replace_string --match_string="'DC_ADMIN_URL', ''" --replace_string="'DC_ADM ynh_replace_string --match_string="'DC_ADMIN_MAILFROM', ''" --replace_string="'DC_ADMIN_MAILFROM', '$email'" --target_file=$php_config # Adding LDAP login -ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$final_path/inc/class.auth.ldap.php" +ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_dir/inc/class.auth.ldap.php" cat << EOF >> $php_config @@ -237,15 +155,7 @@ ynh_local_curl $adminUrl ynh_script_progression --message="Reconfiguring Fail2Ban..." # Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $final_path/inc/class.auth.ldap.php .* client: , .*https://$domain${path_url%/}/admin/auth.php" - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FRM..." - -ynh_systemd_action --service_name=nginx --action=reload -ynh_systemd_action --service_name=php$YNH_PHP_VERSION-fpm --action=reload +ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: , .*https://$domain${path%/}/admin/auth.php" #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..1520b9b --- /dev/null +++ b/tests.toml @@ -0,0 +1,5 @@ +test_format = 1.0 + +[default] + + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" From 9d914c0cf68782f140c7483c20dc298f0e06abbc Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 18:21:57 +0200 Subject: [PATCH 07/44] Fix manifest read for sources --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b9a5f84..a83cdc8 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=4 # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz -src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[latest].url") +src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources.latest.url") if ! curl --output /dev/null --silent --head --fail "$src_url"; then ynh_setup_source --dest_dir="$install_dir" --source_id="attic" else diff --git a/scripts/upgrade b/scripts/upgrade index 6486b5d..b6717a1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ then # Download, check integrity, uncompress and patch the source from app.src # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz - src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources[latest].url") + src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources.latest.url") if ! curl --output /dev/null --silent --head --fail "$src_url"; then ynh_setup_source --dest_dir="$install_dir" --source_id="attic" else From e8c7e8749347d9e97266ae97d01dbd3003db52d6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 18:29:55 +0200 Subject: [PATCH 08/44] Fix manifest --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 6b7b920..7f539be 100644 --- a/manifest.toml +++ b/manifest.toml @@ -65,4 +65,4 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen type = "mysql" [resources.apt] - packages = ["php8.2", "php8.2-fpm"] + packages = "php8.2, php8.2-fpm" From c5071720314325d7371e73e66ce83f1f20a2761c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 19:02:46 +0200 Subject: [PATCH 09/44] Appease linter --- doc/DESCRIPTION.md | 35 +++++++++++++++++++++++++++++++++++ doc/DISCLAIMER.md | 9 --------- manifest.toml | 6 +++--- 3 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 doc/DESCRIPTION.md delete mode 100644 doc/DISCLAIMER.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..f4c2455 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,35 @@ +Dotclear is an open-source web publishing software. +Take control over your blog! + +Dotclear project's purpose is to provide a user-friendly +tool allowing anyone to publish on the web, regardless of their technical skills. + +### Features + +- Easy publication +- Fully customizable theme +- User-friendly administration +- Flexible template system +- Media management +- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) +- Flexible comment system +- Built-in antispam +- Localization +- Presentation widgets +- Themes and plugins +- Pages +- Tags and categories +- Automated installation +- Support for several database types +- Multiblog +- Multi-user with permissions +- Standards compliant +- Accessible +- Importing / exporting +- Naturally optimized for search engines +- Syndication feeds +- Complete trackback/pingback/webmention support +- Full Unicode support +- Extensible +- Performance and scalability +- Twice free diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index 2567513..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,9 +0,0 @@ -## Configuration - -How to configure this app: by an admin panel. - -#### Multi-users support - -Are LDAP supported? **Yes** -Are HTTP auth supported? **No** (PR are welcome!) -Can the app be used by multiple users? **Yes** diff --git a/manifest.toml b/manifest.toml index 7f539be..b65eb40 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,8 +61,8 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.permissions] main.url = "/" + [resources.apt] + packages = "mariadb-server, php8.2, php8.2-fpm" + [resources.database] type = "mysql" - - [resources.apt] - packages = "php8.2, php8.2-fpm" From 81281c0bb67b375ecf29c3280643f703662c848a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 19:05:29 +0200 Subject: [PATCH 10/44] Fix sources --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index b65eb40..77dfcd0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,12 +46,12 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources] [resources.sources.latest] prefetch = false - url = "http://download.dotclear.org/latest/dotclear-2.27.1.zip" + url = "https://download.dotclear.org/latest/dotclear-2.27.1.zip" sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" [resources.sources.attic] prefetch = false - url = "http://download.dotclear.org/attic/dotclear-2.27.1.zip" + url = "https://download.dotclear.org/attic/dotclear-2.27.1.zip" sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" [resources.system_user] From 00a55b76c62add0a5aad2e9e49f2765c9921813d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 15 Aug 2023 17:09:58 +0000 Subject: [PATCH 11/44] Auto-update README --- README.md | 49 ++++++++++++++++++++++++++++++++++++------------- README_fr.md | 49 ++++++++++++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 6e4807f..951e310 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,42 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Blog publishing application +Dotclear is an open-source web publishing software. +Take control over your blog! + +Dotclear project's purpose is to provide a user-friendly +tool allowing anyone to publish on the web, regardless of their technical skills. + +### Features + +- Easy publication +- Fully customizable theme +- User-friendly administration +- Flexible template system +- Media management +- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) +- Flexible comment system +- Built-in antispam +- Localization +- Presentation widgets +- Themes and plugins +- Pages +- Tags and categories +- Automated installation +- Support for several database types +- Multiblog +- Multi-user with permissions +- Standards compliant +- Accessible +- Importing / exporting +- Naturally optimized for search engines +- Syndication feeds +- Complete trackback/pingback/webmention support +- Full Unicode support +- Extensible +- Performance and scalability +- Twice free + **Shipped version:** 2.27.1~ynh1 @@ -26,18 +61,6 @@ Blog publishing application ![Screenshot of DotClear 2](./doc/screenshots/ss2_dotclear.png) -## Disclaimers / important information - -## Configuration - -How to configure this app: by an admin panel. - -#### Multi-users support - -Are LDAP supported? **Yes** -Are HTTP auth supported? **No** (PR are welcome!) -Can the app be used by multiple users? **Yes** - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index b79d569..81db966 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,42 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Moteur de blog +Dotclear is an open-source web publishing software. +Take control over your blog! + +Dotclear project's purpose is to provide a user-friendly +tool allowing anyone to publish on the web, regardless of their technical skills. + +### Features + +- Easy publication +- Fully customizable theme +- User-friendly administration +- Flexible template system +- Media management +- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) +- Flexible comment system +- Built-in antispam +- Localization +- Presentation widgets +- Themes and plugins +- Pages +- Tags and categories +- Automated installation +- Support for several database types +- Multiblog +- Multi-user with permissions +- Standards compliant +- Accessible +- Importing / exporting +- Naturally optimized for search engines +- Syndication feeds +- Complete trackback/pingback/webmention support +- Full Unicode support +- Extensible +- Performance and scalability +- Twice free + **Version incluse :** 2.27.1~ynh1 @@ -26,18 +61,6 @@ Moteur de blog ![Capture d’écran de DotClear 2](./doc/screenshots/ss2_dotclear.png) -## Avertissements / informations importantes - -## Configuration - -How to configure this app: by an admin panel. - -#### Multi-users support - -Are LDAP supported? **Yes** -Are HTTP auth supported? **No** (PR are welcome!) -Can the app be used by multiple users? **Yes** - ## Documentations et ressources * Site officiel de l’app : From 678c9e4aeb5310f7c73b535e7563c516972ad807 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 19:57:16 +0200 Subject: [PATCH 12/44] Fix sources, again --- manifest.toml | 6 ++++-- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 77dfcd0..0f7eb28 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,12 +46,14 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources] [resources.sources.latest] prefetch = false - url = "https://download.dotclear.org/latest/dotclear-2.27.1.zip" + in_subdir = 2 + url = "https://download.dotclear.org/latest/dotclear-2.27.1.tar.gz" sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" [resources.sources.attic] prefetch = false - url = "https://download.dotclear.org/attic/dotclear-2.27.1.zip" + in_subdir = 2 + url = "https://download.dotclear.org/attic/dotclear-2.27.1.tar.gz" sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" [resources.system_user] diff --git a/scripts/install b/scripts/install index a83cdc8..6f33707 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=4 # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz -src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources.latest.url") +src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r) if ! curl --output /dev/null --silent --head --fail "$src_url"; then ynh_setup_source --dest_dir="$install_dir" --source_id="attic" else diff --git a/scripts/upgrade b/scripts/upgrade index b6717a1..e784ef0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ then # Download, check integrity, uncompress and patch the source from app.src # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz - src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq ".resources.sources.latest.url") + src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r) if ! curl --output /dev/null --silent --head --fail "$src_url"; then ynh_setup_source --dest_dir="$install_dir" --source_id="attic" else From 40de613f5c50e76eaff97147aa0350de9be373e9 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 21:47:12 +0200 Subject: [PATCH 13/44] PHP7.4 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0f7eb28..2814aa9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -64,7 +64,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2, php8.2-fpm" + packages = "mariadb-server, php7.4, php7.4-fpm" [resources.database] type = "mysql" From 70f7aad6a70f2bfae14d52802a0462a3f3753d6d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 23:13:43 +0200 Subject: [PATCH 14/44] Require class.auth.ldap.php --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6f33707..052c39d 100755 --- a/scripts/install +++ b/scripts/install @@ -101,7 +101,7 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -\$__autoload['ldapDcAuth'] = dirname(__FILE__).'/class.auth.ldap.php'; +require dirname(__FILE__).'/class.auth.ldap.php'; define('DC_AUTH_CLASS','ldapDcAuth'); EOF From fd2566418bc5371b2200e8139253f12075679c44 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 15 Aug 2023 23:20:09 +0200 Subject: [PATCH 15/44] Require class.auth.ldap.php in upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e784ef0..e8cb7a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -129,7 +129,7 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -\$__autoload['ldapDcAuth'] = dirname(__FILE__).'/class.auth.ldap.php'; +require dirname(__FILE__).'/class.auth.ldap.php'; define('DC_AUTH_CLASS','ldapDcAuth'); EOF From 8c2b7ef2cc1b0c46379aa7470605612cea819186 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 9 Oct 2023 10:36:08 +0200 Subject: [PATCH 16/44] Add php7.4-mbstring dependency --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2814aa9..d313ce2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -64,7 +64,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.url = "/" [resources.apt] - packages = "mariadb-server, php7.4, php7.4-fpm" + packages = "mariadb-server, php7.4, php7.4-fpm, php7.4-mbstring" [resources.database] type = "mysql" From 100047ce28816f72efb39b8cb5d2f2c00a85e496 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 9 Oct 2023 08:36:14 +0000 Subject: [PATCH 17/44] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 951e310..e6cf0d9 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,6 @@ tool allowing anyone to publish on the web, regardless of their technical skills * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 81db966..36225db 100644 --- a/README_fr.md +++ b/README_fr.md @@ -66,7 +66,6 @@ tool allowing anyone to publish on the web, regardless of their technical skills * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From befdbe52e63e00b2ccb89057da2219ea62540eb9 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 07:40:55 +0200 Subject: [PATCH 18/44] Upgrade to 2.27.3 and PHP8.2, fix PHP dependencies --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index d313ce2..1863baf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -47,14 +47,14 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.sources.latest] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/latest/dotclear-2.27.1.tar.gz" - sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" + url = "https://download.dotclear.org/latest/dotclear-2.27.3.tar.gz" + sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6" [resources.sources.attic] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/attic/dotclear-2.27.1.tar.gz" - sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8" + url = "https://download.dotclear.org/attic/dotclear-2.27.3.tar.gz" + sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6" [resources.system_user] @@ -64,7 +64,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.url = "/" [resources.apt] - packages = "mariadb-server, php7.4, php7.4-fpm, php7.4-mbstring" + packages = "mariadb-server, php8.2, php8.2-fpm, php8.2-mbstring, php8.2-mysql, php-iconv, php8.2-xml, php8.2-cli, php8.2-intl, php8.2-ldap" [resources.database] type = "mysql" From 71d3b856ffbd22f518a4d8665bba4118b4410975 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 20:51:13 +0200 Subject: [PATCH 19/44] Disable internal Dotclear update --- scripts/install | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 052c39d..304602c 100755 --- a/scripts/install +++ b/scripts/install @@ -73,6 +73,7 @@ ynh_replace_string --match_string="'DC_DBNAME', ''" --replace_string="'DC_DBNAME ynh_replace_string --match_string="'DC_MASTER_KEY', ''" --replace_string="'DC_MASTER_KEY', '$master_key'" --target_file=$php_config ynh_replace_string --match_string="'DC_ADMIN_URL', ''" --replace_string="'DC_ADMIN_URL', 'https://$domain$admin_url'" --target_file=$php_config ynh_replace_string --match_string="'DC_ADMIN_MAILFROM', ''" --replace_string="'DC_ADMIN_MAILFROM', '$email'" --target_file=$php_config +ynh_replace_string --match_string="//define('DC_NOT_UPDATE', false);" --replace_string="define('DC_NOT_UPDATE', true);" --target_file=$php_config # Adding LDAP login blog_admin="false" diff --git a/scripts/upgrade b/scripts/upgrade index e8cb7a4..b5b457b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,6 +123,7 @@ ynh_replace_string --match_string="'DC_DBNAME', ''" --replace_string="'DC_DBNAME ynh_replace_string --match_string="'DC_MASTER_KEY', ''" --replace_string="'DC_MASTER_KEY', '$master_key'" --target_file=$php_config ynh_replace_string --match_string="'DC_ADMIN_URL', ''" --replace_string="'DC_ADMIN_URL', 'https://$domain$admin_url'" --target_file=$php_config ynh_replace_string --match_string="'DC_ADMIN_MAILFROM', ''" --replace_string="'DC_ADMIN_MAILFROM', '$email'" --target_file=$php_config +ynh_replace_string --match_string="//define('DC_NOT_UPDATE', false);" --replace_string="define('DC_NOT_UPDATE', true);" --target_file=$php_config # Adding LDAP login ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_dir/inc/class.auth.ldap.php" From 76ad8d900b29090e0d28fac6877db0f2fe1f92a8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 21:39:51 +0200 Subject: [PATCH 20/44] Fix admin permissions and setup --- manifest.toml | 4 ++++ scripts/install | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/manifest.toml b/manifest.toml index 1863baf..2c869ae 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,6 +42,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [install.admin] type = "user" + help.en = "Choose the Dotclear super user. By default, all users in the admin group will be admins of Dotclear." [resources] [resources.sources.latest] @@ -62,6 +63,9 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.permissions] main.url = "/" + admin.url = "/admin" + admin.show_tile = false + admin.allowed = "admins" [resources.apt] packages = "mariadb-server, php8.2, php8.2-fpm, php8.2-mbstring, php8.2-mysql, php-iconv, php8.2-xml, php8.2-cli, php8.2-intl, php8.2-ldap" diff --git a/scripts/install b/scripts/install index 304602c..862b3da 100755 --- a/scripts/install +++ b/scripts/install @@ -116,6 +116,9 @@ chown $app:$app "$php_config" #================================================= ynh_script_progression --message="Finalizing installation..." --weight=14 +# Give the admin the proper permission and give temporary admin access to visitors +ynh_permission_update --permission="admin" --add="$admin" "visitors" + firstname=$(ynh_user_get_info --username=$admin --key=firstname) lastname=$(ynh_user_get_info --username=$admin --key=lastname) email=$(ynh_user_get_info --username=$admin --key=mail) @@ -127,6 +130,9 @@ installUrl="/admin/install/index.php" ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$lastname" "u_login=$admin" "u_pwd=$password" "u_pwd2=$password" +# Remove visitor access to admin +ynh_permission_update --permission="admin" --remove="visitors" + #================================================= # GENERIC FINALIZATION #================================================= From 1a2b8d4dc16ccb8e2e6d7c20f71032dce9cb1785 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 22:55:00 +0200 Subject: [PATCH 21/44] Improve admin permissions and setup --- manifest.toml | 6 ++-- scripts/config | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 5 +++- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 scripts/config diff --git a/manifest.toml b/manifest.toml index 2c869ae..1d27a63 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,9 +40,10 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen type = "group" default = "visitors" - [install.admin] + [install.init_admin_permission] type = "user" - help.en = "Choose the Dotclear super user. By default, all users in the admin group will be admins of Dotclear." + ask.en = "Choose the Dotclear super user." + help.en = "You can later on give admin permission to more users." [resources] [resources.sources.latest] @@ -65,7 +66,6 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.url = "/" admin.url = "/admin" admin.show_tile = false - admin.allowed = "admins" [resources.apt] packages = "mariadb-server, php8.2, php8.2-fpm, php8.2-mbstring, php8.2-mysql, php-iconv, php8.2-xml, php8.2-cli, php8.2-intl, php8.2-ldap" diff --git a/scripts/config b/scripts/config new file mode 100644 index 0000000..6939c07 --- /dev/null +++ b/scripts/config @@ -0,0 +1,77 @@ +#!/bin/bash + +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source /usr/share/yunohost/helpers + +ynh_abort_if_errors + +#================================================= +# SPECIFIC SETTERS FOR TOML SHORT KEYS +#================================================= +set__blogs_list() { + + declare -A domain_array + declare -A path_array + + for blog in $(echo $blogs_list | sed "s/,/ /"); do + id=$(echo $blog | cut -d@ -f1) + domain=$(echo $blog | cut -d@ -f2 | cut -d/ -f1) + path="/$(echo $blog | cut -d@ -f2 | cut -d/ -f2)" + + domain_array+=([$id]=$domain) + path_array+=([$id]=$path) + done + + declare -A old_domain_array + declare -A old_path_array + + for blog in $(echo ${old[blogs_list]} | sed "s/,/ /"); do + id=$(echo $blog | cut -d@ -f1) + domain=$(echo $blog | cut -d@ -f2 | cut -d/ -f1) + path="/$(echo $blog | cut -d@ -f2 | cut -d/ -f2)" + + old_domain_array+=([$id]=$domain) + old_path_array+=([$id]=$path) + done + + # https://stackoverflow.com/questions/2312762/compare-difference-of-two-arrays-in-bash + # Get added and removed blogs + added_ids_array=(`echo ${!domain_array[@]} ${!old_domain_array[@]} | tr ' ' '\n' | sort | uniq -u `) + removed_ids_array=(`echo ${!old_domain_array[@]} $!domain_array[@]} | tr ' ' '\n' | sort | uniq -D | uniq `) + + for id in $removed_ids_array; do + if [ ynh_permission_exists --permission="$id" ]; then + ynh_permission_delete --permission="$id" + fi + ynh_secure_remove --file="/etc/nginx/conf.d/${old_domain_array[$id]}.d/$app.conf" + done + + for id in $domain_array; do + + if [ $domain_array[$id] != $old_domain_array[$id] ]; then + mv /etc/nginx/conf.d/${old_domain_array[$id]}.d/$app.conf /etc/nginx/conf.d/${domain_array[$id]}.d/$app.conf + fi + + if [ $path_array[$id] != $old_path_array[$id] ]; then + domain=$domain_array[$id] + path=$path_array[$id] + ynh_add_config --template="nginx.conf" --destination="/etc/nginx/conf.d/${domain_array[$id]}.d/$app.conf" + fi + + if [ ynh_permission_exists --permission="$id" ]; then + ynh_permission_url --permission="$id" --url="$domain_array[$id]$path_array[$id]" + ynh_permission_url --permission="$id.admin" --url="$domain_array[$id]$path_array[$id]/admin" + else + ynh_permission_create --permission="$id" --url="$domain_array[$id]$path_array[$id]" + ynh_permission_create --permission="$id.admin" --url="$domain_array[$id]$path_array[$id]/admin" + fi + + done + + ynh_app_setting_set $app blogs_list $blogs_list +} diff --git a/scripts/install b/scripts/install index 862b3da..7dc7ec3 100755 --- a/scripts/install +++ b/scripts/install @@ -55,6 +55,8 @@ ynh_script_progression --message="Adding a configuration file..." php_config=$install_dir/inc/config.php +admin=$(yunohost user permission info "$app.admin" --output-as json | jq -r '.allowed | .[]') + master_key=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=master_key --value=$master_key @@ -62,6 +64,7 @@ cp $php_config.in $php_config admin_url="${path%/}/admin/" +admin=$(yunohost user permission info "$app.admin" --output-as json | jq -r '.allowed | .[]') email=$(ynh_user_get_info --username=$admin --key=mail) # Config as if we called in admin/install/wizard.php @@ -117,7 +120,7 @@ chown $app:$app "$php_config" ynh_script_progression --message="Finalizing installation..." --weight=14 # Give the admin the proper permission and give temporary admin access to visitors -ynh_permission_update --permission="admin" --add="$admin" "visitors" +ynh_permission_update --permission="admin" --add="visitors" firstname=$(ynh_user_get_info --username=$admin --key=firstname) lastname=$(ynh_user_get_info --username=$admin --key=lastname) From ef4185038c8a466b074fa41050141586c059ad55 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:07:05 +0200 Subject: [PATCH 22/44] Update config_panel.toml for packaging v2 --- config_panel.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 1733d40..88867ad 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -9,7 +9,7 @@ name = "Dotclear2 configuration" [main.super_user.admin] ask = "Super Administrator" type = "user" - bind = "super_user:__FINALPATH__/inc/class.auth.ldap.php" + bind = "super_user:__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users] name = "Yunohost users" @@ -23,7 +23,7 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'admin':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'admin':__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users.content] name = "Content permissions" @@ -34,14 +34,14 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'contentadmin':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'contentadmin':__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users.content.blog_usage] ask = "Manage their own entries and comments" type = "boolean" yes = "true" no = "false" - bind = "'usage':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'usage':__INSTALL_DIR__/inc/class.auth.ldap.php" visible = "blog_contentadmin != 'true'" [ynh_users.content.blog_publish] @@ -49,7 +49,7 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'publish':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'publish':__INSTALL_DIR__/inc/class.auth.ldap.php" visible = "blog_contentadmin != 'true'" [ynh_users.content.blog_delete] @@ -57,7 +57,7 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'delete':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'delete':__INSTALL_DIR__/inc/class.auth.ldap.php" visible = "blog_contentadmin != 'true'" [ynh_users.media] @@ -69,14 +69,14 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'media_admin':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'media_admin':__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users.media.blog_media] ask = "Manage their own media items" type = "boolean" yes = "true" no = "false" - bind = "'media':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'media':__INSTALL_DIR__/inc/class.auth.ldap.php" visible = "blog_media_admin != 'true'" [ynh_users.other_permissions] @@ -88,18 +88,18 @@ help = "These permissions apply to the first connection of the user, the super u type = "boolean" yes = "true" no = "false" - bind = "'categories':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'categories':__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users.other_permissions.blog_pages] ask = "Manage pages" type = "boolean" yes = "true" no = "false" - bind = "'pages':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'pages':__INSTALL_DIR__/inc/class.auth.ldap.php" [ynh_users.other_permissions.blog_blogroll] ask = "Manage blogroll" type = "boolean" yes = "true" no = "false" - bind = "'blogroll':__FINALPATH__/inc/class.auth.ldap.php" + bind = "'blogroll':__INSTALL_DIR__/inc/class.auth.ldap.php" From c0e2b03508ba0dd274ad3650c717ee84dcee3118 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:07:36 +0200 Subject: [PATCH 23/44] Update app version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1d27a63..333347c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "DotClear 2" description.en = "Blog publishing application" description.fr = "Moteur de blog" -version = "2.27.1~ynh1" +version = "2.27.3~ynh1" maintainers = ["kay0u"] From 6664529dfc7453f6412a14b260f79e43a8cd702e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 11 Oct 2023 21:08:29 +0000 Subject: [PATCH 24/44] 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 e6cf0d9..f299d5c 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ tool allowing anyone to publish on the web, regardless of their technical skills - Twice free -**Shipped version:** 2.27.1~ynh1 +**Shipped version:** 2.27.3~ynh1 **Demo:** https://www.softaculous.com/demos/Dotclear diff --git a/README_fr.md b/README_fr.md index 36225db..8d0e991 100644 --- a/README_fr.md +++ b/README_fr.md @@ -53,7 +53,7 @@ tool allowing anyone to publish on the web, regardless of their technical skills - Twice free -**Version incluse :** 2.27.1~ynh1 +**Version incluse :** 2.27.3~ynh1 **Démo :** https://www.softaculous.com/demos/Dotclear From 5d0c99a84fc5961153c08a478caa2ce14d9481d1 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:09:24 +0200 Subject: [PATCH 25/44] Update memory requirements --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 333347c..e12c002 100644 --- a/manifest.toml +++ b/manifest.toml @@ -24,9 +24,9 @@ architectures = "all" multi_instance = true ldap = true sso = false -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +disk = "50M" +ram.build = "200M" +ram.runtime = "50M" [install] [install.domain] From 2e7f7052bea7bf4fd883c130f1bad930525cba06 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:15:19 +0200 Subject: [PATCH 26/44] Appease linter regarding permissions --- manifest.toml | 1 - scripts/install | 6 ------ tests.toml | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index e12c002..47773ed 100644 --- a/manifest.toml +++ b/manifest.toml @@ -64,7 +64,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - admin.url = "/admin" admin.show_tile = false [resources.apt] diff --git a/scripts/install b/scripts/install index 7dc7ec3..dbabb60 100755 --- a/scripts/install +++ b/scripts/install @@ -119,9 +119,6 @@ chown $app:$app "$php_config" #================================================= ynh_script_progression --message="Finalizing installation..." --weight=14 -# Give the admin the proper permission and give temporary admin access to visitors -ynh_permission_update --permission="admin" --add="visitors" - firstname=$(ynh_user_get_info --username=$admin --key=firstname) lastname=$(ynh_user_get_info --username=$admin --key=lastname) email=$(ynh_user_get_info --username=$admin --key=mail) @@ -133,9 +130,6 @@ installUrl="/admin/install/index.php" ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$lastname" "u_login=$admin" "u_pwd=$password" "u_pwd2=$password" -# Remove visitor access to admin -ynh_permission_update --permission="admin" --remove="visitors" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/tests.toml b/tests.toml index 1520b9b..e77d47d 100644 --- a/tests.toml +++ b/tests.toml @@ -2,4 +2,6 @@ test_format = 1.0 [default] + args.init_admin_permission="package_checker" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" From eeee5fb02c13ee0525333f2b82125e9d65589f20 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:19:52 +0200 Subject: [PATCH 27/44] Update toml schemas --- manifest.toml | 2 ++ tests.toml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index 47773ed..4c829a4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "dotclear2" diff --git a/tests.toml b/tests.toml index e77d47d..f0b5567 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] From 46ac93e0ac103cc2b0e2824be1e98ddd01b89f98 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 11 Oct 2023 23:30:47 +0200 Subject: [PATCH 28/44] Fix config panel --- scripts/config | 12 ++++++++++++ scripts/install | 1 + 2 files changed, 13 insertions(+) diff --git a/scripts/config b/scripts/config index 6939c07..f6a09fa 100644 --- a/scripts/config +++ b/scripts/config @@ -10,6 +10,13 @@ source /usr/share/yunohost/helpers ynh_abort_if_errors +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +admin=$(ynh_app_setting_get --app=$app --key=admin) + #================================================= # SPECIFIC SETTERS FOR TOML SHORT KEYS #================================================= @@ -75,3 +82,8 @@ set__blogs_list() { ynh_app_setting_set $app blogs_list $blogs_list } + +#================================================= +# GENERIC FINALIZATION +#================================================= +ynh_app_config_run $1 diff --git a/scripts/install b/scripts/install index dbabb60..619e9c0 100755 --- a/scripts/install +++ b/scripts/install @@ -65,6 +65,7 @@ cp $php_config.in $php_config admin_url="${path%/}/admin/" admin=$(yunohost user permission info "$app.admin" --output-as json | jq -r '.allowed | .[]') +ynh_app_setting_set --app=$app --key=admin --value=$admin email=$(ynh_user_get_info --username=$admin --key=mail) # Config as if we called in admin/install/wizard.php From 3340d8f6a64b38a89a054a06aca66cc49870352b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 12 Oct 2023 22:14:17 +0200 Subject: [PATCH 29/44] Remove too long features list from description --- doc/DESCRIPTION.md | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index f4c2455..50c1db9 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,35 +1,4 @@ Dotclear is an open-source web publishing software. Take control over your blog! -Dotclear project's purpose is to provide a user-friendly -tool allowing anyone to publish on the web, regardless of their technical skills. - -### Features - -- Easy publication -- Fully customizable theme -- User-friendly administration -- Flexible template system -- Media management -- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) -- Flexible comment system -- Built-in antispam -- Localization -- Presentation widgets -- Themes and plugins -- Pages -- Tags and categories -- Automated installation -- Support for several database types -- Multiblog -- Multi-user with permissions -- Standards compliant -- Accessible -- Importing / exporting -- Naturally optimized for search engines -- Syndication feeds -- Complete trackback/pingback/webmention support -- Full Unicode support -- Extensible -- Performance and scalability -- Twice free +Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. From 5577afa65b3a8024f7ad1c01b5351b686ed25da6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 20:16:00 +0000 Subject: [PATCH 30/44] Auto-update README --- README.md | 33 +-------------------------------- README_fr.md | 33 +-------------------------------- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index f299d5c..55cb658 100644 --- a/README.md +++ b/README.md @@ -19,38 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Dotclear is an open-source web publishing software. Take control over your blog! -Dotclear project's purpose is to provide a user-friendly -tool allowing anyone to publish on the web, regardless of their technical skills. - -### Features - -- Easy publication -- Fully customizable theme -- User-friendly administration -- Flexible template system -- Media management -- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) -- Flexible comment system -- Built-in antispam -- Localization -- Presentation widgets -- Themes and plugins -- Pages -- Tags and categories -- Automated installation -- Support for several database types -- Multiblog -- Multi-user with permissions -- Standards compliant -- Accessible -- Importing / exporting -- Naturally optimized for search engines -- Syndication feeds -- Complete trackback/pingback/webmention support -- Full Unicode support -- Extensible -- Performance and scalability -- Twice free +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 diff --git a/README_fr.md b/README_fr.md index 8d0e991..e79095f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,38 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Dotclear is an open-source web publishing software. Take control over your blog! -Dotclear project's purpose is to provide a user-friendly -tool allowing anyone to publish on the web, regardless of their technical skills. - -### Features - -- Easy publication -- Fully customizable theme -- User-friendly administration -- Flexible template system -- Media management -- Choose from several editing syntax (wiki, markdown or directly in wysiwyg) -- Flexible comment system -- Built-in antispam -- Localization -- Presentation widgets -- Themes and plugins -- Pages -- Tags and categories -- Automated installation -- Support for several database types -- Multiblog -- Multi-user with permissions -- Standards compliant -- Accessible -- Importing / exporting -- Naturally optimized for search engines -- Syndication feeds -- Complete trackback/pingback/webmention support -- Full Unicode support -- Extensible -- Performance and scalability -- Twice free +Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. **Version incluse :** 2.27.3~ynh1 From f807d4434fce73812965c7f7b5128259eef8daf6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 14 Oct 2023 10:25:27 +0200 Subject: [PATCH 31/44] Fix tests.toml --- tests.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.toml b/tests.toml index f0b5567..4297a00 100644 --- a/tests.toml +++ b/tests.toml @@ -7,3 +7,4 @@ test_format = 1.0 args.init_admin_permission="package_checker" test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.init_admin_permission="package_checker" From 6915da586d0c8c6215073f4af4b71bd42dd00632 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 14 Oct 2023 13:41:09 +0200 Subject: [PATCH 32/44] =?UTF-8?q?Fix=20tests.toml=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests.toml b/tests.toml index 4297a00..e7b1a4f 100644 --- a/tests.toml +++ b/tests.toml @@ -7,4 +7,7 @@ test_format = 1.0 args.init_admin_permission="package_checker" test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.domain="domain.tld" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.path="/dotclear2" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.init_main_permission="visitors" test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.init_admin_permission="package_checker" From 483e82edfdf93e41ee602fdf201b30359075bbfc Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 14 Oct 2023 17:54:08 +0200 Subject: [PATCH 33/44] =?UTF-8?q?Fix=20tests.toml=C2=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests.toml b/tests.toml index e7b1a4f..3fb0942 100644 --- a/tests.toml +++ b/tests.toml @@ -9,5 +9,5 @@ test_format = 1.0 test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.domain="domain.tld" test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.path="/dotclear2" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.init_main_permission="visitors" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.init_admin_permission="package_checker" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.admin="package_checker" + test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.is_public="true" From 7ef09bdf3035657de32d602f9520533bdc33918b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 14 Oct 2023 18:31:13 +0200 Subject: [PATCH 34/44] Better handle missing blog_admin during upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index b5b457b..93e457e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if [ -z "$blog_admin" ] || +if [ -z "${blog_admin:-}" ] || [ -z "$blog_contentadmin" ] || [ -z "$blog_usage" ] || [ -z "$blog_publish" ] || From 07d5e6bacd08e1663e280e0b97167d5781746943 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 21 Oct 2023 19:11:02 +0200 Subject: [PATCH 35/44] Add PHP-gs dependency --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4c829a4..eda30f9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -69,7 +69,7 @@ ram.runtime = "50M" admin.show_tile = false [resources.apt] - packages = "mariadb-server, php8.2, php8.2-fpm, php8.2-mbstring, php8.2-mysql, php-iconv, php8.2-xml, php8.2-cli, php8.2-intl, php8.2-ldap" + packages = "mariadb-server, php8.2, php8.2-fpm, php8.2-mbstring, php8.2-mysql, php-iconv, php8.2-xml, php8.2-cli, php8.2-intl, php8.2-ldap, php8.2-gd" [resources.database] type = "mysql" From b47712dfae46f7d6d7f57f6bdf5e653c51ee733c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 09:42:13 +0100 Subject: [PATCH 36/44] cleaning --- conf/extra_php-fpm.conf | 4 + conf/nginx.conf | 2 +- conf/php-fpm.conf | 430 ---------------------------------------- manifest.toml | 5 +- scripts/install | 9 +- scripts/remove | 14 +- scripts/restore | 43 ++-- scripts/upgrade | 17 +- 8 files changed, 33 insertions(+), 491 deletions(-) create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..700c37c --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M diff --git a/conf/nginx.conf b/conf/nginx.conf index c5d0284..2dad80d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __INSTALL_DIR__/ ; + alias __INSTALL_DIR__/; index index.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 13a53b0..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,430 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = __USER__ -group = __USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = __INSTALL_DIR__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M - -; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M -; php_admin_flag[mail.add_x_header] = Off - -; Other common parameters -; php_admin_value[max_execution_time] = 600 -; php_admin_value[max_input_time] = 300 -; php_admin_value[memory_limit] = 256M -; php_admin_flag[short_open_tag] = On diff --git a/manifest.toml b/manifest.toml index eda30f9..f48b25e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,11 +21,14 @@ cpe = "cpe:2.3:a:dotclear:dotclear" fund = "https://dotclear.org/donate" [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index 619e9c0..e4f1116 100755 --- a/scripts/install +++ b/scripts/install @@ -31,18 +31,13 @@ mkdir -p "$install_dir/"{cache,public} setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 - # Create a dedicated PHP-FPM config ynh_add_fpm_config diff --git a/scripts/remove b/scripts/remove index 768ea30..8fa8f5b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -10,26 +10,16 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE FAIL2BAN CONFIGURATION -#================================================= -ynh_script_progression --message="Removing Fail2Ban configuration..." - # Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config diff --git a/scripts/restore b/scripts/restore index ee62cc6..c386eb2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,15 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -26,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -34,24 +24,6 @@ chown -R $app:www-data "$install_dir" mkdir -p "$install_dir/"{cache,public} setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - -#================================================= -# RESTORE FAIL2BAN CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the Fail2Ban configuration..." - -ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" -ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" -ynh_systemd_action --action=restart --service_name=fail2ban - -#================================================= -# SPECIFIC RESTORATION #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -59,6 +31,21 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=3 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +#================================================= +# RESTORE SYSTEM CONFIGURATIONS +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + +ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" +ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" +ynh_systemd_action --action=restart --service_name=fail2ban + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 93e457e..da82346 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,6 @@ source /usr/share/yunohost/helpers #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -21,7 +20,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 if [ -z "${blog_admin:-}" ] || [ -z "$blog_contentadmin" ] || @@ -73,7 +72,6 @@ then fi fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -82,18 +80,13 @@ mkdir -p "$install_dir/"{cache,public} setfacl -m d:u:www-data:rwx "$install_dir/"{cache,public} #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 - # Create a dedicated PHP-FPM config ynh_add_fpm_config @@ -102,7 +95,7 @@ ynh_add_fpm_config #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." +ynh_script_progression --message="Updating a configuration file..." --weight=1 php_config=$install_dir/inc/config.php @@ -153,7 +146,7 @@ ynh_local_curl $adminUrl #================================================= # UPGRADE FAIL2BAN #================================================= -ynh_script_progression --message="Reconfiguring Fail2Ban..." +ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=1 # Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: , .*https://$domain${path%/}/admin/auth.php" From da697afb0903a52fc243d45d060bbe7dddcd8dfb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 Nov 2023 08:42:17 +0000 Subject: [PATCH 37/44] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 55cb658..8e73087 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Dotclear project's purpose is to provide a user-friendly tool allowing anyone to * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index e79095f..f0136f5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,6 +35,7 @@ Dotclear project's purpose is to provide a user-friendly tool allowing anyone to * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From befcae7b5478ca2597e264255c3743d01d6e5801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 10:37:11 +0100 Subject: [PATCH 38/44] Update tests.toml --- tests.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests.toml b/tests.toml index 3fb0942..15bdcb9 100644 --- a/tests.toml +++ b/tests.toml @@ -6,8 +6,8 @@ test_format = 1.0 args.init_admin_permission="package_checker" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.name = "2.15.2~ynh1" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.domain="domain.tld" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.path="/dotclear2" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.admin="package_checker" - test_upgrade_from.f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6.args.is_public="true" + 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" From f38c76b12876a5e45fde00a6360da4c115f1dba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 10:39:11 +0100 Subject: [PATCH 39/44] Update manifest.toml --- manifest.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f48b25e..2f1fc3e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,9 +46,11 @@ ram.runtime = "50M" default = "visitors" [install.init_admin_permission] - type = "user" ask.en = "Choose the Dotclear super user." + ask.fr = "Choisissez le super utilisateur Dotclear." help.en = "You can later on give admin permission to more users." + help.fr = "Vous pourrez ultérieurement accorder l’autorisation d’administrateur à davantage d’utilisateurs." + type = "user" [resources] [resources.sources.latest] From c21af454bc4452f8b88bea8574158798f13f15b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 10:39:59 +0100 Subject: [PATCH 40/44] cleaning --- doc/DESCRIPTION.md | 5 +---- doc/DESCRIPTION_fr.md | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 50c1db9..b7cc0ca 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,4 +1 @@ -Dotclear is an open-source web publishing software. -Take control over your blog! - -Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. +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. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..d8b70bd --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +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. From 65ab08eb3ff6312acf82ccfa0a53a13dd9f643b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 Nov 2023 09:40:04 +0000 Subject: [PATCH 41/44] Auto-update README --- README.md | 5 +---- README_fr.md | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8e73087..6a4cbc8 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Dotclear is an open-source web publishing software. -Take control over your blog! - -Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. +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 diff --git a/README_fr.md b/README_fr.md index f0136f5..56807ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,10 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Dotclear is an open-source web publishing software. -Take control over your blog! - -Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. +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 From 29e67a6cbba89144898fc90ba967d3ce3577efbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 12 Dec 2023 09:22:49 +0100 Subject: [PATCH 42/44] Put in _common.sh the setup_source trick --- scripts/_common.sh | 12 ++++++++++++ scripts/install | 12 ++++-------- scripts/upgrade | 25 +++++++++---------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 944a65e..b2ada97 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,18 @@ # PERSONAL HELPERS #================================================= +_dotclear2_setup_source() { + # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz + + src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r) + + if curl --output /dev/null --silent --head --fail "$src_url"; then + ynh_setup_source --dest_dir="$install_dir" --source_id="latest" + else + ynh_setup_source --dest_dir="$install_dir" --source_id="attic" + fi +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index e4f1116..19755e4 100755 --- a/scripts/install +++ b/scripts/install @@ -14,13 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Setting up source files..." --weight=4 -# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz -src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r) -if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_setup_source --dest_dir="$install_dir" --source_id="attic" -else - ynh_setup_source --dest_dir="$install_dir" --source_id="latest" -fi +_dotclear2_setup_source chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -134,7 +128,9 @@ ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$la ynh_script_progression --message="Configuring Fail2Ban..." # Create a dedicated Fail2Ban config -ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: , .*https://$domain${path%/}/admin/auth.php" +ynh_add_fail2ban_config \ + --logpath="/var/log/nginx/${domain}-error.log" \ + --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: , .*https://$domain${path%/}/admin/auth.php" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index da82346..74f06d6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,14 +23,14 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 if [ -z "${blog_admin:-}" ] || - [ -z "$blog_contentadmin" ] || - [ -z "$blog_usage" ] || - [ -z "$blog_publish" ] || - [ -z "$blog_delete" ] || - [ -z "$blog_categories" ] || - [ -z "$blog_media_admin" ] || - [ -z "$blog_media" ] || - [ -z "$blog_pages" ] || + [ -z "$blog_contentadmin" ] || + [ -z "$blog_usage" ] || + [ -z "$blog_publish" ] || + [ -z "$blog_delete" ] || + [ -z "$blog_categories" ] || + [ -z "$blog_media_admin" ] || + [ -z "$blog_media" ] || + [ -z "$blog_pages" ] || [ -z "$blog_blogroll" ]; then blog_admin="false" blog_contentadmin="false" @@ -62,14 +62,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." - # Download, check integrity, uncompress and patch the source from app.src - # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz - src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r) - if ! curl --output /dev/null --silent --head --fail "$src_url"; then - ynh_setup_source --dest_dir="$install_dir" --source_id="attic" - else - ynh_setup_source --dest_dir="$install_dir" --source_id="latest" - fi + _dotclear2_setup_source fi chmod -R o-rwx "$install_dir" From 4cbf6f735b47715b46129427a1b402b2d3723c92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 12 Dec 2023 09:23:01 +0100 Subject: [PATCH 43/44] 4 spaces indentation for class.auth.ldap.php --- conf/class.auth.ldap.php | 218 +++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/conf/class.auth.ldap.php b/conf/class.auth.ldap.php index 030c349..28d9701 100644 --- a/conf/class.auth.ldap.php +++ b/conf/class.auth.ldap.php @@ -1,127 +1,127 @@ server.":".$this->port); + if ($ds) { - if ($pwd == '') { - return parent::checkUser($user_id, null, $user_key, $check_blog); - } + ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3); + if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd)) + { + # search the user in ldap, and get infos + $filter = "(&(|(objectclass=posixAccount))(uid=".$user_id.")(permission=cn=__APP__.admin,ou=permission,".$this->base."))"; + $sr = ldap_search($ds, $this->base, $filter, array("dn", "cn", "sn", "mail", "givenname")); # /!\ fields have to be in lowercase + $info = ldap_get_entries($ds, $sr); - # LDAP connection - $ds = ldap_connect("ldap://".$this->server.":".$this->port); - if ($ds) + if ($info["count"] == 1) { - ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3); - if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd)) - { - # search the user in ldap, and get infos - $filter = "(&(|(objectclass=posixAccount))(uid=".$user_id.")(permission=cn=__APP__.admin,ou=permission,".$this->base."))"; - $sr = ldap_search($ds, $this->base, $filter, array("dn", "cn", "sn", "mail", "givenname")); # /!\ fields have to be in lowercase - $info = ldap_get_entries($ds, $sr); + # To be case sensitive + if ($info[0]['dn'] != "uid=".$user_id.",ou=users,".$this->base) { + return parent::checkUser($user_id, $pwd); + } - if ($info["count"] == 1) - { - # To be case sensitive - if ($info[0]['dn'] != "uid=".$user_id.",ou=users,".$this->base) { - return parent::checkUser($user_id, $pwd); - } - - try - { - $this->con->begin(); - $cur = $this->con->openCursor($this->user_table); - # Store the password - $cur->user_pwd = $pwd; + try + { + $this->con->begin(); + $cur = $this->con->openCursor($this->user_table); + # Store the password + $cur->user_pwd = $pwd; - # Store informations about the user - $cur->user_id = $user_id; - $cur->user_email = $info[0]['mail'][0]; - $cur->user_name = $info[0]['sn'][0]; - $cur->user_firstname = $info[0]['givenname'][0]; - $cur->user_displayname = $info[0]['cn'][0]; - $super_user = "__ADMIN__"; - if ($super_user == $user_id) { - $cur->user_super = 1; - } - else { - $cur->user_super = 0; - } - - # If the user exist, then we just update his password. - if (dcCore::app()->userExists($user_id)) - { - $this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur); - } - # If not, we create him. - # In order for him to connect, - # it is necessary to give him at least - # a permission "usage" on the blog "default". - else - { - $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); - # Possible roles: - # admin "administrator" - # contentadmin "manage all entries and comments" - # usage "manage their own entries and comments" - # publish "publish entries and comments" - # delete "delete entries and comments" - # categories "manage categories" - # media_admin "manage all media items" - # media "manage their own media items" - # pages "manage pages" - # blogroll "manage blogroll" - $permissions = array( - 'admin' => "__BLOG_ADMIN__", - 'contentadmin' => "__BLOG_CONTENTADMIN__", - 'usage' => "__BLOG_USAGE__", - 'publish' => "__BLOG_PUBLISH__", - 'delete' => "__BLOG_DELETE__", - 'categories' => "__BLOG_CATEGORIES__", - 'media_admin' => "__BLOG_MEDIA_ADMIN__", - 'media' => "__BLOG_MEDIA__", - 'pages' => "__BLOG_PAGES__", - 'blogroll' => "__BLOG_BLOGROLL__", - ); - $set_perms = []; - - foreach ($permissions as $perm_id => $v) { - if (is_string($v) && $v == "true") { - $set_perms[$perm_id] = true; - } - } - $this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true); - } - - $this->con->commit(); - } - catch (Exception $e) - { - # In case of error we cancel and return "false" - $this->con->rollback(); - return false; - } - # The previous operations proceeded without error, - # we can now call the parent method - return parent::checkUser($user_id, $pwd); - } + # Store informations about the user + $cur->user_id = $user_id; + $cur->user_email = $info[0]['mail'][0]; + $cur->user_name = $info[0]['sn'][0]; + $cur->user_firstname = $info[0]['givenname'][0]; + $cur->user_displayname = $info[0]['cn'][0]; + $super_user = "__ADMIN__"; + if ($super_user == $user_id) { + $cur->user_super = 1; } + else { + $cur->user_super = 0; + } + + # If the user exist, then we just update his password. + if (dcCore::app()->userExists($user_id)) + { + $this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur); + } + # If not, we create him. + # In order for him to connect, + # it is necessary to give him at least + # a permission "usage" on the blog "default". else { - error_log("Failed to connect with the user ".$user_id); + $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); + # Possible roles: + # admin "administrator" + # contentadmin "manage all entries and comments" + # usage "manage their own entries and comments" + # publish "publish entries and comments" + # delete "delete entries and comments" + # categories "manage categories" + # media_admin "manage all media items" + # media "manage their own media items" + # pages "manage pages" + # blogroll "manage blogroll" + $permissions = array( + 'admin' => "__BLOG_ADMIN__", + 'contentadmin' => "__BLOG_CONTENTADMIN__", + 'usage' => "__BLOG_USAGE__", + 'publish' => "__BLOG_PUBLISH__", + 'delete' => "__BLOG_DELETE__", + 'categories' => "__BLOG_CATEGORIES__", + 'media_admin' => "__BLOG_MEDIA_ADMIN__", + 'media' => "__BLOG_MEDIA__", + 'pages' => "__BLOG_PAGES__", + 'blogroll' => "__BLOG_BLOGROLL__", + ); + $set_perms = []; + + foreach ($permissions as $perm_id => $v) { + if (is_string($v) && $v == "true") { + $set_perms[$perm_id] = true; + } + } + $this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true); } + + $this->con->commit(); + } + catch (Exception $e) + { + # In case of error we cancel and return "false" + $this->con->rollback(); + return false; + } + # The previous operations proceeded without error, + # we can now call the parent method + return parent::checkUser($user_id, $pwd); } - return parent::checkUser($user_id, $pwd); + } + else + { + error_log("Failed to connect with the user ".$user_id); + } } + return parent::checkUser($user_id, $pwd); + } } ?> From e945eb1bac6b661e7565bf14ed3c929b30acb6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 12 Dec 2023 09:44:06 +0100 Subject: [PATCH 44/44] Upgrade updater.sh to manifestv2 --- .github/workflows/updater.sh | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 5e4fcd1..287f13b 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -14,15 +14,15 @@ #================================================= # 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]') +current_version=$(cat manifest.toml | grep "version =" | sed 's|version = "\(.*\)~ynh[0-9]*"|\1|') +# repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') asset=$(curl --silent "https://download.dotclear.org/latest/" | grep "dotclear-.*?.zip" -Po | head -1) version=${asset%.zip} version=${version#dotclear-} # 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} fi @@ -54,7 +54,7 @@ src="app" tempdir="$(mktemp -d)" # Download sources and calculate checksum -curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.zip -o "$tempdir/$asset" +curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.tar.gz -o "$tempdir/$asset" checksum=$(sha256sum "$tempdir/$asset" | head -c 64) # Delete temporary directory @@ -66,17 +66,10 @@ if [[ $asset == *.zip ]]; then fi # Rewrite source file -cat < conf/$src.src -SOURCE_URL=http://download.dotclear.org/latest/dotclear-$version.zip -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" - +set -x +sed -i "s|/dotclear-.*.tar.gz|/dotclear-$version.tar.gz|" manifest.toml +sed -i "s|sha256 = \".*\"|sha256 = \"$checksum\"|" manifest.toml +sed -i "s|version = \".*\"|version = \"$version~ynh1\"|" manifest.toml #================================================= # SPECIFIC UPDATE STEPS #================================================= @@ -88,11 +81,8 @@ echo "... conf/$src.src updated" # 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 \ No newline at end of file +exit 0