From 965d1f55c27d8d4d90087046526a1349d6bff57c Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Tue, 16 Jan 2024 15:51:15 +0100 Subject: [PATCH 1/9] Fix crash after changing php-fpm settings --- manifest.toml | 2 +- scripts/_common.sh | 2 +- scripts/config | 2 +- tests.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index c7150752..850ed7bd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.8.6~ynh1" +version = "8.8.6~ynh2" maintainers = [""] diff --git a/scripts/_common.sh b/scripts/_common.sh index 1e47ce72..4b31ae9a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # PHP APP SPECIFIC #================================================= - +YNH_PHP_VERSION="8.2" #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/config b/scripts/config index 91c2de75..18863dae 100644 --- a/scripts/config +++ b/scripts/config @@ -15,7 +15,7 @@ ynh_abort_if_errors # RETRIEVE ARGUMENTS #================================================= -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion="$YNH_PHP_VERSION" current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) #================================================= diff --git a/tests.toml b/tests.toml index e6b5a760..81f890d0 100644 --- a/tests.toml +++ b/tests.toml @@ -19,7 +19,7 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.3e89436957f5a6f9b426836d671ffbb133d7db62.name = "Upgrade from 8.6.3~ynh1" + test_upgrade_from.702a58b0a02bd1aba620222eb2c111067506e3fa.name = "Upgrade from 8.6.6~ynh1" [with_postgresql] From f6b0a1b7bd8376077853492504fe97070d6a4744 Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Sat, 20 Jan 2024 18:53:54 +0100 Subject: [PATCH 2/9] Update to 8.8.7 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 850ed7bd..aec8d0c1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.8.6~ynh2" +version = "8.8.7~ynh1" maintainers = [""] @@ -48,12 +48,12 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://framagit.org/hubzilla/core/-/archive/8.8.6/core-8.8.6.tar.gz" - sha256 = "02482d6a1a1a0e90c977afa6336309e282f8cb9a4c271a358f8e442af6adfcb3" + url = "https://framagit.org/hubzilla/core/-/archive/8.8.7/core-8.8.7.tar.gz" + sha256 = "f85782de953e704f5c3305fe747c5504e8a1a52eb4bcfa81e17f0f24ec884a90" [resources.sources.addons] - url = "https://framagit.org/hubzilla/addons/-/archive/8.8.6/addons-8.8.6.tar.gz" - sha256 = "b559cd6a5d18a1ce038d948a1fd76e1e85580c30a6350a01e942b1271118552a" + url = "https://framagit.org/hubzilla/addons/-/archive/8.8.7/addons-8.8.7.tar.gz" + sha256 = "c73efc78af7ba8256aab5221ed97f3f78d55e76c64cd160eb578dd92d0c21ff7" [resources.system_user] From 41384f3a0ba0e0ffaad92021975ae3a1029a729d Mon Sep 17 00:00:00 2001 From: dragondaddy Date: Sat, 3 Feb 2024 20:10:49 +0100 Subject: [PATCH 3/9] psql on 1st install + Keep mysql if already used --- conf/htconfig.sample.php | 2 +- manifest.toml | 20 ++++---------------- scripts/_common.sh | 8 ++++++++ scripts/backup | 6 +++--- scripts/install | 30 +----------------------------- scripts/remove | 8 ++------ scripts/restore | 11 +++-------- scripts/upgrade | 32 -------------------------------- 8 files changed, 22 insertions(+), 95 deletions(-) diff --git a/conf/htconfig.sample.php b/conf/htconfig.sample.php index bcbf4551..ee13b529 100644 --- a/conf/htconfig.sample.php +++ b/conf/htconfig.sample.php @@ -17,7 +17,7 @@ $db_port = 0; // leave 0 for default or set your port $db_user = '__DB_USER__'; $db_pass = '__DB_PWD__'; $db_data = '__DB_NAME__'; -$db_type = __DB_TYPE__; // use 1 for postgres, 0 for mysql +$db_type = 1; // use 1 for postgres, 0 for mysql /* * Notice: Many of the following settings will be available in the admin panel diff --git a/manifest.toml b/manifest.toml index c7150752..c40a2e9b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.8.6~ynh1" +version = "8.8.6~ynh2" maintainers = [""] @@ -38,13 +38,6 @@ ram.runtime = "50M" [install.admin] type = "user" - [install.database] - ask.en = "Choose Hubzilla database" - ask.fr = "Choisissez la database de Hubzilla" - type = "select" - choices = ["mysql", "postgresql"] - default = "mysql" - [resources] [resources.sources] [resources.sources.main] @@ -63,12 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-curl, php8.2-gd, php8.2-mysql, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp" + packages = "postgresql, php8.2-curl, php8.2-gd, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp" - packages_from_raw_bash = """ - if [[ "$database" == "mysql" ]]; then - echo "mariadb-server" - elif [[ "$database" == "postgresql" ]]; then - echo "postgresql postgresql-contrib" - fi - """ + [resources.database] + type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 1e47ce72..6577b56e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,6 +10,14 @@ # PERSONAL HELPERS #================================================= +mysql_remove() { + ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +} + +mysql_restore() { + ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 7b28f279..9e684bd9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -58,11 +58,11 @@ ynh_backup --src_path="/etc/cron.d/$app" # BACKUP THE DATABASE #================================================= -if [ $database = "mysql" ]; then +if mysqlshow | grep -q "^| $db_name "; then # Backup MySQL database ynh_print_info --message="Backup of the MySQL database..." - ynh_mysql_dump_db --database="$db_name" > db.sql -elif [ $database = "postgresql" ]; then + ynh_mysql_dump_db --database="$db_name" > mydb.sql +else # Backup PostgreSQL database ynh_print_info --message="Backup of the PostgreSQL database..." ynh_psql_dump_db --database="$db_name" > db.sql diff --git a/scripts/install b/scripts/install index 6c1beb70..3719d4bf 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ fpm_usage="low" #================================================= ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=database --value=$database ynh_app_setting_set --app=$app --key=email --value=$email ynh_app_setting_set --app=$app --key=upload --value=$upload ynh_app_setting_set --app=$app --key=random_string --value=$random_string @@ -33,29 +32,6 @@ 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 -#================================================= -# CREATE A DATABASE -#================================================= -ynh_script_progression --message="Creating a database..." --weight=2 - -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -db_pwd=$(ynh_string_random --length=30) -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_app_setting_set --app=$app --key=db_user --value=$db_user -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd - -if [ $database == "mysql" ]; then - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ - <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - db_type=0 -elif [ $database == "postgresql" ]; then - ynh_psql_test_if_first_run - ynh_psql_setup_db --db_user=$db_user --db_name=$db_name - db_type=1 -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -101,11 +77,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= ynh_script_progression --message="Provisionning database..." --weight=1 -if [ $database = "mysql" ]; then - ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql -elif [ $database = "postgresql" ]; then - ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql -fi +ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql #================================================= # ADD A CONFIGURATION diff --git a/scripts/remove b/scripts/remove index 0a5ec9eb..715da0e6 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,13 +12,9 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE THE DATABASE #================================================= - -if [ $database = "mysql" ]; then +if mysqlshow | grep -q "^| $db_name "; then ynh_script_progression --message="Removing MySQL database..." --weight=1 - ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -elif [ $database = "postgresql" ]; then - ynh_script_progression --message="Removing PostgreSQL database..." --weight=1 - ynh_psql_remove_db --db_user=$db_user --db_name=$db_name + mysql_remove fi #================================================= diff --git a/scripts/restore b/scripts/restore index 7f1bab2e..68b9d8ce 100644 --- a/scripts/restore +++ b/scripts/restore @@ -23,16 +23,11 @@ chown -R $app:www-data "$install_dir" # RESTORE THE DATABASE #================================================= -if [ $database = "mysql" ]; then +if [ -f mydb.sql ]; then ynh_script_progression --message="Restoring MySQL database..." --weight=1 - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -elif [ $database = "postgresql" ]; then + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./mydb.sql +else 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 ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" fi diff --git a/scripts/upgrade b/scripts/upgrade index ce0f55a5..88297be0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,15 +53,6 @@ if [ -z "${fpm_usage:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# Switch $database to "mysql" or "postgresql" -if [[ $database == "1" ]] 2>/dev/null; then - database="mysql" - ynh_app_setting_set --app=$app --key=database --value=$database -elif [[ $database == "2" ]] 2>/dev/null; then - database="postgresql" - ynh_app_setting_set --app=$app --key=database --value=$database -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -97,29 +88,6 @@ ynh_add_nginx_config # SPECIFIC UPGRADE #================================================= # UPDATE A CONFIG FILE -#================================================= -# ynh_script_progression --message="Updating a configuration file..." --weight=1 - -# if [ $database = "mysql" ]; then -# db_type=0 -# db_name=$(ynh_sanitize_dbid --db_name=$app) -# db_user=$db_name -# db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -# # Change your databases character set and collation -# ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ -# <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" -# elif [ $database = "postgresql" ]; then -# db_type=1 -# db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -# fi - -# ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php" - -# ynh_store_file_checksum --file=$install_dir/.htconfig.php - -# chmod 600 "$install_dir/.htconfig.php" -# chown $app:$app "$install_dir/.htconfig.php" - #================================================= # UPGRADE CRON JOB #================================================= From 0947efd77ef7203dd99cd88c1442f0b552398b72 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 29 Feb 2024 21:38:45 +0100 Subject: [PATCH 4/9] Upgrade to v8.8.8 https://framagit.org/hubzilla/core/-/releases/8.8.8 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 56e797ce..3ed29136 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.8.6~ynh2" +version = "8.8.8~ynh1" maintainers = [""] @@ -48,13 +48,13 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://framagit.org/hubzilla/core/-/archive/8.8.6/core-8.8.6.tar.gz" - sha256 = "02482d6a1a1a0e90c977afa6336309e282f8cb9a4c271a358f8e442af6adfcb3" + url = "https://framagit.org/hubzilla/core/-/archive/8.8.8/core-8.8.8.tar.bz2" + sha256 = "7b1f7f88e57cc899226923d259ce17c125207d6e36f41bd64b161d893b9bd626" autoupdate.strategy = "latest_gitlab_release" [resources.sources.addons] - url = "https://framagit.org/hubzilla/addons/-/archive/8.8.6/addons-8.8.6.tar.gz" - sha256 = "b559cd6a5d18a1ce038d948a1fd76e1e85580c30a6350a01e942b1271118552a" + url = "https://framagit.org/hubzilla/addons/-/archive/8.8.8/addons-8.8.8.tar.bz2" + sha256 = "91e93c199880487ddcc79d0b9f6c0c38ab498ab005a01b3c35752fae15332b91" autoupdate.strategy = "latest_gitlab_tag" autoupdate.upstream = "https://framagit.org/hubzilla/addons" From e5beaaee6f7b5dfcaf3e8b9168ad66940ce0143c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 29 Feb 2024 20:38:53 +0000 Subject: [PATCH 5/9] 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 a30f3126..6492634b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. -**Shipped version:** 8.8.6~ynh2 +**Shipped version:** 8.8.8~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index eb839356..d2d9cfc1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. -**Version incluse :** 8.8.6~ynh2 +**Version incluse :** 8.8.8~ynh1 ## Captures d’écran From 8e9cab8ffe2e0f1967a8b970f0ebad2420f936cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Mar 2024 02:38:33 +0100 Subject: [PATCH 6/9] Upgrade to v9.0.1 https://framagit.org/hubzilla/core/-/releases/9.0.1 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 70235027..096e0462 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hubzilla" description.en = "Decentralized publication platform and social network" description.fr = "Plateforme de publication décentralisée et un réseau social" -version = "8.8.8~ynh1" +version = "9.0.1~ynh1" maintainers = [""] @@ -41,13 +41,13 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.main] - url = "https://framagit.org/hubzilla/core/-/archive/8.8.8/core-8.8.8.tar.bz2" - sha256 = "7b1f7f88e57cc899226923d259ce17c125207d6e36f41bd64b161d893b9bd626" + url = "https://framagit.org/hubzilla/core/-/archive/9.0.1/core-9.0.1.tar.bz2" + sha256 = "e0d3ef4f942058bf6a0784bac70b0a072e95275514953ba5984e4b1be25a2974" autoupdate.strategy = "latest_gitlab_release" [resources.sources.addons] - url = "https://framagit.org/hubzilla/addons/-/archive/8.8.8/addons-8.8.8.tar.bz2" - sha256 = "91e93c199880487ddcc79d0b9f6c0c38ab498ab005a01b3c35752fae15332b91" + url = "https://framagit.org/hubzilla/addons/-/archive/9.0.1/addons-9.0.1.tar.bz2" + sha256 = "095770188e637ac4faf38fdca8dca786acf59e0bc1a3f7c09f0d5320dbff1a9f" autoupdate.strategy = "latest_gitlab_tag" autoupdate.upstream = "https://framagit.org/hubzilla/addons" From fa673954105f2d7a71d0831659784eafa737b0e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Mar 2024 01:38:40 +0000 Subject: [PATCH 7/9] Auto-update READMEs --- ALL_README.md | 4 ++++ README.md | 26 +++++++++++++------------- README_fr.md | 28 ++++++++++++++-------------- 3 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 ALL_README.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 00000000..d6e8f9c4 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,4 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) diff --git a/README.md b/README.md index 6492634b..a38cf159 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,17 +9,17 @@ It shall NOT be edited by hand. [![Install Hubzilla with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hubzilla) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install Hubzilla quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Hubzilla quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. -**Shipped version:** 8.8.8~ynh1 +**Shipped version:** 9.0.1~ynh1 ## Screenshots @@ -27,21 +27,21 @@ Hubzilla is a social networking platform built with control of your privacy at c ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug or sudo yunohost app upgrade hubzilla -u https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index d2d9cfc1..0aa9b270 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Hubzilla pour YunoHost @@ -9,17 +9,17 @@ It shall NOT be edited by hand. [![Installer Hubzilla avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hubzilla) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Hubzilla rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Hubzilla rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votre vie privée au centre de la scène. Vos communications en ligne peuvent être aussi publiques que vous le souhaitez ou aussi privées que vous le souhaitez. Conversations privées, photos privées, vidéos privées. Votre média n'est pas caché derrière une URL obscure qui peut être devinée, il est protégé par une authentification interdomaine de pointe. -**Version incluse :** 8.8.8~ynh1 +**Version incluse :** 9.0.1~ynh1 ## Captures d’écran @@ -27,21 +27,21 @@ Hubzilla est une plate-forme de réseau social conçue avec le contrôle de votr ## Documentations et ressources -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug ou sudo yunohost app upgrade hubzilla -u https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From 2a26c55d7bd547121735e5b2dd37ed770b42cbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:40:02 +0200 Subject: [PATCH 8/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 096e0462..f0b44653 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,7 +59,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "postgresql, php8.2-curl, php8.2-gd, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp" + packages = "postgresql, php8.2-curl, php8.2-gd, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp, php8.2-intl" [resources.database] type = "postgresql" From 1a711241d0b293f252c4da05ee2c29ff22ec3548 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 9 Apr 2024 16:40:28 +0000 Subject: [PATCH 9/9] Auto-update READMEs --- ALL_README.md | 2 ++ README.md | 2 +- README_eu.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_gl.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md index d6e8f9c4..77b7509f 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,4 +1,6 @@ # All available README files by language - [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index a38cf159..89ea3175 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Hubzilla with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hubzilla) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Hubzilla quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 00000000..fbff75b4 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,47 @@ + + +# Hubzilla YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/hubzilla.svg)](https://dash.yunohost.org/appci/app/hubzilla) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/hubzilla.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/hubzilla.maintain.svg) + +[![Instalatu Hubzilla YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hubzilla) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Hubzilla YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. + + +**Paketatutako bertsioa:** 9.0.1~ynh1 + +## Pantaila-argazkiak + +![Hubzilla(r)en pantaila-argazkia](./doc/screenshots/hubzilla-1.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug +edo +sudo yunohost app upgrade hubzilla -u https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 00000000..384d042c --- /dev/null +++ b/README_gl.md @@ -0,0 +1,47 @@ + + +# Hubzilla para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/hubzilla.svg)](https://dash.yunohost.org/appci/app/hubzilla) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/hubzilla.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/hubzilla.maintain.svg) + +[![Instalar Hubzilla con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hubzilla) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Hubzilla de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Hubzilla is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. + + +**Versión proporcionada:** 9.0.1~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de Hubzilla](./doc/screenshots/hubzilla-1.png) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug +ou +sudo yunohost app upgrade hubzilla -u https://github.com/YunoHost-Apps/hubzilla_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:**