From 61d683bf9a0421c3ee7493fa51e65b28d7eaeb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:13:29 +0200 Subject: [PATCH 01/67] v2 --- conf/app.src | 6 ---- conf/cron | 2 +- conf/horizon.conf | 2 +- conf/nginx.conf | 2 +- conf/php-fpm.conf | 2 +- manifest.toml | 55 +++++++++++++++++++++++++++++++ scripts/_common.sh | 4 +-- scripts/backup | 16 +++++----- scripts/change_url | 52 +++++++++++++++--------------- scripts/install | 80 +++++++++++++++++++++++----------------------- scripts/remove | 28 ++++++++-------- scripts/restore | 48 ++++++++++++++-------------- scripts/upgrade | 76 +++++++++++++++++++++---------------------- 13 files changed, 212 insertions(+), 161 deletions(-) delete mode 100644 conf/app.src create mode 100644 manifest.toml diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index ace5a0ee..00000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz -SOURCE_SUM=eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/cron b/conf/cron index 8100d341..ac8001a9 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/artisan schedule:run >> /dev/null 2>&1 +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan schedule:run >> /dev/null 2>&1 diff --git a/conf/horizon.conf b/conf/horizon.conf index f176f78f..f65edfb2 100644 --- a/conf/horizon.conf +++ b/conf/horizon.conf @@ -1,6 +1,6 @@ [program:__APP__-horizon] process_name=%(program_name)s -command=php__PHPVERSION__ __FINALPATH__/artisan horizon +command=php__PHPVERSION__ __INSTALL_DIR__/artisan horizon autostart=true autorestart=true user=__APP__ diff --git a/conf/nginx.conf b/conf/nginx.conf index 77a815fb..8e6ab96a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,7 +1,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/public/; + alias __INSTALL_DIR__/public/; index index.php; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index b4c2372f..33d9032e 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.toml b/manifest.toml new file mode 100644 index 00000000..b3052443 --- /dev/null +++ b/manifest.toml @@ -0,0 +1,55 @@ +packaging_format = 2 + +id = "pixelfed" +name = "Pixelfed" +description.en = "ActivityPub Federated Image Sharing" +description.fr = "Logiciel de partage d'image fédéré via ActivityPub" + +version = "0.11.5~ynh3" + +maintainers = ["yalh76", "lapineige"] + +[upstream] +license = "AGPL-3.0-or-later" +website = "https://pixelfed.org/" +admindoc = "https://docs.pixelfed.org/running-pixelfed/administration.html" +userdoc = "https://docs.pixelfed.org/" +code = "https://github.com/pixelfed/pixelfed" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 11.0" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +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] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + full_domain = true + + [install.init_main_permission] + type = "group" + default = "visitors" + +[resources] + [resources.sources.main] + url = "https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz" + sha256 = "eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d" + + + [resources.system_user] + + [resources.install_dir] + + [resources.permissions] + main.url = "/" + + [resources.database] + type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index ec0b5b76..eb34d7fa 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,11 +4,11 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.1" +#REMOVEME? YNH_PHP_VERSION="8.1" YNH_COMPOSER_VERSION="2.1.5" -pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick" +#REMOVEME? pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index 75532ecb..33560f71 100644 --- a/scripts/backup +++ b/scripts/backup @@ -14,23 +14,23 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= ynh_print_info --message="Loading settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? 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) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -41,7 +41,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 debc60d1..9546559c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -14,49 +14,49 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path="/" +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path="/" -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= ynh_script_progression --message="Loading settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? 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" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi #================================================= @@ -73,16 +73,18 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="stop" --log_path #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # 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 +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? 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" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= @@ -92,7 +94,7 @@ fi #================================================= ynh_script_progression --message="Updating config file..." --weight=1 -config="$final_path/.env" +config="$install_dir/.env" ynh_backup_if_checksum_is_different --file="$config" ynh_replace_string --match_string="APP_URL=.*" --replace_string="APP_URL=https://$new_domain" --target_file="$config" ynh_replace_string --match_string="ADMIN_DOMAIN=.*" --replace_string="ADMIN_DOMAIN=\"$new_domain\"" --target_file="$config" @@ -107,7 +109,7 @@ ynh_store_file_checksum --file="$config" #================================================= ynh_script_progression --message="Applying changes..." --weight=1 -pushd "$final_path" +pushd "$install_dir" php$phpversion artisan config:clear php$phpversion artisan config:cache php$phpversion artisan route:clear @@ -127,9 +129,9 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_pat #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index a1629b34..f9826531 100644 --- a/scripts/install +++ b/scripts/install @@ -15,41 +15,41 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url="/" -is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +path="/" +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC app_key="base64:$(ynh_string_random --length=32 | base64)" -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path ynh_app_setting_set --app=$app --key=app_key --value=$app_key #================================================= @@ -57,28 +57,28 @@ ynh_app_setting_set --app=$app --key=app_key --value=$app_key #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=1 -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # CREATE A POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 -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_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_name --db_name=$db_name +#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) +#REMOVEME? db_user=$db_name +#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name +#REMOVEME? ynh_psql_test_if_first_run +#REMOVEME? ynh_psql_setup_db --db_user=$db_name --db_name=$db_name #================================================= # CONFIGURE REDIS DATABASE @@ -93,13 +93,13 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$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" #================================================= # PHP-FPM CONFIGURATION @@ -108,7 +108,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -123,9 +123,9 @@ ynh_add_nginx_config #================================================= # INSTALL COMPOSER DEPENDENCIES #================================================= -ynh_script_progression --message="Installing composer dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Installing composer dependencies..." --weight=1 -ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$final_path" +ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$install_dir" #================================================= # CREATE LOG FILE @@ -142,11 +142,11 @@ chmod -R 600 "/var/log/$app/" #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/.env" --destination="$final_path/.env" +ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" # Pixelfed app should be able to edit its settings from the admin panel -chmod 600 "$final_path/.env" -chown $app:$app "$final_path/.env" +chmod 600 "$install_dir/.env" +chown $app:$app "$install_dir/.env" #================================================= # SETUP SUPERVISOR @@ -161,7 +161,7 @@ ynh_add_supervisor_config --service="${app}-horizon" --template=horizon.conf #================================================= ynh_script_progression --message="Deploying..." --weight=1 -pushd "$final_path" +pushd "$install_dir" php$phpversion artisan -n key:generate --force php$phpversion artisan horizon:install php$phpversion artisan horizon:publish @@ -215,22 +215,22 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="reload" --log_pa #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary -if [ $is_public -eq 1 ] +#REMOVEME? 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" +#REMOVEME? ynh_permission_update --permission="main" --add="visitors" fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index da67dedd..dc963c65 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,13 +16,13 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Loading settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? 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) -redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) #================================================= # STANDARD REMOVE @@ -56,10 +56,10 @@ ynh_remove_logrotate #================================================= # REMOVE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 # Remove a database if it exists, along with the associated user -ynh_psql_remove_db --db_user=$db_user --db_name=$db_name +#REMOVEME? ynh_psql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE THE REDIS DATABASE @@ -71,10 +71,10 @@ ynh_redis_remove_db "$redis_db" #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE NGINX CONFIGURATION @@ -95,10 +95,10 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # SPECIFIC REMOVE @@ -118,10 +118,10 @@ ynh_secure_remove --file="/var/log/$app" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user -ynh_system_user_delete --username=$app +#REMOVEME? ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index ecc422d0..0bfd52d6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -15,64 +15,64 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { +#REMOVEME? ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= ynh_script_progression --message="Loading settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? 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) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -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" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -91,11 +91,11 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +#REMOVEME? ynh_psql_test_if_first_run +#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c2254f3d..9648121b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,16 +16,16 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Loading settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? 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 -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -app_key=$(ynh_app_setting_get --app=$app --key=app_key) -redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +#REMOVEME? app_key=$(ynh_app_setting_get --app=$app --key=app_key) +#REMOVEME? redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) #================================================= # CHECK VERSION @@ -37,17 +37,17 @@ 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=1 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { ynh_clean_check_starting # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -75,25 +75,25 @@ fi # If app_key doesn't exist, retrieve it if [ -z "$app_key" ]; then ynh_script_progression --message="Retrieving app_key..." - app_key=$(grep -oP "APP_KEY=\Kbase64.*" "$final_path/.env") + app_key=$(grep -oP "APP_KEY=\Kbase64.*" "$install_dir/.env") ynh_app_setting_set --app="$app" --key=app_key --value="$app_key" fi -if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +#REMOVEME? if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.9.0~ynh3..." ynh_script_progression --message="Configuring a systemd service..." ynh_add_systemd_config --service="${app}-horizon" --template=horizon.conf fi -if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +#REMOVEME? if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh2..." ynh_script_progression --message="Stopping and removing the systemd service..." ynh_remove_systemd_config --service="${app}-horizon" - ynh_script_progression --message="Installing dependencies..." - ynh_install_app_dependencies "$pkg_dependencies" +#REMOVEME? ynh_script_progression --message="Installing dependencies..." +#REMOVEME? ynh_install_app_dependencies "$pkg_dependencies" ynh_script_progression --message="Creating log file..." mkdir -p "/var/log/$app/" @@ -108,7 +108,7 @@ if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/et ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" fi -if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +#REMOVEME? if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh3..." if ynh_exec_warn_less yunohost service status ${app}-horizon >/dev/null @@ -122,8 +122,8 @@ if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/et fi # Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all +#REMOVEME? if ynh_legacy_permissions_exists; then +#REMOVEME? ynh_legacy_permissions_delete_all ynh_app_setting_delete --app=$app --key=is_public fi @@ -131,10 +131,10 @@ fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -145,21 +145,21 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep=".env" + ynh_setup_source --dest_dir="$install_dir" --keep=".env" 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" # Pixelfed app should be able to edit its settings from the admin panel -chmod 600 "$final_path"/.env +chmod 600 "$install_dir"/.env #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION @@ -168,7 +168,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -185,18 +185,18 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating composer..." --weight=1 -ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="self-update" +ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update" -ynh_script_progression --message="Updating composer dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Updating composer dependencies..." --weight=1 -ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="update" +ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="update" #================================================= # DEPLOYMENT #================================================= ynh_script_progression --message="Deploying..." -pushd "$final_path" +pushd "$install_dir" php$phpversion artisan horizon:install php$phpversion artisan horizon:publish php$phpversion artisan passport:keys --force @@ -267,9 +267,9 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_pat #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT From 0108a187fbffbcbcff1cefd780f866e97ce45139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:33:03 +0200 Subject: [PATCH 02/67] v2 --- conf/extra_php-fpm.conf | 4 + conf/php-fpm.conf | 430 -------------------------- doc/{DISCLAIMER.md => ADMIN.md} | 0 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} | 0 manifest.json | 48 --- manifest.toml | 20 +- scripts/_common.sh | 212 ++++++++++++- scripts/backup | 22 -- scripts/change_url | 68 ---- scripts/install | 96 +----- scripts/remove | 49 --- scripts/restore | 59 +--- scripts/upgrade | 76 +---- scripts/ynh_redis | 39 --- scripts/ynh_supervisor | 167 ---------- 15 files changed, 234 insertions(+), 1056 deletions(-) create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf rename doc/{DISCLAIMER.md => ADMIN.md} (100%) rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%) delete mode 100644 manifest.json delete mode 100644 scripts/ynh_redis delete mode 100644 scripts/ynh_supervisor diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 00000000..700c37c9 --- /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/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 33d9032e..00000000 --- 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/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 70aa95fa..00000000 --- a/manifest.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "Pixelfed", - "id": "pixelfed", - "packaging_format": 1, - "description": { - "en": "ActivityPub Federated Image Sharing", - "fr": "Logiciel de partage d'image fédéré via ActivityPub" - }, - "version": "0.11.5~ynh3", - "url": "https://pixelfed.org/", - "upstream": { - "license": "AGPL-3.0-or-later", - "website": "https://pixelfed.org/", - "admindoc": "https://docs.pixelfed.org/running-pixelfed/administration.html", - "userdoc": "https://docs.pixelfed.org/", - "code": "https://github.com/pixelfed/pixelfed" - }, - "license": "AGPL-3.0-or-later", - "maintainer": [ - { - "name": "yalh76" - }, - { - "name": "lapineige" - } - ], - "requirements": { - "yunohost": ">= 11.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.1-fpm" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index b3052443..dd8c751a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,22 +15,19 @@ website = "https://pixelfed.org/" admindoc = "https://docs.pixelfed.org/running-pixelfed/administration.html" userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] -yunohost = ">= 11.0" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +yunohost = ">= 11.1.18" +architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -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, ... +ldap = false +sso = false +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" full_domain = true @@ -51,5 +48,8 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [resources.permissions] main.url = "/" + [resources.apt] + packages = "postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php8.1-redis php8.1-bcmath php8.1-cli php8.1-ctype php8.1-curl php8.1-exif php8.1-gd php8.1-iconv php8.1-intl php8.1-mbstring php8.1-tokenizer php8.1-xml php8.1-zip php8.1-pdo php8.1-pgsql php8.1-fileinfo php8.1-imagick" + [resources.database] type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index eb34d7fa..4a32507b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,12 +4,8 @@ # COMMON VARIABLES #================================================= -#REMOVEME? YNH_PHP_VERSION="8.1" - YNH_COMPOSER_VERSION="2.1.5" -#REMOVEME? pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick" - #================================================= # PERSONAL HELPERS #================================================= @@ -21,3 +17,211 @@ YNH_COMPOSER_VERSION="2.1.5" #================================================= # FUTURE OFFICIAL HELPERS #================================================= + +# get the first available redis database +# +# usage: ynh_redis_get_free_db +# | returns: the database number to use +ynh_redis_get_free_db() { + local result max db + result="$(redis-cli INFO keyspace)" + + # get the num + max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") + + db=0 + # default Debian setting is 15 databases + for i in $(seq 0 "$max") + do + if ! echo "$result" | grep -q "db$i" + then + db=$i + break 1 + fi + db=-1 + done + + test "$db" -eq -1 && ynh_die --message="No available Redis databases..." + + echo "$db" +} + +# Create a master password and set up global settings +# Please always call this script in install and restore scripts +# +# usage: ynh_redis_remove_db database +# | arg: database - the database to erase +ynh_redis_remove_db() { + local db=$1 + redis-cli -n "$db" flushall +} + + +#================================================= + + +# Create a dedicated supervisor config +# +# usage: ynh_add_supervisor_config [--service=service] [--template=template] +# | arg: -s, --service= - Service name (optionnal, `$app` by default) +# | arg: -t, --template= - Name of template file (optionnal, this is 'supervisor' by default, meaning ./conf/supervisor.service will be used as template) +# +# This will use the template `../conf/.service`. +# +# See the documentation of `ynh_add_config` for a description of the template +# format and how placeholders are replaced with actual variables. +# +# Requires YunoHost version 2.7.11 or higher. +ynh_add_supervisor_config () { + # Declare an array to define the options of this helper. + local legacy_args=stv + local -A args_array=( [s]=service= [t]=template= [v]=others_var=) + local service + local template + local others_var + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + local service="${service:-$app}" + local template="${template:-supervisor.service}" + others_var="${others_var:-}" + + [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using --others_var is unecessary since Yunohost 4.2" + + ynh_add_config --template="$YNH_APP_BASEDIR/conf/$template" --destination="/etc/supervisor/conf.d/$service.conf" + + supervisorctl reread + supervisorctl update +} + +# Remove the dedicated supervisor config +# +# usage: ynh_remove_supervisor_config [--service=service] +# | arg: -s, --service= - Service name (optionnal, $app by default) +# +# Requires YunoHost version 2.7.2 or higher. +ynh_remove_supervisor_config () { + # Declare an array to define the options of this helper. + local legacy_args=s + local -A args_array=( [s]=service= ) + local service + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + local service="${service:-$app}" + + local finalsupervisorconf="/etc/supervisor/conf.d/$service.conf" + if [ -e "$finalsupervisorconf" ] + then + ynh_supervisor_action --service_name=$service --action=stop + ynh_secure_remove --file="$finalsupervisorconf" + supervisorctl reread + supervisorctl update + fi +} + +# Start (or other actions) a service, print a log in case of failure and optionnaly wait until the service is completely started +# +# usage: ynh_supervisor_action [--service_name=service_name] [--action=action] [ [--line_match="line to match"] [--log_path=log_path] [--timeout=300] [--length=20] ] +# | arg: -n, --service_name= - Name of the service to start. Default : `$app` +# | arg: -a, --action= - Action to perform with supervisorctl. Default: start +# | arg: -l, --line_match= - Line to match - The line to find in the log to attest the service have finished to boot. If not defined it don't wait until the service is completely started. +# | arg: -p, --log_path= - Log file - Path to the log file. Default : `/var/log/$app/$app.log` +# | arg: -t, --timeout= - Timeout - The maximum time to wait before ending the watching. Default : 300 seconds. +# | arg: -e, --length= - Length of the error log : Default : 20 +# +# Requires YunoHost version 3.5.0 or higher. +ynh_supervisor_action() { + # Declare an array to define the options of this helper. + local legacy_args=nalpte + declare -Ar args_array=( [n]=service_name= [a]=action= [l]=line_match= [p]=log_path= [t]=timeout= [e]=length= ) + local service_name + local action + local line_match + local length + local log_path + local timeout + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + service_name="${service_name:-$app}" + action=${action:-start} + line_match=${line_match:-} + length=${length:-20} + log_path="${log_path:-/var/log/$service_name/$service_name.log}" + timeout=${timeout:-300} + + # Start to read the log + if [[ -n "$line_match" ]] + then + local templog="$(mktemp)" + # Following the starting of the app in its log + if [ "$log_path" == "systemd" ] + then + # Read the supervisor journal + journalctl --unit=supervisor --follow --since=-0 --quiet > "$templog" & + # Get the PID of the journalctl command + local pid_tail=$! + else + # Read the specified log file + tail --follow=name --retry --lines=0 "$log_path" > "$templog" 2>&1 & + # Get the PID of the tail command + local pid_tail=$! + fi + fi + + # Use reload-or-restart instead of reload. So it wouldn't fail if the service isn't running. + if [ "$action" == "reload" ]; then + action="update" + fi + + # If the service fails to perform the action + if ! supervisorctl $action $service_name + then + # Show syslog for this service + ynh_exec_err journalctl --quiet --no-hostname --no-pager --lines=$length --unit=$service_name + # If a log is specified for this service, show also the content of this log + if [ -e "$log_path" ] + then + ynh_exec_err tail --lines=$length "$log_path" + fi + ynh_clean_check_starting + return 1 + fi + + # Start the timeout and try to find line_match + if [[ -n "${line_match:-}" ]] + then + set +x + local i=0 + for i in $(seq 1 $timeout) + do + # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout + if grep --extended-regexp --quiet "$line_match" "$templog" + then + ynh_print_info --message="The service $service_name has correctly executed the action ${action}." + break + fi + if [ $i -eq 3 ]; then + echo -n "Please wait, the service $service_name is ${action}ing" >&2 + fi + if [ $i -ge 3 ]; then + echo -n "." >&2 + fi + sleep 1 + done + set -x + if [ $i -ge 3 ]; then + echo "" >&2 + fi + if [ $i -eq $timeout ] + then + ynh_print_warn --message="The service $service_name didn't fully executed the action ${action} before the timeout." + ynh_print_warn --message="Please find here an extract of the end of the log of the service $service_name:" + ynh_exec_warn journalctl --quiet --no-hostname --no-pager --lines=$length --unit=$service_name + if [ -e "$log_path" ] + then + ynh_print_warn --message="\-\-\-" + ynh_exec_warn tail --lines=$length "$log_path" + fi + fi + ynh_clean_check_starting + fi +} diff --git a/scripts/backup b/scripts/backup index 33560f71..535642d5 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,28 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/scripts/change_url b/scripts/change_url index 9546559c..71e3966e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -10,55 +10,6 @@ source _common.sh source ynh_supervisor source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH - -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path="/" - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -#REMOVEME? # Needed for helper "ynh_add_nginx_config" -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) - -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] -then - #REMOVEME? change_domain=1 -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -75,18 +26,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - #================================================= # SPECIFIC MODIFICATIONS #================================================= @@ -126,13 +65,6 @@ ynh_script_progression --message="Starting a supervisor service..." --weight=1 ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index f9826531..9d374d16 100644 --- a/scripts/install +++ b/scripts/install @@ -11,74 +11,24 @@ source ynh_redis source ynh_supervisor source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -#REMOVEME? domain=$YNH_APP_ARG_DOMAIN -path="/" -#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC app_key="base64:$(ynh_string_random --length=32 | base64)" -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 - -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path +fpm_footprint="low" +fpm_free_footprint=0 +fpm_usage="low" #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path ynh_app_setting_set --app=$app --key=app_key --value=$app_key - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=1 - -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=1 - -# Create a system user -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - -#================================================= -# CREATE A POSTGRESQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Creating a PostgreSQL database..." --weight=1 - -#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? db_user=$db_name -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#REMOVEME? ynh_psql_test_if_first_run -#REMOVEME? ynh_psql_setup_db --db_user=$db_name --db_name=$db_name +ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint +ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint +ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= # CONFIGURE REDIS DATABASE @@ -93,11 +43,9 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -106,16 +54,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -# Create a dedicated PHP-FPM config -ynh_add_fpm_config -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -123,7 +63,7 @@ ynh_add_nginx_config #================================================= # INSTALL COMPOSER DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Installing composer dependencies..." --weight=1 +ynh_script_progression --message="Installing composer dependencies..." --weight=1 ynh_exec_warn_less ynh_install_composer --phpversion="$phpversion" --composerversion="$YNH_COMPOSER_VERSION" --workdir="$install_dir" @@ -212,26 +152,6 @@ ynh_script_progression --message="Starting a supervisor service..." --weight=1 # Start a supervisor service ynh_supervisor_action --service_name="${app}-horizon" --action="reload" --log_path="systemd" --line_match="success: ${app}-horizon" -#================================================= -# SETUP SSOWAT -#================================================= -#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 - -# Make app public if necessary -#REMOVEME? if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" -fi - -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index dc963c65..c1ff05ae 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,23 +7,8 @@ #================================================= source _common.sh -source ynh_redis -source ynh_supervisor source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) - #================================================= # STANDARD REMOVE #================================================= @@ -53,14 +38,6 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight= # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE THE POSTGRESQL DATABASE -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 - -# Remove a database if it exists, along with the associated user -#REMOVEME? ynh_psql_remove_db --db_user=$db_user --db_name=$db_name - #================================================= # REMOVE THE REDIS DATABASE #================================================= @@ -68,14 +45,6 @@ ynh_script_progression --message="Removing the Redis database..." --weight=1 ynh_redis_remove_db "$redis_db" -#================================================= -# REMOVE APP MAIN DIR -#================================================= -#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 - -# Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" - #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -92,14 +61,6 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -#REMOVEME? ynh_remove_app_dependencies - #================================================= # SPECIFIC REMOVE #================================================= @@ -113,16 +74,6 @@ ynh_secure_remove --file="/etc/cron.d/$app" # Remove the log files ynh_secure_remove --file="/var/log/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 0bfd52d6..cf0d895d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,51 +8,8 @@ # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/ynh_supervisor source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -#REMOVEME? test ! -d $install_dir \ - || ynh_die --message="There is already a directory: $install_dir " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -60,20 +17,9 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# SPECIFIC RESTORATION -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -91,11 +37,8 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -#REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -#REMOVEME? ynh_psql_test_if_first_run -#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9648121b..b3a38f09 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,48 +7,14 @@ #================================================= source _common.sh -source ynh_redis -source ynh_supervisor source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading settings..." --weight=1 - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -#REMOVEME? app_key=$(ynh_app_setting_get --app=$app --key=app_key) -#REMOVEME? redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) - #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 - -# Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { - ynh_clean_check_starting - # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -79,22 +45,19 @@ if [ -z "$app_key" ]; then ynh_app_setting_set --app="$app" --key=app_key --value="$app_key" fi -#REMOVEME? if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.9.0~ynh3..." ynh_script_progression --message="Configuring a systemd service..." ynh_add_systemd_config --service="${app}-horizon" --template=horizon.conf fi -#REMOVEME? if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh2..." ynh_script_progression --message="Stopping and removing the systemd service..." ynh_remove_systemd_config --service="${app}-horizon" -#REMOVEME? ynh_script_progression --message="Installing dependencies..." -#REMOVEME? ynh_install_app_dependencies "$pkg_dependencies" - ynh_script_progression --message="Creating log file..." mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" @@ -108,7 +71,7 @@ fi ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" fi -#REMOVEME? if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh3..." if ynh_exec_warn_less yunohost service status ${app}-horizon >/dev/null @@ -121,21 +84,6 @@ fi yunohost service add "supervisor" --description="Supervisor daemon for $app" --log="/var/log/$app/${app}-horizon.log" fi -# Cleaning legacy permissions -#REMOVEME? if ynh_legacy_permissions_exists; then -#REMOVEME? ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -148,19 +96,11 @@ then ynh_setup_source --dest_dir="$install_dir" --keep=".env" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" # Pixelfed app should be able to edit its settings from the admin panel chmod 600 "$install_dir"/.env -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -168,7 +108,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -187,8 +126,6 @@ ynh_script_progression --message="Updating composer..." --weight=1 ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update" -#REMOVEME? ynh_script_progression --message="Updating composer dependencies..." --weight=1 - ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="update" #================================================= @@ -264,13 +201,6 @@ ynh_script_progression --message="Starting a supervisor service..." --weight=1 ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" -#================================================= -# RELOAD NGINX -#================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/ynh_redis b/scripts/ynh_redis deleted file mode 100644 index af5a55c2..00000000 --- a/scripts/ynh_redis +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} diff --git a/scripts/ynh_supervisor b/scripts/ynh_supervisor deleted file mode 100644 index 67bd2bd7..00000000 --- a/scripts/ynh_supervisor +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/bash - -# Create a dedicated supervisor config -# -# usage: ynh_add_supervisor_config [--service=service] [--template=template] -# | arg: -s, --service= - Service name (optionnal, `$app` by default) -# | arg: -t, --template= - Name of template file (optionnal, this is 'supervisor' by default, meaning ./conf/supervisor.service will be used as template) -# -# This will use the template `../conf/.service`. -# -# See the documentation of `ynh_add_config` for a description of the template -# format and how placeholders are replaced with actual variables. -# -# Requires YunoHost version 2.7.11 or higher. -ynh_add_supervisor_config () { - # Declare an array to define the options of this helper. - local legacy_args=stv - local -A args_array=( [s]=service= [t]=template= [v]=others_var=) - local service - local template - local others_var - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - local service="${service:-$app}" - local template="${template:-supervisor.service}" - others_var="${others_var:-}" - - [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using --others_var is unecessary since Yunohost 4.2" - - ynh_add_config --template="$YNH_APP_BASEDIR/conf/$template" --destination="/etc/supervisor/conf.d/$service.conf" - - supervisorctl reread - supervisorctl update -} - -# Remove the dedicated supervisor config -# -# usage: ynh_remove_supervisor_config [--service=service] -# | arg: -s, --service= - Service name (optionnal, $app by default) -# -# Requires YunoHost version 2.7.2 or higher. -ynh_remove_supervisor_config () { - # Declare an array to define the options of this helper. - local legacy_args=s - local -A args_array=( [s]=service= ) - local service - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - local service="${service:-$app}" - - local finalsupervisorconf="/etc/supervisor/conf.d/$service.conf" - if [ -e "$finalsupervisorconf" ] - then - ynh_supervisor_action --service_name=$service --action=stop - ynh_secure_remove --file="$finalsupervisorconf" - supervisorctl reread - supervisorctl update - fi -} - -# Start (or other actions) a service, print a log in case of failure and optionnaly wait until the service is completely started -# -# usage: ynh_supervisor_action [--service_name=service_name] [--action=action] [ [--line_match="line to match"] [--log_path=log_path] [--timeout=300] [--length=20] ] -# | arg: -n, --service_name= - Name of the service to start. Default : `$app` -# | arg: -a, --action= - Action to perform with supervisorctl. Default: start -# | arg: -l, --line_match= - Line to match - The line to find in the log to attest the service have finished to boot. If not defined it don't wait until the service is completely started. -# | arg: -p, --log_path= - Log file - Path to the log file. Default : `/var/log/$app/$app.log` -# | arg: -t, --timeout= - Timeout - The maximum time to wait before ending the watching. Default : 300 seconds. -# | arg: -e, --length= - Length of the error log : Default : 20 -# -# Requires YunoHost version 3.5.0 or higher. -ynh_supervisor_action() { - # Declare an array to define the options of this helper. - local legacy_args=nalpte - declare -Ar args_array=( [n]=service_name= [a]=action= [l]=line_match= [p]=log_path= [t]=timeout= [e]=length= ) - local service_name - local action - local line_match - local length - local log_path - local timeout - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - service_name="${service_name:-$app}" - action=${action:-start} - line_match=${line_match:-} - length=${length:-20} - log_path="${log_path:-/var/log/$service_name/$service_name.log}" - timeout=${timeout:-300} - - # Start to read the log - if [[ -n "$line_match" ]] - then - local templog="$(mktemp)" - # Following the starting of the app in its log - if [ "$log_path" == "systemd" ] - then - # Read the supervisor journal - journalctl --unit=supervisor --follow --since=-0 --quiet > "$templog" & - # Get the PID of the journalctl command - local pid_tail=$! - else - # Read the specified log file - tail --follow=name --retry --lines=0 "$log_path" > "$templog" 2>&1 & - # Get the PID of the tail command - local pid_tail=$! - fi - fi - - # Use reload-or-restart instead of reload. So it wouldn't fail if the service isn't running. - if [ "$action" == "reload" ]; then - action="update" - fi - - # If the service fails to perform the action - if ! supervisorctl $action $service_name - then - # Show syslog for this service - ynh_exec_err journalctl --quiet --no-hostname --no-pager --lines=$length --unit=$service_name - # If a log is specified for this service, show also the content of this log - if [ -e "$log_path" ] - then - ynh_exec_err tail --lines=$length "$log_path" - fi - ynh_clean_check_starting - return 1 - fi - - # Start the timeout and try to find line_match - if [[ -n "${line_match:-}" ]] - then - set +x - local i=0 - for i in $(seq 1 $timeout) - do - # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout - if grep --extended-regexp --quiet "$line_match" "$templog" - then - ynh_print_info --message="The service $service_name has correctly executed the action ${action}." - break - fi - if [ $i -eq 3 ]; then - echo -n "Please wait, the service $service_name is ${action}ing" >&2 - fi - if [ $i -ge 3 ]; then - echo -n "." >&2 - fi - sleep 1 - done - set -x - if [ $i -ge 3 ]; then - echo "" >&2 - fi - if [ $i -eq $timeout ] - then - ynh_print_warn --message="The service $service_name didn't fully executed the action ${action} before the timeout." - ynh_print_warn --message="Please find here an extract of the end of the log of the service $service_name:" - ynh_exec_warn journalctl --quiet --no-hostname --no-pager --lines=$length --unit=$service_name - if [ -e "$log_path" ] - then - ynh_print_warn --message="\-\-\-" - ynh_exec_warn tail --lines=$length "$log_path" - fi - fi - ynh_clean_check_starting - fi -} From 9099f8544789ad8e2fedf7f767b0a7ee1c3bd4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:33:21 +0200 Subject: [PATCH 03/67] Create tests.toml --- tests.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 00000000..f5c7d220 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------------------------- + # Default args to use for install + # ------------------------------- \ No newline at end of file From c3347e6e953db3e5086ca80649b1ea2e242c33d1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 22 Apr 2023 20:33:26 +0000 Subject: [PATCH 04/67] Auto-update README --- README.md | 47 ----------------------------------------------- README_fr.md | 41 ----------------------------------------- 2 files changed, 88 deletions(-) diff --git a/README.md b/README.md index 08ce1f29..91b6f969 100644 --- a/README.md +++ b/README.md @@ -31,53 +31,6 @@ It is also possible to import your data from Instagram. ![Screenshot of Pixelfed](./doc/screenshots/screenshots.jpg) -## Disclaimers / important information - -## Important points to read before installing - -1. **Pixelfed** require a dedicated **root domain**, eg. pixelfed.domain.tld - -### Administrator - -After being first registered, you need to execute the folloing command to promote first registered as admin - -**Run:** - - $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 - -and respond yes to the question ` Add admin privileges to this user?`. - -### Allow/Close registrations - -Registrations are open by default. -To change that setting, edit `/var/www/pixelfed/.env` and set `OPEN_REGISTRATION=false` instead of `true`. -Then run `php7.4 artisan config:cache` to reload the settings. - -### Change max upload limit - -To change max upload limit (default : 50MB), edit the Pixelfed `php-fpm.conf` file and find the line `Common values to change to increase file upload limit` -And adjust those values: -``` -php_admin_value[post_max_size] = 50M -php_admin_value[upload_max_filesize] = 50M -``` - - - - - - -### Disable search engine indexing - -If you don't want your Pixelfed instance to be indexed in search engine (and so on), edit `/var/www/pixelfed/public/robots.txt` like this: -``` -User-agent: * -Disallow: / -``` -Note: search engines will see that file and may or may not respect its content. - -Since 0.10.10, by default `/discover/places/`, `/stories/` and `/i/` are present in that file. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 647a70fa..f47d75fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,47 +32,6 @@ Il est également possible d'importer ses données depuis Instagram. ![Capture d’écran de Pixelfed](./doc/screenshots/screenshots.jpg) -## Avertissements / informations importantes - -## Points importants à lire avant l'installation - -1. **Pixelfed** nécessite un **domaine racine** dédié, par ex. pixelfed.domain.tld - -### Administrateur - -Après avoir été enregistré pour la première fois, vous devez exécuter la commande suivante pour promouvoir le premier enregistré en tant qu'administrateur - -**Entrez la commande:** - - $ php8.0 /var/www/pixelfed/artisan user:admin 1 - -et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » - -### Autoriser/Fermer les inscriptions - -Les inscriptions sont ouvertes par défaut. -Pour modifier ce paramètre, modifiez `/var/www/pixelfed/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. -Ensuite, exécutez `php7.4 artisan config:cache` pour recharger les paramètres. - -### Changer la taille limite maximale de téléversement - -Pour changer la limite maximale de téléversement (par défaut : 50Mo), éditer le fichier `php-fpm.conf` de Pixelfed et après la ligne `Common values to change to increase file upload limit` ajuster ces valeurs: -``` -php_admin_value[post_max_size] = 50M -php_admin_value[upload_max_filesize] = 50M -``` - -### Désactiver l'indexation des moteurs de recherche - -Si vous ne voulez pas que votre instance Pixelfed soit indexée dans le moteur de recherche (et ainsi de suite), modifiez `/var/www/pixelfed/public/robots.txt` comme ceci : -``` -Agent utilisateur: * -Interdire : / -``` -Remarque : les moteurs de recherche verront ce fichier et pourront ou non respecter son contenu. - -Depuis la 0.10.10, par défaut `/discover/places/`, `/stories/` et `/i/` sont présents dans ce fichier. - ## Documentations et ressources * Site officiel de l’app : From 882119fe330ae73793a3246ba3369accf353f183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:36:04 +0200 Subject: [PATCH 05/67] fix --- check_process | 45 --------------------------------------------- manifest.toml | 1 - scripts/upgrade | 23 ++++++++++++++++------- tests.toml | 6 ++++-- 4 files changed, 20 insertions(+), 55 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index cac92289..00000000 --- a/check_process +++ /dev/null @@ -1,45 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 0.10.6 - # upgrade=1 from_commit=605a47aac7553fdcc6012531ee67add8dbe37b97 - # 0.10.7 - # upgrade=1 from_commit=7fa86c3e6e6db6668be0a165213d554850b9fce8 - # 0.10.8 - # upgrade=1 from_commit=10c3703567d1e9504ea4f298778464c7dd561470 - # 0.10.9~ynh1 - # upgrade=1 from_commit=8c5e710060da43a946336d66a30b9c311cfdbc37 - # 0.10.9~ynh2 - # upgrade=1 from_commit=c81ed6b760a1a68b8993917e808434166766a37a - # 0.10.9~ynh3 - # upgrade=1 from_commit=9c7d0ff114bb0bd3482901fde4bd82b494aa2e6d - # 0.10.10~ynh1 - # upgrade=1 from_commit=1aa406fb124b92f03b1bb69fc3462936d5227278 - # 0.10.10~ynh3 - # upgrade=1 from_commit=2a796e30dd521a5022586bc7fe59d189210028a4 - # 0.10.10~ynh4 - # upgrade=1 from_commit=8ef41895fbd38008f3718e164d0bf3f0d97a2c03 - # 0.11.0~ynh1 - # upgrade=1 from_commit=c7181d1c7cb6cba53bb65e622c78b0309a53b76a - # 0.11.0~ynh2 - # upgrade=1 from_commit=d85b0b112afd19313dbf4cfba954e255789dfb88 - # 0.11.1~ynh2 - upgrade=1 from_commit=f8ecb9a95fe6430fb9d93ca674e4f0d475ecd332 - # 0.11.2~ynh1 - upgrade=1 from_commit=7a4833633f76d050296c783e565f8cdfc913c75a - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email=yalh@yahoo.com -Notification=all diff --git a/manifest.toml b/manifest.toml index dd8c751a..ed67388e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,7 +40,6 @@ ram.runtime = "50M" url = "https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz" sha256 = "eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d" - [resources.system_user] [resources.install_dir] diff --git a/scripts/upgrade b/scripts/upgrade index b3a38f09..4254c110 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,13 +29,22 @@ ynh_supervisor_action --service_name="${app}-horizon" --action="stop" --log_path #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -ynh_app_setting_delete --app=$app --key=fpm_footprint -ynh_app_setting_delete --app=$app --key=fpm_usage +# If fpm_footprint doesn't exist, create it +if [ -z "${fpm_footprint:-}" ]; then + fpm_footprint=low + ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint +fi -# If redis_db doesn't exist, create it -if [ -z "$redis_db" ]; then - redis_db=$(ynh_redis_get_free_db) - ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db +# If fpm_free_footprint doesn't exist, create it +if [ -z "${fpm_free_footprint:-}" ]; then + fpm_free_footprint=0 + ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint +fi + +# If fpm_usage doesn't exist, create it +if [ -z "${fpm_usage:-}" ]; then + fpm_usage=low + ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi # If app_key doesn't exist, retrieve it @@ -107,7 +116,7 @@ chmod 600 "$install_dir"/.env ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint #================================================= # NGINX CONFIGURATION diff --git a/tests.toml b/tests.toml index f5c7d220..3e9755f2 100644 --- a/tests.toml +++ b/tests.toml @@ -3,5 +3,7 @@ test_format = 1.0 [default] # ------------------------------- - # Default args to use for install - # ------------------------------- \ No newline at end of file + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.7a4833633f76d050296c783e565f8cdfc913c75a.name = "Upgrade from 0.11.2" From 0bf20f71865eeee151c7c86b39f536e8a91b72c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:41:53 +0200 Subject: [PATCH 06/67] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4a32507b..909c6fec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -85,7 +85,7 @@ ynh_add_supervisor_config () { local template="${template:-supervisor.service}" others_var="${others_var:-}" - [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using --others_var is unecessary since Yunohost 4.2" + [[ -z "$others_var" ]] || ynh_print_warn --message="Packagers: using others_var is unecessary since Yunohost 4.2" ynh_add_config --template="$YNH_APP_BASEDIR/conf/$template" --destination="/etc/supervisor/conf.d/$service.conf" From d439f80519a9ccaa60390d0d5b81da9bf29f73de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 22:43:10 +0200 Subject: [PATCH 07/67] Update install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 9d374d16..940ed481 100644 --- a/scripts/install +++ b/scripts/install @@ -7,8 +7,6 @@ #================================================= source _common.sh -source ynh_redis -source ynh_supervisor source /usr/share/yunohost/helpers #================================================= From 76c6fdd08f01c96698d43b15c0b0fb93623028c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 27 Apr 2023 09:27:13 +0200 Subject: [PATCH 08/67] Update manifest.toml --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index ed67388e..06f41958 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,6 +39,8 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz" sha256 = "eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d" + autoupdate.upstream = "https://github.com/pixelfed/pixelfed" + autoupdate.strategy = "latest_github_commit" [resources.system_user] From 1a87487a39e4653399e65431973d80d65fa179a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 May 2023 23:03:38 +0200 Subject: [PATCH 09/67] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 06f41958..154b7667 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false From 7eea956637486d48b8c76670182ff5a4bbc35466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 May 2023 23:10:01 +0200 Subject: [PATCH 10/67] cleaning --- .github/workflows/updater.sh | 106 ---------------------------------- .github/workflows/updater.yml | 50 ---------------- conf/nginx.conf | 1 + doc/ADMIN.md | 4 -- doc/ADMIN_fr.md | 4 -- 5 files changed, 1 insertion(+), 164 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index 94afbdf6..00000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets="https://github.com/pixelfed/pixelfed/archive/refs/tags/$version.tar.gz" - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Let's download source tarball -asset_url=$assets - -echo "Handling asset at $asset_url" - -src="app" - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -EOT -echo "... conf/$src.src updated" - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 08ec1b3a..00000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false - diff --git a/conf/nginx.conf b/conf/nginx.conf index 8e6ab96a..1c04ee35 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,3 +1,4 @@ +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { # Path to source diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 20ec496a..fbecd16b 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,7 +1,3 @@ -## Important points to read before installing - -1. **Pixelfed** require a dedicated **root domain**, eg. pixelfed.domain.tld - ### Administrator After being first registered, you need to execute the folloing command to promote first registered as admin diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 05427d14..eeddab73 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,7 +1,3 @@ -## Points importants à lire avant l'installation - -1. **Pixelfed** nécessite un **domaine racine** dédié, par ex. pixelfed.domain.tld - ### Administrateur Après avoir été enregistré pour la première fois, vous devez exécuter la commande suivante pour promouvoir le premier enregistré en tant qu'administrateur From 9f0704b35ba79ae59ec24e6ad8427ff11f3afff7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 May 2023 06:35:49 +0000 Subject: [PATCH 11/67] 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 c18f2b64..91b6f969 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.6~ynh2 +**Shipped version:** 0.11.5~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a9a4c2f5..f47d75fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.6~ynh2 +**Version incluse :** 0.11.5~ynh3 ## Captures d’écran From 000ad7e1b168dc3653dd83a24e90888bb5e36701 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 May 2023 07:49:22 +0000 Subject: [PATCH 12/67] 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 8109b741..91b6f969 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.7~ynh1 +**Shipped version:** 0.11.5~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 45e1a24c..f47d75fa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.7~ynh1 +**Version incluse :** 0.11.5~ynh3 ## Captures d’écran From 7b8edd8f802fe3b7668cbbd2b0802b0f82adf118 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 09:51:16 +0200 Subject: [PATCH 13/67] Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 821e92a5..af52d62f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.7.tar.gz -SOURCE_SUM=eb27aa61c337c3dbca3c0e59cbd86069da1dbc7dea988630d3453cd92dcc75e7 +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/18c744c458138d067e07b72e64da55f8ecb1bafa.tar.gz +SOURCE_SUM=a7b4d5e5fdc7939e3159f632398792af26c9e8e88c92265939a507b898e6724f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 380fab26a7712ce0aae52a18d8aea09353d82ac1 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 09:51:41 +0200 Subject: [PATCH 14/67] bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a57868d6..9ba612bf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub Federated Image Sharing", "fr": "Logiciel de partage d'image fédéré via ActivityPub" }, - "version": "0.11.7~ynh1", + "version": "0.11.7~ynh2", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From f24bdf52052a7152b8b8ced36281f752f4e1d784 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 May 2023 07:51:44 +0000 Subject: [PATCH 15/67] 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 184a98a4..9b3e03d5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.7~ynh1 +**Shipped version:** 0.11.7~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 4a54b31b..60a42fa5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.7~ynh1 +**Version incluse :** 0.11.7~ynh2 ## Captures d’écran From 2d408bc6215c7fe512a16cce66b4f4f8a40485a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 09:57:02 +0200 Subject: [PATCH 16/67] cleaning --- conf/extra_php-fpm.conf | 4 ++-- conf/nginx.conf | 2 +- doc/ADMIN.md | 22 ++++------------------ doc/ADMIN_fr.md | 16 ++++------------ 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 700c37c9..f7960328 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -1,4 +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 +php_admin_value[upload_max_filesize] = 100M +php_admin_value[post_max_size] = 100M diff --git a/conf/nginx.conf b/conf/nginx.conf index 1c04ee35..e4abe618 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location __PATH__/ { index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - client_max_body_size 50M; + client_max_body_size 100M; try_files $uri $uri/ @pixelfed; location ~ [^/]\.php(/|$) { diff --git a/doc/ADMIN.md b/doc/ADMIN.md index fbecd16b..4efe72e4 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,33 +4,19 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 + $ sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. ### Allow/Close registrations Registrations are open by default. -To change that setting, edit `/var/www/pixelfed/.env` and set `OPEN_REGISTRATION=false` instead of `true`. -Then run `php7.4 artisan config:cache` to reload the settings. - -### Change max upload limit - -To change max upload limit (default : 50MB), edit the Pixelfed `php-fpm.conf` file and find the line `Common values to change to increase file upload limit` -And adjust those values: -``` -php_admin_value[post_max_size] = 50M -php_admin_value[upload_max_filesize] = 50M -``` - - - - - +To change that setting, edit `__INSTALL_DIR__/.env` and set `OPEN_REGISTRATION=false` instead of `true`. +Then run `php8.1 artisan config:cache` to reload the settings. ### Disable search engine indexing -If you don't want your Pixelfed instance to be indexed in search engine (and so on), edit `/var/www/pixelfed/public/robots.txt` like this: +If you don't want your Pixelfed instance to be indexed in search engine (and so on), edit `__INSTALL_DIR__/public/robots.txt` like this: ``` User-agent: * Disallow: / diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index eeddab73..3d61a3ff 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -4,27 +4,19 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - $ php8.0 /var/www/pixelfed/artisan user:admin 1 + sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » ### Autoriser/Fermer les inscriptions Les inscriptions sont ouvertes par défaut. -Pour modifier ce paramètre, modifiez `/var/www/pixelfed/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. -Ensuite, exécutez `php7.4 artisan config:cache` pour recharger les paramètres. - -### Changer la taille limite maximale de téléversement - -Pour changer la limite maximale de téléversement (par défaut : 50Mo), éditer le fichier `php-fpm.conf` de Pixelfed et après la ligne `Common values to change to increase file upload limit` ajuster ces valeurs: -``` -php_admin_value[post_max_size] = 50M -php_admin_value[upload_max_filesize] = 50M -``` +Pour modifier ce paramètre, modifiez `__INSTALL_DIR__/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. +Ensuite, exécutez `php8.1 artisan config:cache` pour recharger les paramètres. ### Désactiver l'indexation des moteurs de recherche -Si vous ne voulez pas que votre instance Pixelfed soit indexée dans le moteur de recherche (et ainsi de suite), modifiez `/var/www/pixelfed/public/robots.txt` comme ceci : +Si vous ne voulez pas que votre instance Pixelfed soit indexée dans le moteur de recherche (et ainsi de suite), modifiez `__INSTALL_DIR__/public/robots.txt` comme ceci : ``` Agent utilisateur: * Interdire : / From 490246714b66a5e7b3dbc7cc860ab34b6ef6d0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 09:58:56 +0200 Subject: [PATCH 17/67] Update manifest.toml --- manifest.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 154b7667..c10566bb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.5~ynh3" +version = "0.11.7~ynh1" maintainers = ["yalh76", "lapineige"] @@ -37,10 +37,9 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz" - sha256 = "eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d" - autoupdate.upstream = "https://github.com/pixelfed/pixelfed" - autoupdate.strategy = "latest_github_commit" + url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.7.tar.gz" + sha256 = "eb27aa61c337c3dbca3c0e59cbd86069da1dbc7dea988630d3453cd92dcc75e7" + autoupdate.strategy = "latest_github_tag" [resources.system_user] From 63918cc62dea19f38dc484342653f3da99fad50b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 May 2023 07:59:01 +0000 Subject: [PATCH 18/67] 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 91b6f969..8109b741 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.5~ynh3 +**Shipped version:** 0.11.7~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f47d75fa..45e1a24c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.5~ynh3 +**Version incluse :** 0.11.7~ynh1 ## Captures d’écran From ed26bf97b0d55fef9292fa2fcba6e810f1def89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 09:59:05 +0200 Subject: [PATCH 19/67] Update ADMIN.md --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 4efe72e4..4c63647c 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,7 +4,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 + sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. From 711c4fc97c8e0ae5ae2bd2a80aef44a134cb78e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 13:35:44 +0200 Subject: [PATCH 20/67] Update change_url --- scripts/change_url | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 71e3966e..6aa0860a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -7,7 +7,6 @@ #================================================= source _common.sh -source ynh_supervisor source /usr/share/yunohost/helpers #================================================= From 339f257542983a1c9f4ec933f44158cca5a402dc Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 15:03:15 +0200 Subject: [PATCH 21/67] php8.2 --- doc/ADMIN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 4c63647c..b205db60 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,7 +4,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 + sudo php8.2 __INSTALL_DIR__/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. @@ -12,7 +12,7 @@ and respond yes to the question ` Add admin privileges to this user?`. Registrations are open by default. To change that setting, edit `__INSTALL_DIR__/.env` and set `OPEN_REGISTRATION=false` instead of `true`. -Then run `php8.1 artisan config:cache` to reload the settings. +Then run `php8.2 artisan config:cache` to reload the settings. ### Disable search engine indexing From 404f013122b941eb0cccc23ac2161f710d29df8c Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 15:03:19 +0200 Subject: [PATCH 22/67] php8.2 --- doc/ADMIN_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 3d61a3ff..41cc2dbf 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -4,7 +4,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 + sudo php8.2 __INSTALL_DIR__/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » @@ -12,7 +12,7 @@ et répondez oui à la question « Ajouter des privilèges d'administrateur à c Les inscriptions sont ouvertes par défaut. Pour modifier ce paramètre, modifiez `__INSTALL_DIR__/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. -Ensuite, exécutez `php8.1 artisan config:cache` pour recharger les paramètres. +Ensuite, exécutez `php8.2 artisan config:cache` pour recharger les paramètres. ### Désactiver l'indexation des moteurs de recherche From b520c055e9c57e3899f4a8910d8d31b1582c2d1c Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 15:06:21 +0200 Subject: [PATCH 23/67] add ressources needed --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c10566bb..72e953d9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -22,9 +22,9 @@ architectures = "all" multi_instance = true ldap = false sso = false -disk = "50M" -ram.build = "50M" -ram.runtime = "50M" +disk = "500M" +ram.build = "1000M" +ram.runtime = "100M" [install] [install.domain] From 63b1f5812dd40a0f7d9d02bf6fc917cc571c63ac Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 15:07:25 +0200 Subject: [PATCH 24/67] php8.2 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 72e953d9..54c51c4a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -49,7 +49,7 @@ ram.runtime = "100M" main.url = "/" [resources.apt] - packages = "postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php8.1-redis php8.1-bcmath php8.1-cli php8.1-ctype php8.1-curl php8.1-exif php8.1-gd php8.1-iconv php8.1-intl php8.1-mbstring php8.1-tokenizer php8.1-xml php8.1-zip php8.1-pdo php8.1-pgsql php8.1-fileinfo php8.1-imagick" + packages = "postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php8.2-redis php8.2-bcmath php8.2-cli php8.2-ctype php8.2-curl php8.2-exif php8.2-gd php8.2-iconv php8.2-intl php8.2-mbstring php8.2-tokenizer php8.2-xml php8.2-zip php8.2-pdo php8.2-pgsql php8.2-fileinfo php8.2-imagick" [resources.database] type = "postgresql" From 27d2578277aa313de179cd856fd3e7847174218e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 15:37:51 +0200 Subject: [PATCH 25/67] update PHP --- doc/ADMIN.md | 4 ++-- doc/ADMIN_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 4c63647c..b205db60 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -4,7 +4,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 + sudo php8.2 __INSTALL_DIR__/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. @@ -12,7 +12,7 @@ and respond yes to the question ` Add admin privileges to this user?`. Registrations are open by default. To change that setting, edit `__INSTALL_DIR__/.env` and set `OPEN_REGISTRATION=false` instead of `true`. -Then run `php8.1 artisan config:cache` to reload the settings. +Then run `php8.2 artisan config:cache` to reload the settings. ### Disable search engine indexing diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 3d61a3ff..41cc2dbf 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -4,7 +4,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - sudo php8.1 __INSTALL_DIR__/artisan user:admin 1 + sudo php8.2 __INSTALL_DIR__/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » @@ -12,7 +12,7 @@ et répondez oui à la question « Ajouter des privilèges d'administrateur à c Les inscriptions sont ouvertes par défaut. Pour modifier ce paramètre, modifiez `__INSTALL_DIR__/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. -Ensuite, exécutez `php8.1 artisan config:cache` pour recharger les paramètres. +Ensuite, exécutez `php8.2 artisan config:cache` pour recharger les paramètres. ### Désactiver l'indexation des moteurs de recherche From 1434bfe94c9946d4db9d5a550ccd2f891abaf5bf Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 28 May 2023 22:56:27 +0200 Subject: [PATCH 26/67] post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index af52d62f..fd28afd6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/18c744c458138d067e07b72e64da55f8ecb1bafa.tar.gz -SOURCE_SUM=a7b4d5e5fdc7939e3159f632398792af26c9e8e88c92265939a507b898e6724f +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/696804d62e58b1fe69b76c272ff4b609870f7031.tar.gz +SOURCE_SUM=7b9c3be2c4b8de79f27db62001c04660ce884ac2d6fe72c115cc9ebd7eb84d5f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 57ae2059a17510fd12b485cd142555df7ca89747 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 29 May 2023 14:27:45 +0200 Subject: [PATCH 27/67] v0.11.8 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index fd28afd6..269f7aee 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/696804d62e58b1fe69b76c272ff4b609870f7031.tar.gz -SOURCE_SUM=7b9c3be2c4b8de79f27db62001c04660ce884ac2d6fe72c115cc9ebd7eb84d5f +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.8.tar.gz +SOURCE_SUM=cf98d50225dd83d612bc16d2b0eb0415f09e74413e28795c4d320fda029aa1ff SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From f99270cbc0db176cc693bb2fb96ce623d5a347bb Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 29 May 2023 14:28:09 +0200 Subject: [PATCH 28/67] v0.11.8 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9ba612bf..fe42661e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub Federated Image Sharing", "fr": "Logiciel de partage d'image fédéré via ActivityPub" }, - "version": "0.11.7~ynh2", + "version": "0.11.8~ynh1", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From f6e1a0e3c8038b0995703078d03443bb138d60c2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 May 2023 12:28:17 +0000 Subject: [PATCH 29/67] 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 9b3e03d5..3fed1b99 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.7~ynh2 +**Shipped version:** 0.11.8~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 60a42fa5..73bd6a22 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.7~ynh2 +**Version incluse :** 0.11.8~ynh1 ## Captures d’écran From dbd3f11af43813d815f960d2cfa62b95abbb5f8e Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 29 May 2023 15:09:46 +0200 Subject: [PATCH 30/67] Master -> ynh V2 (v0.11.8) --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54c51c4a..ed7b12ff 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.7~ynh1" +version = "0.11.8~ynh1" maintainers = ["yalh76", "lapineige"] @@ -37,8 +37,8 @@ ram.runtime = "100M" [resources] [resources.sources.main] - url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.7.tar.gz" - sha256 = "eb27aa61c337c3dbca3c0e59cbd86069da1dbc7dea988630d3453cd92dcc75e7" + url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.8.tar.gz" + sha256 = "cf98d50225dd83d612bc16d2b0eb0415f09e74413e28795c4d320fda029aa1ff" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 35f12f91a2bc207c0871a35fa1c8ba62702ef96d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 May 2023 13:09:50 +0000 Subject: [PATCH 31/67] 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 8109b741..04add5b2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.7~ynh1 +**Shipped version:** 0.11.8~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 45e1a24c..ff8b030a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.7~ynh1 +**Version incluse :** 0.11.8~ynh1 ## Captures d’écran From d629ee9714624174a31cd68cf9486dd062b563ef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 May 2023 09:54:44 +0200 Subject: [PATCH 32/67] Update .env --- conf/.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/.env b/conf/.env index 018e1943..428eb8ca 100644 --- a/conf/.env +++ b/conf/.env @@ -1,3 +1,5 @@ +# https://docs.pixelfed.org/technical-documentation/config/ + APP_NAME="__APP__" APP_ENV="production" APP_KEY=__APP_KEY__ From 5c98de06884b432d9acf7cbc996cb4008a40ff52 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 30 May 2023 11:19:13 +0200 Subject: [PATCH 33/67] Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 --- conf/.env | 122 +++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 62 deletions(-) diff --git a/conf/.env b/conf/.env index 71627f31..8f21fa35 100644 --- a/conf/.env +++ b/conf/.env @@ -1,31 +1,36 @@ -## Crypto -APP_KEY=__APP_KEY__ +# Please refer to https://docs.pixelfed.org/technical-documentation/config/ manual to tweak these values ## General Settings APP_NAME=__APP__ APP_ENV=production APP_DEBUG=false -APP_URL=https://__DOMAIN__ -ADMIN_DOMAIN="__DOMAIN__" -APP_DOMAIN="__DOMAIN__" -SESSION_DOMAIN="${APP_DOMAIN}" +# Crypto +APP_KEY=__APP_KEY__ +# Instance URL Configuration +APP_URL=https://__DOMAIN__ +APP_DOMAIN="__DOMAIN__" +ADMIN_DOMAIN="__DOMAIN__" +SESSION_DOMAIN="${APP_DOMAIN}" +TRUST_PROXIES="*" + +# Instance Configuration OPEN_REGISTRATION=true ENFORCE_EMAIL_VERIFICATION=true PF_MAX_USERS=1000 OAUTH_ENABLED=true APP_TIMEZONE=UTC -APP_LOCALE=en +APP_LOCALE=en #TODO : can we use a Ynh setting for this ? ## Pixelfed Tweaks LIMIT_ACCOUNT_SIZE=true MAX_ACCOUNT_SIZE=1000000 MAX_PHOTO_SIZE=15000 MAX_AVATAR_SIZE=2000 -MAX_CAPTION_LENGTH=500 -MAX_BIO_LENGTH=125 -MAX_NAME_LENGTH=30 +MAX_CAPTION_LENGTH=1000 +MAX_BIO_LENGTH=800 +MAX_NAME_LENGTH=40 MAX_ALBUM_LENGTH=4 IMAGE_QUALITY=80 PF_OPTIMIZE_IMAGES=true @@ -33,7 +38,7 @@ PF_OPTIMIZE_VIDEOS=true ADMIN_ENV_EDITOR=true ACCOUNT_DELETION=true ACCOUNT_DELETE_AFTER=false -MAX_LINKS_PER_POST=0 +MAX_LINKS_PER_POST=20 ## Instance #INSTANCE_DESCRIPTION= @@ -44,66 +49,65 @@ INSTANCE_PUBLIC_LOCAL_TIMELINE=false STORIES_ENABLED=false RESTRICTED_INSTANCE=false -## Mail -MAIL_DRIVER=smtp -MAIL_HOST=localhost -MAIL_PORT=25 -MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__" -MAIL_FROM_NAME="Pixelfed" -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null +# Database Configuration +DB_CONNECTION="pgsql" +DB_HOST="127.0.0.1" +DB_PORT="5432" +DB_DATABASE="__DB_NAME__" +DB_USERNAME="__DB_USER__" +DB_PASSWORD="__DB_PWD__" -## Databases (MySQL) -#DB_CONNECTION=mysql -#DB_HOST=127.0.0.1 -#DB_PORT=3306 -#DB_DATABASE=pixelfed -#DB_USERNAME=pixelfed -#DB_PASSWORD=pixelfed +# Redis Configuration (cache) +REDIS_CLIENT="phpredis" +REDIS_SCHEME="tcp" +REDIS_HOST="127.0.0.1" +REDIS_PASSWORD="null" +REDIS_PORT="6379" +REDIS_DATABASE="__REDIS_DB__" -## Databases (Postgres) -DB_CONNECTION=pgsql -DB_HOST=127.0.0.1 -DB_PORT=5432 -DB_DATABASE=__DB_NAME__ -DB_USERNAME=__DB_USER__ -DB_PASSWORD=__DB_PWD__ +# Laravel Configuration +SESSION_DRIVER="database" +CACHE_DRIVER="redis" +QUEUE_DRIVER="redis" +BROADCAST_DRIVER="log" +LOG_CHANNEL="stack" +HORIZON_PREFIX="horizon-" -## Cache (Redis) -REDIS_CLIENT=phpredis -REDIS_SCHEME=tcp -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 -REDIS_DATABASE=__REDIS_DB__ - -## EXPERIMENTS -EXP_LC=false -EXP_REC=false -EXP_LOOPS=false - -## ActivityPub Federation -ACTIVITY_PUB=true -AP_REMOTE_FOLLOW=true -AP_INBOX=true -AP_SHAREDINBOX=true -AP_OUTBOX=true +## ActivityPub Configuration +ACTIVITY_PUB="true" +AP_REMOTE_FOLLOW="true" +AP_INBOX="true" +AP_SHAREDINBOX="true" +AP_OUTBOX="true" ATOM_FEEDS=true NODEINFO=true WEBFINGER=true -## S3 -FILESYSTEM_CLOUD=s3 +## Mail Configuration (Post-Installer) +MAIL_DRIVER=smtp +MAIL_HOST=localhost +MAIL_PORT=25 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__" +MAIL_FROM_NAME="Pixelfed" + +## S3 Configuration (Post-Installer) PF_ENABLE_CLOUD=false +FILESYSTEM_CLOUD=s3 #AWS_ACCESS_KEY_ID= #AWS_SECRET_ACCESS_KEY= #AWS_DEFAULT_REGION= -#AWS_BUCKET= +#AWS_BUCKET= #AWS_URL= #AWS_ENDPOINT= #AWS_USE_PATH_STYLE_ENDPOINT=false + +## Experimental Configuration +EXP_EMC="true" + ## Horizon HORIZON_DARKMODE=false @@ -122,9 +126,6 @@ LOG_CHANNEL=stack ## Image IMAGE_DRIVER=imagick -## Broadcasting -BROADCAST_DRIVER=log # log driver for local development - ## Cache CACHE_DRIVER=redis @@ -137,9 +138,6 @@ QUEUE_DRIVER=redis ## Session SESSION_DRIVER=redis -## Trusted Proxy -TRUST_PROXIES="*" - ## Passport #PASSPORT_PRIVATE_KEY= #PASSPORT_PUBLIC_KEY= From b5158ba1efa3e6200069fe6744821f026baa6516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Jun 2023 11:44:45 +0200 Subject: [PATCH 34/67] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ed7b12ff..a8e3007b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.8~ynh1" +version = "0.11.8~ynh2" maintainers = ["yalh76", "lapineige"] From 6e78838988f1f6426b5b879d1d4f1134f7c17393 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Jun 2023 09:44:51 +0000 Subject: [PATCH 35/67] 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 04add5b2..cc5bb58d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.8~ynh1 +**Shipped version:** 0.11.8~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ff8b030a..cd25629c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.8~ynh1 +**Version incluse :** 0.11.8~ynh2 ## Captures d’écran From b4632b106fffc4d15137dd55047688510bec42e6 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 11 Jun 2023 15:56:36 +0200 Subject: [PATCH 36/67] Typo --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a8e3007b..d35d9e9c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Logiciel de partage d'image fédéré via ActivityPub" version = "0.11.8~ynh2" -maintainers = ["yalh76", "lapineige"] +maintainers = ["yalh76", "Lapineige"] [upstream] license = "AGPL-3.0-or-later" From 06e5806853d58a57fff781b94de77a22c1efe9bc Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 12 Jun 2023 14:14:17 +0200 Subject: [PATCH 37/67] Patch file access right (fix post 0.11.5 installs) --- scripts/install | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index 940ed481..e89873f7 100644 --- a/scripts/install +++ b/scripts/install @@ -135,6 +135,14 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1 ynh_use_logrotate --logfile="/var/log/$app/${app}-horizon.log" ynh_use_logrotate --logfile="/var/www/$app/storage/logs/laravel.log" +#================================================= +# PATCH PERMISSIONS for v0.11.5 versions and higher +#================================================= +ynh_script_progression --message="Patching permissions (for version 0.11.5 and newer)..." --weight=1 + +# Default configuration doesn't work +ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$install_dir/config/filesystems.php + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= From 3da6f2468998a3a2d5b51c3e79ddcd393258b1cb Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 12 Jun 2023 14:15:07 +0200 Subject: [PATCH 38/67] Bump version (post v0.11.5 install fixes) --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d35d9e9c..956a1276 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.8~ynh2" +version = "0.11.8~ynh3" maintainers = ["yalh76", "Lapineige"] From ccf84ba8d288adaf440fd9fb75a15ff7567ccdf4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 12 Jun 2023 12:15:12 +0000 Subject: [PATCH 39/67] 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 cc5bb58d..f1bd5c9d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.8~ynh2 +**Shipped version:** 0.11.8~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index cd25629c..c1037218 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.8~ynh2 +**Version incluse :** 0.11.8~ynh3 ## Captures d’écran From 6510fd3214560333d3fa2dc6608c1814e6ac9a9f Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Jun 2023 16:24:20 +0200 Subject: [PATCH 40/67] Update extra_php-fpm.conf Fix #223 --- conf/extra_php-fpm.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index f7960328..c979f58d 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -2,3 +2,6 @@ php_admin_value[upload_max_filesize] = 100M php_admin_value[post_max_size] = 100M + +; Group should not be pixelfed, unless image (folder) access rights are not working +group = www-data From b82201b56f39d21e16b123c5b74cf408bd21edd7 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Jun 2023 16:27:51 +0200 Subject: [PATCH 42/67] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 956a1276..601aebc4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.8~ynh3" +version = "0.11.8~ynh4" maintainers = ["yalh76", "Lapineige"] From 745ec18f2276e39c3b760ce88296768b3e496912 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 18 Jun 2023 14:27:54 +0000 Subject: [PATCH 43/67] 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 f1bd5c9d..6bd543cf 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.8~ynh3 +**Shipped version:** 0.11.8~ynh4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c1037218..77506aa1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.8~ynh3 +**Version incluse :** 0.11.8~ynh4 ## Captures d’écran From 013c3d60f4cbda04c5c609f673c1396ff916da86 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 18 Jun 2023 16:33:13 +0200 Subject: [PATCH 44/67] Fix post-v2 issues --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 092fb00b..51dc4d48 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -149,6 +149,7 @@ if [ -d "$install_dir/public/storage/m/_v2/" ]; then chmod 750 -R "$install_dir/public/storage/m/_v2/"* # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* chmod 770 "$install_dir/public/storage/m/_v2/"* # users folders should be 770 chmod 770 "$install_dir/public/storage/m/_v2/" # this should be 770 + chown -R :www-data "$install_dir/public/storage/m/_v2/" # Fix the mess following packaging v2 upgrade - and make sure proper group owner is set. fi #================================================= From f20462fce69eb8334a532a04230e7c91536c020b Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 1 Jul 2023 09:30:36 +0200 Subject: [PATCH 45/67] Patch post v0.11.5 permissions Why are they not correct by default ? --- scripts/install | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index e89873f7..8cffce4f 100644 --- a/scripts/install +++ b/scripts/install @@ -143,6 +143,14 @@ ynh_script_progression --message="Patching permissions (for version 0.11.5 and n # Default configuration doesn't work ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$install_dir/config/filesystems.php +# Repair permissions for files created after v0.11.5 and before this patch +if [ -d "$install_dir/public/storage/m/_v2/" ]; then + chmod 750 -R "$install_dir/public/storage/m/_v2/"* # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* + chmod 770 "$install_dir/public/storage/m/_v2/"* # users folders should be 770 + chmod 770 "$install_dir/public/storage/m/_v2/" # this should be 770 + chown -R :www-data "$install_dir/public/storage/m/_v2/" # Fix the mess following packaging v2 upgrade - and make sure proper group owner is set. +fi + #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= From e85a4c6e2e09e1a10f100f31d6a1a45ddf62165e Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 1 Jul 2023 09:34:01 +0200 Subject: [PATCH 47/67] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 601aebc4..015ed498 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.8~ynh4" +version = "0.11.8~ynh5" maintainers = ["yalh76", "Lapineige"] From ac72c761455d349da6e8bf1be73cc46f2f24c9a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 1 Jul 2023 07:34:05 +0000 Subject: [PATCH 48/67] 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 6bd543cf..39d96724 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.8~ynh4 +**Shipped version:** 0.11.8~ynh5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 77506aa1..d9c882a9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.8~ynh4 +**Version incluse :** 0.11.8~ynh5 ## Captures d’écran From f09acc20ad9fb662c961f56317cb24f99909cd2d Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Sun, 13 Aug 2023 13:23:04 +0200 Subject: [PATCH 49/67] Fix mail sendmail (#230) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Testing : patch install permissions (#226) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Update .env use sendmail for default mail sending, should work out of the box for fresh installs * patch source prevent privilege escalation * patching source prevent privilege escalation * patching source prevent privilege escalation * Update manifest.toml Enable authentication on the mail stack for the system user * Update .env authentication on the mail stack with app system user * Fix old email configs --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar --- conf/.env | 10 +++++----- manifest.toml | 1 + scripts/install | 9 +++++++++ scripts/restore | 9 +++++++++ scripts/upgrade | 18 ++++++++++++++++++ 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/conf/.env b/conf/.env index 8f21fa35..615ba19d 100644 --- a/conf/.env +++ b/conf/.env @@ -84,13 +84,13 @@ NODEINFO=true WEBFINGER=true ## Mail Configuration (Post-Installer) -MAIL_DRIVER=smtp -MAIL_HOST=localhost +MAIL_DRIVER=sendmail +MAIL_HOST=127.0.0.1 MAIL_PORT=25 -MAIL_USERNAME=null -MAIL_PASSWORD=null +MAIL_USERNAME=__APP__ +MAIL_PASSWORD=__MAIL_PWD__ MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__" +MAIL_FROM_ADDRESS="__APP__@__DOMAIN__" MAIL_FROM_NAME="Pixelfed" ## S3 Configuration (Post-Installer) diff --git a/manifest.toml b/manifest.toml index 015ed498..811c71a7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,6 +42,7 @@ ram.runtime = "100M" autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] diff --git a/scripts/install b/scripts/install index 8cffce4f..38a3213e 100644 --- a/scripts/install +++ b/scripts/install @@ -47,6 +47,15 @@ ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# PATCHING SOURCE +#================================================= +ynh_script_progression --message="Patching source files..." --weight=1 + +# Prevent privilege escalation by injecting commands in an email name +# This described in more detail on the manpage https://www.postfix.org/sendmail.1.html under security +ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="'/usr/sbin/sendmail -bs -- '" --target_file=$install_dir/config/mail.php + #================================================= # PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index cf0d895d..085b019e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,15 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# PATCHING SOURCE +#================================================= +ynh_script_progression --message="Patching source files..." --weight=1 + +# Prevent privilege escalation by injecting commands in an email name +# This described in more detail on the manpage https://www.postfix.org/sendmail.1.html under security +ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="'/usr/sbin/sendmail -bs -- '" --target_file=$install_dir/config/mail.php + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 51dc4d48..da9f593e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,6 +92,15 @@ if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/et yunohost service add "supervisor" --description="Supervisor daemon for $app" --log="/var/log/$app/${app}-horizon.log" fi +# Fix old email configs +if ynh_compare_current_package_version --comparison lt --version "0.11.8~ynh5" ; then + ynh_replace_special_string --match_string="MAIL_DRIVER=[^\\n]*" --replace_string="MAIL_DRIVER=sendmail" --target_file="$install_dir/.env" # two \\ because it's in a "" + ynh_replace_special_string --match_string="MAIL_HOST=[^\\n]*" --replace_string="MAIL_HOST=127.0.0.1" --target_file="$install_dir/.env" # two \\ because it's in a "" + ynh_replace_special_string --match_string="MAIL_USERNAME=[^\\n]*" --replace_string="MAIL_USERNAME=$app" --target_file="$install_dir/.env" # two \\ because it's in a "" + ynh_replace_special_string --match_string="MAIL_PASSWORD=[^\\n]*" --replace_string="MAIL_PASSWORD=$mail_pwd" --target_file="$install_dir/.env" # two \\ because it's in a "" + ynh_replace_special_string --match_string="MAIL_FROM_ADDRESS=pixelfed" --replace_string=`MAIL_FROM_ADDRESS="$app"` --target_file="$install_dir/.env" +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -109,6 +118,15 @@ chown -R $app:www-data "$install_dir" # Pixelfed app should be able to edit its settings from the admin panel chmod 600 "$install_dir"/.env +#================================================= +# PATCHING SOURCE +#================================================= +ynh_script_progression --message="Patching source files..." --weight=1 + +# Prevent privilege escalation by injecting commands in an email name +# This described in more detail on the manpage https://www.postfix.org/sendmail.1.html under security +ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="'/usr/sbin/sendmail -bs -- '" --target_file=$install_dir/config/mail.php + #================================================= # PHP-FPM CONFIGURATION #================================================= From 118a23f016537160dc656c7794fe502ce4b65909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:21:03 +0200 Subject: [PATCH 50/67] remove full_domain --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 811c71a7..11bce74a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -29,7 +29,6 @@ ram.runtime = "100M" [install] [install.domain] type = "domain" - full_domain = true [install.init_main_permission] type = "group" From 74d530640fbe1aabb3b88d94e1c58e11826ae4cf Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 19 Aug 2023 15:37:10 +0200 Subject: [PATCH 51/67] Add manual email verification doc (#233) * Add manual email verification doc * email verification doc (fr) * fix doc --- doc/ADMIN.md | 5 ++++- doc/ADMIN_fr.md | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index b205db60..483049ff 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -12,7 +12,10 @@ and respond yes to the question ` Add admin privileges to this user?`. Registrations are open by default. To change that setting, edit `__INSTALL_DIR__/.env` and set `OPEN_REGISTRATION=false` instead of `true`. -Then run `php8.2 artisan config:cache` to reload the settings. +Then run `php8.2 artisan config:cache` (from the app `/var/www/pixelfed…` folder) to reload the settings. + +### Manually verifying emails +By default, email verification is activated (adjust the `.env` file if needed). If your server can't send emails, you can manually confirm one user's email in the admin UI, tab `Moderation`, and by using the command `php8.2 artisan user:verify UserName`. ### Disable search engine indexing diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 41cc2dbf..3824e372 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -12,7 +12,10 @@ et répondez oui à la question « Ajouter des privilèges d'administrateur à c Les inscriptions sont ouvertes par défaut. Pour modifier ce paramètre, modifiez `__INSTALL_DIR__/.env` et définissez `OPEN_REGISTRATION=false` au lieu de `true`. -Ensuite, exécutez `php8.2 artisan config:cache` pour recharger les paramètres. +Ensuite, exécutez `php8.2 artisan config:cache` depuis le dossier de l'application (dans `/var/www/pixelfed…`) pour recharger les paramètres. + +### Vérification manuelle des emails +Par défaut, la vérification des emails est activée (ajustez le fichier `.env` si nécessaire). Si votre serveur ne peut pas envoyer d'emails, vous pouvez confirmer manuellement l'email d'un compte dans l'interface d'administration, onglet `Modération`, et en utilisant la commande `php8.2 artisan user:verify NomUtilisateur`. ### Désactiver l'indexation des moteurs de recherche From e4d1cc5070073ba6ca552a21506bc4b5d3cd6106 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 22 Aug 2023 09:48:52 +0200 Subject: [PATCH 52/67] 0.11.9 (#236) * v0.11.9 * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 39d96724..ef662253 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.8~ynh5 +**Shipped version:** 0.11.9~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d9c882a9..1906a50d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.8~ynh5 +**Version incluse :** 0.11.9~ynh1 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index 11bce74a..90f6d778 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.8~ynh5" +version = "0.11.9~ynh1" maintainers = ["yalh76", "Lapineige"] @@ -36,8 +36,8 @@ ram.runtime = "100M" [resources] [resources.sources.main] - url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.8.tar.gz" - sha256 = "cf98d50225dd83d612bc16d2b0eb0415f09e74413e28795c4d320fda029aa1ff" + url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.9.tar.gz" + sha256 = "a56629a8094749911927a4a02b69fa3446f1a089315ff9b2ccfd85a5e26bd140" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 587c73fc1bc2f764291ee3967d32b603cda24670 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 28 Aug 2023 15:03:08 +0200 Subject: [PATCH 53/67] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 90f6d778..ed354ec7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.9~ynh1" +version = "0.11.9~ynh2" maintainers = ["yalh76", "Lapineige"] From fd5d09ebe6968e13e61e0b5fa65205e4d132fdd2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Aug 2023 13:03:11 +0000 Subject: [PATCH 54/67] 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 ef662253..5cde47bb 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.9~ynh1 +**Shipped version:** 0.11.9~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1906a50d..256b2bac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.9~ynh1 +**Version incluse :** 0.11.9~ynh2 ## Captures d’écran From 237879b38ee1a227e54d5e47adcc61f346de61dd Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 1 Sep 2023 08:20:49 +0200 Subject: [PATCH 55/67] Fix php conf & image permissions (#238) * Transfer to normal php conf * Transfer to normal php conf * Add running directory * Rename php_fpm.conf to php-fpm.conf * bump version * Auto-update README * bump minimum YNH version * switch back to extra_php * Set proper group owner for php Using new helper https://github.com/YunoHost/yunohost/commit/65d25710725b06d281630644b80d8d01dfba1bde * Set proper group owner for php * manifest: fix yunohost version requirement typo --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin --- conf/extra_php-fpm.conf | 3 --- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index c979f58d..f7960328 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -2,6 +2,3 @@ php_admin_value[upload_max_filesize] = 100M php_admin_value[post_max_size] = 100M - -; Group should not be pixelfed, unless image (folder) access rights are not working -group = www-data diff --git a/manifest.toml b/manifest.toml index ed354ec7..534438b0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2.4" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index 38a3213e..8519654c 100644 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data ynh_add_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index da9f593e..891ab379 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,7 +133,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data #================================================= # NGINX CONFIGURATION From ad6b5884e0a5e15d92bba429cbc93ccc5beb34ff Mon Sep 17 00:00:00 2001 From: bg-wa Date: Mon, 11 Sep 2023 09:18:34 -0700 Subject: [PATCH 56/67] Upgrade to composer 2 (#241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Testing : fix php/pictures permissions (#239) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix mail sendmail (#230) * Testing : patch install permissions (#226) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Update .env use sendmail for default mail sending, should work out of the box for fresh installs * patch source prevent privilege escalation * patching source prevent privilege escalation * patching source prevent privilege escalation * Update manifest.toml Enable authentication on the mail stack for the system user * Update .env authentication on the mail stack with app system user * Fix old email configs --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * remove full_domain * Add manual email verification doc (#233) * Add manual email verification doc * email verification doc (fr) * fix doc * 0.11.9 (#236) * v0.11.9 * Auto-update README --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Fix php conf & image permissions (#238) * Transfer to normal php conf * Transfer to normal php conf * Add running directory * Rename php_fpm.conf to php-fpm.conf * bump version * Auto-update README * bump minimum YNH version * switch back to extra_php * Set proper group owner for php Using new helper https://github.com/YunoHost/yunohost/commit/65d25710725b06d281630644b80d8d01dfba1bde * Set proper group owner for php * manifest: fix yunohost version requirement typo --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: themancalledjakob Co-authored-by: Alexandre Aubin * Upgrade to composer 2 --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: themancalledjakob Co-authored-by: Alexandre Aubin --- scripts/upgrade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 891ab379..76ef052e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,17 +56,17 @@ fi if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.9.0~ynh3..." - + ynh_script_progression --message="Configuring a systemd service..." ynh_add_systemd_config --service="${app}-horizon" --template=horizon.conf fi if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh2..." - + ynh_script_progression --message="Stopping and removing the systemd service..." ynh_remove_systemd_config --service="${app}-horizon" - + ynh_script_progression --message="Creating log file..." mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" @@ -74,20 +74,20 @@ if dpkg --compare-versions "0.10.9~ynh2" gt "$(ynh_read_manifest --manifest="/et ynh_script_progression --message="Configuring a supervisor service..." ynh_add_supervisor_config --service="${app}-horizon" --template=horizon.conf - + ynh_script_progression --message="Starting a supervisor service..." ynh_supervisor_action --service_name="${app}-horizon" --action="start" --log_path="systemd" --line_match="success: ${app}-horizon" fi if dpkg --compare-versions "0.10.9~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_script_progression --message="Ensuring upgrade compatibility to 0.10.9~ynh3..." - + if ynh_exec_warn_less yunohost service status ${app}-horizon >/dev/null then ynh_script_progression --message="Removing ${app}-horizon service..." yunohost service remove "${app}-horizon" fi - + ynh_script_progression --message="Integrating service in YunoHost..." yunohost service add "supervisor" --description="Supervisor daemon for $app" --log="/var/log/$app/${app}-horizon.log" fi @@ -150,7 +150,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Updating composer..." --weight=1 -ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update" +ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="self-update --2" ynh_exec_warn_less ynh_composer_exec --workdir="$install_dir" --commands="update" From 2feb699384b4a159d0e19b3f20aef0e5c870819e Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 6 Nov 2023 08:27:49 +0100 Subject: [PATCH 57/67] fix logrotate user --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8519654c..9b385c3b 100644 --- a/scripts/install +++ b/scripts/install @@ -142,7 +142,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfile(s) ynh_use_logrotate --logfile="/var/log/$app/${app}-horizon.log" -ynh_use_logrotate --logfile="/var/www/$app/storage/logs/laravel.log" +ynh_use_logrotate --logfile="/var/www/$app/storage/logs/laravel.log" --specific_user=$app/www-data #================================================= # PATCH PERMISSIONS for v0.11.5 versions and higher From f386cd6c4b947e305f53835199ea0ef5a9257b53 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Nov 2023 07:27:53 +0000 Subject: [PATCH 58/67] 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 5cde47bb..abeba1da 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ It is also possible to import your data from Instagram. * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 256b2bac..87e9f601 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,7 +38,7 @@ Il est également possible d'importer ses données depuis Instagram. * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 0537d7e6bd9955e56a6f242e94d0b2a9a8edda77 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 6 Nov 2023 08:28:26 +0100 Subject: [PATCH 59/67] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 534438b0..9b4ba724 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.9~ynh2" +version = "0.11.9~ynh3" maintainers = ["yalh76", "Lapineige"] From ba91786aed70e40efd766c292ae43f33c16bcb47 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Nov 2023 07:28:29 +0000 Subject: [PATCH 60/67] 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 abeba1da..bd5ebc7a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.9~ynh2 +**Shipped version:** 0.11.9~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 87e9f601..225e9237 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.9~ynh2 +**Version incluse :** 0.11.9~ynh3 ## Captures d’écran From 8951c8a5d26da012ba7c04590295f2bfb6b86ac1 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 10 Feb 2024 15:47:50 +0100 Subject: [PATCH 61/67] test from current version --- tests.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.toml b/tests.toml index 3e9755f2..08b1748f 100644 --- a/tests.toml +++ b/tests.toml @@ -6,4 +6,5 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- + test_upgrade_from.a5ced524d5026bd15daf5f7647395212ae3c09b8.name = "Upgrade from 0.11.9" test_upgrade_from.7a4833633f76d050296c783e565f8cdfc913c75a.name = "Upgrade from 0.11.2" From 3bc34f81c8bb6202561e70032bb8d3f5fc9ad289 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 10 Feb 2024 15:49:06 +0100 Subject: [PATCH 62/67] Update v0.11.11 (#246) * Update v0.11.11 * Update tests_upgrade from v0.11.9 --------- Co-authored-by: lapineige --- manifest.toml | 6 +++--- tests.toml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 9b4ba724..b0975d3b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.9~ynh3" +version = "0.11.11~ynh1" maintainers = ["yalh76", "Lapineige"] @@ -36,8 +36,8 @@ ram.runtime = "100M" [resources] [resources.sources.main] - url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.9.tar.gz" - sha256 = "a56629a8094749911927a4a02b69fa3446f1a089315ff9b2ccfd85a5e26bd140" + url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.11.tar.gz" + sha256 = "01bb56f0b2f888788d9cbf96809ce9f38b09be8e925036c7df8eb0236d1c3be6" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/tests.toml b/tests.toml index 08b1748f..72cf2095 100644 --- a/tests.toml +++ b/tests.toml @@ -6,5 +6,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.a5ced524d5026bd15daf5f7647395212ae3c09b8.name = "Upgrade from 0.11.9" - test_upgrade_from.7a4833633f76d050296c783e565f8cdfc913c75a.name = "Upgrade from 0.11.2" + test_upgrade_from.aa1c6c9.name = "Upgrade from v0.11.9" From 4cc85d680465e80afe8ec9031df2efc62739cf3a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 10 Feb 2024 14:49:11 +0000 Subject: [PATCH 63/67] 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 bd5ebc7a..0cf2cf1f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.9~ynh3 +**Shipped version:** 0.11.11~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 225e9237..7877d13e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.9~ynh3 +**Version incluse :** 0.11.11~ynh1 ## Captures d’écran From 6efad0c59c2afe043a4c77d8217b7dd860b4c079 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 10 Feb 2024 15:58:20 +0100 Subject: [PATCH 64/67] Add video P2P https://github.com/pixelfed/pixelfed/pull/4713 --- conf/.env | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/.env b/conf/.env index 615ba19d..0acef299 100644 --- a/conf/.env +++ b/conf/.env @@ -141,3 +141,8 @@ SESSION_DRIVER=redis ## Passport #PASSPORT_PRIVATE_KEY= #PASSPORT_PUBLIC_KEY= + +## Video P2P +MEDIA_HLS_ENABLED=true +MEDIA_HLS_P2P=true +MEDIA_HLS_BITRATE=2000 # average quality and limited storage use From b740f7b4ca0671ad032adecaedbb6ee70caa6a31 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 16 Feb 2024 17:10:42 +0100 Subject: [PATCH 65/67] Upgrade to v0.11.12 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b0975d3b..80c17e0c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.11~ynh1" +version = "0.11.12~ynh1" maintainers = ["yalh76", "Lapineige"] @@ -36,8 +36,8 @@ ram.runtime = "100M" [resources] [resources.sources.main] - url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.11.tar.gz" - sha256 = "01bb56f0b2f888788d9cbf96809ce9f38b09be8e925036c7df8eb0236d1c3be6" + url = "https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.12.tar.gz" + sha256 = "4c147a94762af5737c2e408cfe555a29dd3074a7915079931445136b8acadcb0" autoupdate.strategy = "latest_github_tag" [resources.system_user] From e2c2f3be2fb84e4b58c7b072cfed8bcf8acef68b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 16 Feb 2024 16:10:47 +0000 Subject: [PATCH 66/67] Auto-update README --- README.md | 6 +++--- README_fr.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0cf2cf1f..6deb2df7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.11~ynh1 +**Shipped version:** 0.11.12~ynh1 ## Screenshots @@ -52,4 +52,4 @@ or sudo yunohost app upgrade pixelfed -u https://github.com/YunoHost-Apps/pixelfed_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 7877d13e..3f102277 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.11~ynh1 +**Version incluse :** 0.11.12~ynh1 ## Captures d’écran From d5eab05ab8f67cb5493c62e3ac91ddd58932b88d Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 16 Feb 2024 17:26:53 +0100 Subject: [PATCH 67/67] Remove the upgrade warning by default --- conf/.env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/.env b/conf/.env index 0acef299..13d68f92 100644 --- a/conf/.env +++ b/conf/.env @@ -146,3 +146,7 @@ SESSION_DRIVER=redis MEDIA_HLS_ENABLED=true MEDIA_HLS_P2P=true MEDIA_HLS_BITRATE=2000 # average quality and limited storage use + +## Remove the "upgrade needed" warning +# comment this if you (as an admin user) want to have a permanent reminder of an available update (upstream, not necessarily in Yunohost !) +INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING=true