From 1d49bea2f78099acfc4375307f26c66c12342d80 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 09:52:37 +0100 Subject: [PATCH 01/25] Update config.json --- conf/config.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/conf/config.json b/conf/config.json index 3512291..8c835b8 100644 --- a/conf/config.json +++ b/conf/config.json @@ -17,5 +17,16 @@ }, "web": { "host": "127.0.0.1:__PORT__" + }, + "panel": { + "email": { + "provider": "smtp", + "from": "pufferpanel@__DOMAIN__", + "host": "localhost", + "username": "__APP__", + "password": "__MAIL_PWD__", + "provider": "", + "key": "" + } } } From 9e0727f4606a475d76f3392b5fd7ca180df3c6e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 09:53:22 +0100 Subject: [PATCH 02/25] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 2efb4a1..dbcf2a2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,6 +43,7 @@ ram.runtime = "50M" [resources] [resources.system_user] + allow_email = true [resources.install_dir] From 5783fc2152e8ca0396829ce493fd24091c551bc1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 09:56:46 +0100 Subject: [PATCH 03/25] fix --- conf/config.json | 4 ++-- manifest.toml | 5 ++++- scripts/backup | 7 +++++++ scripts/restore | 7 +++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/conf/config.json b/conf/config.json index 8c835b8..ddf9fea 100644 --- a/conf/config.json +++ b/conf/config.json @@ -2,8 +2,8 @@ "logs": "/var/log/__APP__", "panel": { "database": { - "dialect": "sqlite3", - "url": "file:/var/lib/__APP__/database.db?cache=shared" + "dialect": "postgresql", + "url": "user=__DB_USER__ password=__DB_PWD__ dbname=__DB_NAME__ port=9920 sslmode=disable" }, "web": { "files": "__INSTALL_DIR__" diff --git a/manifest.toml b/manifest.toml index dbcf2a2..2179dc4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -54,9 +54,12 @@ ram.runtime = "50M" main.auth_header = false [resources.apt] - packages = "sqlite3" + packages = "postgresql" extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main" extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey" extras.pufferpanel.packages = "pufferpanel" + + [resources.database] + type = "postgresql" \ No newline at end of file diff --git a/scripts/backup b/scripts/backup index 2356740..8d213cc 100644 --- a/scripts/backup +++ b/scripts/backup @@ -34,6 +34,13 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/$app/" ynh_backup --src_path="/var/lib/$app/" +#================================================= +# BACKUP THE POSTGRESQL DATABASE +#================================================= +ynh_print_info --message="Backing up the PostgreSQL database..." + +ynh_psql_dump_db --database="$db_name" > db.sql + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index db8e3cc..39470e1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -21,6 +21,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE POSTGRESQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6 + +ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name + #================================================= # RESTORE VARIOUS FILES #================================================= From 98ef636c903a360048f4a2e8d69c774a10f951d2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 09:58:45 +0100 Subject: [PATCH 04/25] fix --- conf/config.json | 2 +- scripts/_common.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index ddf9fea..4c80dd2 100644 --- a/conf/config.json +++ b/conf/config.json @@ -21,7 +21,7 @@ "panel": { "email": { "provider": "smtp", - "from": "pufferpanel@__DOMAIN__", + "from": "pufferpanel@__MAIN_DOMAIN__", "host": "localhost", "username": "__APP__", "password": "__MAIL_PWD__", diff --git a/scripts/_common.sh b/scripts/_common.sh index 944a65e..0f1a117 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,8 @@ # COMMON VARIABLES #================================================= +main_domain=$(cat /etc/yunohost/current_host) + #================================================= # PERSONAL HELPERS #================================================= From d5a9c450201729383d90969e9e3daea985aa4268 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 10:01:37 +0100 Subject: [PATCH 05/25] cleaning --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index b8bed62..901a473 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -PufferPanel is an open source game server management panel designed to be easy to use and easy to install. PufferPanel supports Minecraft, Forge, Spigot, Sponge, Source Dedicated Servers, BungeeCord, PocketMine, Forge, and much more. \ No newline at end of file +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 816ffab..f3f411d 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -PufferPanel est un panneau de gestion de serveur de jeu open source conçu pour être facile à utiliser et à installer. PufferPanel prend en charge Minecraft, Forge, Spigot, Sponge, Source Dedicated Servers, BungeeCord, PocketMine, Forge et bien plus encore. \ No newline at end of file +PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs. From 1c05366a26ac2460d861cf27132c10ae379c833e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Oct 2023 10:03:34 +0100 Subject: [PATCH 06/25] cleaning --- conf/config.json | 2 +- scripts/install | 2 +- scripts/upgrade | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 4c80dd2..1b77585 100644 --- a/conf/config.json +++ b/conf/config.json @@ -21,7 +21,7 @@ "panel": { "email": { "provider": "smtp", - "from": "pufferpanel@__MAIN_DOMAIN__", + "from": "__EMAIL__", "host": "localhost", "username": "__APP__", "password": "__MAIL_PWD__", diff --git a/scripts/install b/scripts/install index 7e0c2ca..3ef5ba9 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -mail=$(ynh_user_get_info --username=$admin --key=mail) +email=$(ynh_user_get_info --username=$admin --key=mail) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS diff --git a/scripts/upgrade b/scripts/upgrade index b1618c3..41f4066 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,6 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers +#================================================= +# RETRIEVE ARGUMENTS FROM THE MANIFEST +#================================================= + +email=$(ynh_user_get_info --username=$admin --key=mail) + #================================================= # CHECK VERSION #================================================= From 1d05d8ff10a9af5e56e15881e592474b20531072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 Nov 2023 20:08:44 +0100 Subject: [PATCH 07/25] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3ef5ba9..461ae0a 100644 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,7 @@ ynh_add_config --template="config.json" --destination="/etc/$app/config.json" chmod 650 "/etc/$app/config.json" chown $app:$app "/etc/$app/config.json" -pufferpanel user add --admin --email=$mail --name=$admin --password=$password +pufferpanel user add --admin --email=$email --name=$admin --password=$password #================================================= # GENERIC FINALIZATION From cd607a40142991883df9e639d8f62e7c395cda63 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 Nov 2023 19:08:49 +0000 Subject: [PATCH 08/25] Auto-update README --- README.md | 6 ++++-- README_fr.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 995f1eb..28e2bc0 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -PufferPanel is an open source game server management panel designed to be easy to use and easy to install. PufferPanel supports Minecraft, Forge, Spigot, Sponge, Source Dedicated Servers, BungeeCord, PocketMine, Forge, and much more. +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. -**Shipped version:** 2.6.9~ynh1 + +**Shipped version:** 2.6.9~ynh2 ## Screenshots @@ -29,6 +30,7 @@ PufferPanel is an open source game server management panel designed to be easy t * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 2a4222b..532e7b5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,9 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -PufferPanel est un panneau de gestion de serveur de jeu open source conçu pour être facile à utiliser et à installer. PufferPanel prend en charge Minecraft, Forge, Spigot, Sponge, Source Dedicated Servers, BungeeCord, PocketMine, Forge et bien plus encore. +PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs. -**Version incluse :** 2.6.9~ynh1 + +**Version incluse :** 2.6.9~ynh2 ## Captures d’écran @@ -29,6 +30,7 @@ PufferPanel est un panneau de gestion de serveur de jeu open source conçu pour * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 1bc3c1326101954ff6a61b288aea31a8cc2fbcad Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 Nov 2023 19:09:24 +0000 Subject: [PATCH 09/25] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 6c8319a..28e2bc0 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + **Shipped version:** 2.6.9~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0a3bc61..532e7b5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,6 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs. + **Version incluse :** 2.6.9~ynh2 ## Captures d’écran From 94f627e9631f89fd626da4411adf803f631884cd Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 03:24:19 +0100 Subject: [PATCH 10/25] moving the data folder to the standard ynh one --- conf/config.json | 8 +++---- doc/ADMIN.md | 1 + manifest.toml | 58 ++++++++++++++++++++++++++---------------------- scripts/upgrade | 12 ++++++++++ 4 files changed, 49 insertions(+), 30 deletions(-) create mode 100644 doc/ADMIN.md diff --git a/conf/config.json b/conf/config.json index 1b77585..2acd288 100644 --- a/conf/config.json +++ b/conf/config.json @@ -11,12 +11,12 @@ }, "daemon": { "data": { - "cache": "/var/lib/__APP__/cache", - "servers": "/var/lib/__APP__/servers" + "cache": "__DATA_DIR__/cache", + "servers": "__DATA_DIR__/servers" } }, "web": { - "host": "127.0.0.1:__PORT__" + "host": "127.0.0.1:__PORT__" }, "panel": { "email": { @@ -29,4 +29,4 @@ "key": "" } } -} +} \ No newline at end of file diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..af60ee3 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1 @@ +Game server files are stored in `__DATA_DIR__` diff --git a/manifest.toml b/manifest.toml index 2179dc4..aa58c70 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,12 +9,14 @@ version = "2.6.9~ynh2" maintainers = [""] + [upstream] license = "Apache-2.0" website = "https://www.pufferpanel.com/" admindoc = "https://docs.pufferpanel.com/en/latest/" code = "https://github.com/PufferPanel/PufferPanel" + [integration] yunohost = ">= 11.2" architectures = "all" @@ -25,41 +27,45 @@ disk = "50M" ram.build = "350M" ram.runtime = "50M" + [install] - [install.domain] - type = "domain" +[install.domain] +type = "domain" - [install.init_main_permission] - type = "group" - default = "visitors" +[install.init_main_permission] +type = "group" +default = "visitors" - [install.admin] - help.en = "Admin username minimum length is five characters." - help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères." - type = "user" +[install.admin] +help.en = "Admin username minimum length is five characters." +help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères." +type = "user" + +[install.password] +type = "password" - [install.password] - type = "password" [resources] - [resources.system_user] - allow_email = true +[resources.system_user] +allow_email = true - [resources.install_dir] +[resources.install_dir] - [resources.ports] +[resources.data_dir] +subdirs = ["binaries", "cache", "servers"] - [resources.permissions] - main.url = "/" - main.auth_header = false +[resources.ports] - [resources.apt] - packages = "postgresql" +[resources.permissions] +main.url = "/" +main.auth_header = false - extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main" - extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey" - extras.pufferpanel.packages = "pufferpanel" +[resources.apt] +packages = "postgresql" - [resources.database] - type = "postgresql" - \ No newline at end of file +extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main" +extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey" +extras.pufferpanel.packages = "pufferpanel" + +[resources.database] +type = "postgresql" diff --git a/scripts/upgrade b/scripts/upgrade index 41f4066..398e3a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,6 +30,18 @@ ynh_script_progression --message="Stopping a systemd service..." ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." + +# moving the data folder to the standard ynh one +if [ -d "/var/lib/$app" ]; then + ynh_print_info --message="Moving the data folder from '/var/lib/$app' to '$data_dir'" + mv "/var/lib/$app" "$data_dir" + rm -r "/var/lib/$app" +fi + #================================================= # UPGRADE DEPENDENCIES #================================================= From acc8f9d1bf13919f0c0d11cd0b1adf128f6cd52d Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 03:56:05 +0100 Subject: [PATCH 11/25] restore indentation --- manifest.toml | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/manifest.toml b/manifest.toml index aa58c70..a79a9a8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Système de gestion de serveur de jeu" version = "2.6.9~ynh2" -maintainers = [""] +maintainers = [ "" ] [upstream] @@ -29,43 +29,43 @@ ram.runtime = "50M" [install] -[install.domain] -type = "domain" + [install.domain] + type = "domain" -[install.init_main_permission] -type = "group" -default = "visitors" + [install.init_main_permission] + type = "group" + default = "visitors" -[install.admin] -help.en = "Admin username minimum length is five characters." -help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères." -type = "user" + [install.admin] + help.en = "Admin username minimum length is five characters." + help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères." + type = "user" -[install.password] -type = "password" + [install.password] + type = "password" [resources] -[resources.system_user] -allow_email = true + [resources.system_user] + allow_email = true -[resources.install_dir] + [resources.install_dir] -[resources.data_dir] -subdirs = ["binaries", "cache", "servers"] + [resources.data_dir] + subdirs = [ "binaries", "cache", "servers" ] -[resources.ports] + [resources.ports] -[resources.permissions] -main.url = "/" -main.auth_header = false + [resources.permissions] + main.url = "/" + main.auth_header = false -[resources.apt] -packages = "postgresql" + [resources.apt] + packages = "postgresql" -extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main" -extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey" -extras.pufferpanel.packages = "pufferpanel" + extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main" + extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey" + extras.pufferpanel.packages = "pufferpanel" -[resources.database] -type = "postgresql" + [resources.database] + type = "postgresql" From 5f5745a464c7311b4ace3ba2187b8b8f9d463c4a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 03:57:50 +0100 Subject: [PATCH 12/25] use ynh_secure_remove instead of rm -r --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 398e3a5..02d09b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,7 +39,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." if [ -d "/var/lib/$app" ]; then ynh_print_info --message="Moving the data folder from '/var/lib/$app' to '$data_dir'" mv "/var/lib/$app" "$data_dir" - rm -r "/var/lib/$app" + ynh_secure_remove "/var/lib/$app" fi #================================================= From bb1e26d129fd3d732073bb644ce4d448ca12e084 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:29:46 +0100 Subject: [PATCH 13/25] various fixes --- scripts/change_url | 4 ++-- scripts/install | 16 ++++++++-------- scripts/remove | 4 ++-- scripts/restore | 10 +++++----- scripts/upgrade | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 8c014a5..e84a828 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -33,7 +33,7 @@ ynh_change_url_nginx_config ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Listening for" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 461ae0a..3d7f9b1 100644 --- a/scripts/install +++ b/scripts/install @@ -13,14 +13,14 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -email=$(ynh_user_get_info --username=$admin --key=mail) +email=$(ynh_user_get_info --username="$admin" --key=mail) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= ynh_script_progression --message="Validating installation parameters..." -if [[ $admin < 5 ]]; then +if [[ $admin -lt 5 ]]; then ynh_die --message="Admin username minimum length is 5" fi @@ -30,7 +30,7 @@ fi chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # NGINX CONFIGURATION @@ -40,9 +40,9 @@ ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated NGINX config ynh_add_nginx_config -systemctl enable $app.service --quiet +systemctl enable "$app.service" --quiet -yunohost service add $app --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" +yunohost service add "$app" --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" #================================================= # SPECIFIC SETUP @@ -54,9 +54,9 @@ ynh_script_progression --message="Adding a configuration file..." ynh_add_config --template="config.json" --destination="/etc/$app/config.json" chmod 650 "/etc/$app/config.json" -chown $app:$app "/etc/$app/config.json" +chown "$app:$app" "/etc/$app/config.json" -pufferpanel user add --admin --email=$email --name=$admin --password=$password +pufferpanel user add --admin --email="$email" --name="$admin" --password="$password" #================================================= # GENERIC FINALIZATION @@ -66,7 +66,7 @@ pufferpanel user add --admin --email=$email --name=$admin --password=$password ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Listening for" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 23a0a4c..da0e4a3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,10 +16,10 @@ source /usr/share/yunohost/helpers #================================================= # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null +if ynh_exec_warn_less yunohost service status "$app" >/dev/null then ynh_script_progression --message="Removing $app service integration..." - yunohost service remove $app + yunohost service remove "$app" fi # Remove the dedicated NGINX config diff --git a/scripts/restore b/scripts/restore index 39470e1..3f07df1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,14 +19,14 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6 -ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name +ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" #================================================= # RESTORE VARIOUS FILES @@ -38,9 +38,9 @@ ynh_restore_file --origin_path="/var/lib/$app/" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -systemctl enable $app.service --quiet +systemctl enable "$app.service" --quiet -yunohost service add $app --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" +yunohost service add "$app" --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION @@ -49,7 +49,7 @@ yunohost service add $app --description="Web-based Game Server Management System #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Listening for" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for" ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 41f4066..66f3369 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -email=$(ynh_user_get_info --username=$admin --key=mail) +email=$(ynh_user_get_info --username="$admin" --key=mail) #================================================= # CHECK VERSION @@ -28,7 +28,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= # UPGRADE DEPENDENCIES @@ -36,7 +36,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS @@ -46,9 +46,9 @@ ynh_script_progression --message="Upgrading system configurations related to $ap # Create a dedicated NGINX config ynh_add_nginx_config -systemctl enable $app.service --quiet +systemctl enable "$app.service" --quiet -yunohost service add $app --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" +yunohost service add "$app" --description="Web-based Game Server Management System" --log="/var/log/$app/$app.log" #================================================= # UPDATE A CONFIG FILE @@ -58,14 +58,14 @@ ynh_script_progression --message="Updating a configuration file..." ynh_add_config --template="config.json" --destination="/etc/$app/config.json" chmod 650 "/etc/$app/config.json" -chown $app:$app "/etc/$app/config.json" +chown "$app:$app" "/etc/$app/config.json" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Listening for" +ynh_systemd_action --service_name="$app" --action="start" --log_path="systemd" --line_match="Listening for" #================================================= # END OF SCRIPT From ba21122a17027bae5471943bdf585bbd9e47a33f Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:37:56 +0100 Subject: [PATCH 14/25] fix data dir backup/restore --- scripts/backup | 7 ++++++- scripts/restore | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 8d213cc..b887886 100644 --- a/scripts/backup +++ b/scripts/backup @@ -21,6 +21,12 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" +#================================================= +# BACKUP THE DATA DIR +#================================================= + +ynh_backup --src_path="$data_dir" --is_big + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= @@ -32,7 +38,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_backup --src_path="/etc/$app/" -ynh_backup --src_path="/var/lib/$app/" #================================================= # BACKUP THE POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index 3f07df1..76ac086 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,13 +28,21 @@ ynh_script_progression --message="Restoring the PostgreSQL database..." --weight ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Restoring the data directory..." --weight=1 + +ynh_restore_file --origin_path="$data_dir" --not_mandatory + +chown -R "$app:www-data" "$data_dir" + #================================================= # RESTORE VARIOUS FILES #================================================= ynh_script_progression --message="Restoring various files..." ynh_restore_file --origin_path="/etc/$app/" -ynh_restore_file --origin_path="/var/lib/$app/" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" From 8b279b0f04340ae3042beab038fa811bdba85f26 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:42:44 +0100 Subject: [PATCH 15/25] fix config file --- conf/config.json | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/conf/config.json b/conf/config.json index 2acd288..40194e2 100644 --- a/conf/config.json +++ b/conf/config.json @@ -7,26 +7,23 @@ }, "web": { "files": "__INSTALL_DIR__" - } - }, - "daemon": { - "data": { - "cache": "__DATA_DIR__/cache", - "servers": "__DATA_DIR__/servers" - } - }, - "web": { - "host": "127.0.0.1:__PORT__" - }, - "panel": { + }, "email": { "provider": "smtp", "from": "__EMAIL__", "host": "localhost", "username": "__APP__", "password": "__MAIL_PWD__", - "provider": "", "key": "" } + }, + "daemon": { + "data": { + "cache": "/var/lib/__APP__/cache", + "servers": "/var/lib/__APP__/servers" + } + }, + "web": { + "host": "127.0.0.1:__PORT__" } } \ No newline at end of file From 5817e81619859f281aa1fb1cce383c0ccc0a791a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:47:01 +0100 Subject: [PATCH 16/25] fix pgsql port --- conf/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.json b/conf/config.json index 40194e2..8e73438 100644 --- a/conf/config.json +++ b/conf/config.json @@ -3,7 +3,7 @@ "panel": { "database": { "dialect": "postgresql", - "url": "user=__DB_USER__ password=__DB_PWD__ dbname=__DB_NAME__ port=9920 sslmode=disable" + "url": "user=__DB_USER__ password=__DB_PWD__ dbname=__DB_NAME__ port=5432 sslmode=disable" }, "web": { "files": "__INSTALL_DIR__" From 2fd9030718ef4a99101aee523e066bae6c841737 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:48:39 +0100 Subject: [PATCH 17/25] remove irrelevant thing --- conf/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 8e73438..1a2b6f4 100644 --- a/conf/config.json +++ b/conf/config.json @@ -13,8 +13,7 @@ "from": "__EMAIL__", "host": "localhost", "username": "__APP__", - "password": "__MAIL_PWD__", - "key": "" + "password": "__MAIL_PWD__" } }, "daemon": { From 006ecf3e55b0db28876ccff324bfee99a8424a95 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:58:37 +0100 Subject: [PATCH 18/25] fix lenght check --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3d7f9b1..9a2cce8 100644 --- a/scripts/install +++ b/scripts/install @@ -20,7 +20,7 @@ email=$(ynh_user_get_info --username="$admin" --key=mail) #================================================= ynh_script_progression --message="Validating installation parameters..." -if [[ $admin -lt 5 ]]; then +if [[ ${#admin} -lt 5 ]]; then ynh_die --message="Admin username minimum length is 5" fi From ad42de59cb9d6a8d9848b1792d24433396ecfb15 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 05:59:54 +0100 Subject: [PATCH 19/25] add schema --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index a79a9a8..d60889b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "pufferpanel" From 29f39789d60de836b9d5e4eea820b4212c84c395 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 06:13:39 +0100 Subject: [PATCH 20/25] fix data folder --- conf/config.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index 1a2b6f4..806eaba 100644 --- a/conf/config.json +++ b/conf/config.json @@ -18,8 +18,9 @@ }, "daemon": { "data": { - "cache": "/var/lib/__APP__/cache", - "servers": "/var/lib/__APP__/servers" + "binaries": "__DATA_DIR__/binaries", + "cache": "__DATA_DIR__/cache", + "servers": "__DATA_DIR__/servers" } }, "web": { From e07fa229e870a27f56eae80968e23eb42a0101aa Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 06:17:27 +0100 Subject: [PATCH 21/25] no need to remove after a mv --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5d138c7..53fc631 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,7 +39,6 @@ ynh_script_progression --message="Ensuring downward compatibility..." if [ -d "/var/lib/$app" ]; then ynh_print_info --message="Moving the data folder from '/var/lib/$app' to '$data_dir'" mv "/var/lib/$app" "$data_dir" - ynh_secure_remove "/var/lib/$app" fi #================================================= From 08f104d150a19f81f42d56a837d2c743503cc202 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 22 Jan 2024 06:24:29 +0100 Subject: [PATCH 22/25] ynh_secure_remove "/etc/$app/" --- scripts/remove | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/remove b/scripts/remove index da0e4a3..17e1e31 100644 --- a/scripts/remove +++ b/scripts/remove @@ -25,6 +25,8 @@ fi # Remove the dedicated NGINX config ynh_remove_nginx_config +ynh_secure_remove "/etc/$app/" + #================================================= # GENERIC FINALIZATION #================================================= From efa98e71b099a1e543c8bf774ef7cd26cff607c9 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 1 May 2024 02:02:23 +0200 Subject: [PATCH 23/25] remove the empty string inside 'maintainers' --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d60889b..5ac6848 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Système de gestion de serveur de jeu" version = "2.6.9~ynh2" -maintainers = [ "" ] +maintainers = [] [upstream] From eedef4989eed8eab74c37612994bd7f0232ddb2c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 1 May 2024 00:02:30 +0000 Subject: [PATCH 24/25] Auto-update READMEs --- ALL_README.md | 7 +++++++ README.md | 24 ++++++++++++------------ README_eu.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 30 ++++++++++++++--------------- README_gl.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 178 insertions(+), 27 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# 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) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 28e2bc0..70f77f0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install PufferPanel with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install PufferPanel 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 PufferPanel 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 @@ -27,19 +27,19 @@ PufferPanel is a web-based Game Server Management System created by players for ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- 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/pufferpanel_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/pufferpanel_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/pufferpanel_ynh/tree/testing --debug or sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..f88fc4b --- /dev/null +++ b/README_eu.md @@ -0,0 +1,48 @@ + + +# PufferPanel YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/pufferpanel.svg)](https://dash.yunohost.org/appci/app/pufferpanel) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/pufferpanel.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/pufferpanel.maintain.svg) + +[![Instalatu PufferPanel YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek PufferPanel YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + + +**Paketatutako bertsioa:** 2.6.9~ynh2 + +## Pantaila-argazkiak + +![PufferPanel(r)en pantaila-argazkia](./doc/screenshots/serverlist.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +edo +sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 532e7b5..c568eaa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # PufferPanel pour YunoHost @@ -9,17 +9,17 @@ It shall NOT be edited by hand. [![Installer PufferPanel avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer PufferPanel 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 PufferPanel 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 PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs. -**Version incluse :** 2.6.9~ynh2 +**Version incluse :** 2.6.9~ynh2 ## Captures d’écran @@ -27,22 +27,22 @@ PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/pufferpanel_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/pufferpanel_ynh/tree/testing --debug ou sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_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 :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..433ffb9 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,48 @@ + + +# PufferPanel para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/pufferpanel.svg)](https://dash.yunohost.org/appci/app/pufferpanel) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/pufferpanel.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/pufferpanel.maintain.svg) + +[![Instalar PufferPanel con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar PufferPanel 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 + +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + + +**Versión proporcionada:** 2.6.9~ynh2 + +## Capturas de pantalla + +![Captura de pantalla de PufferPanel](./doc/screenshots/serverlist.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- 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/pufferpanel_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +ou +sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..45fa71a --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,48 @@ + + +# YunoHost 的 PufferPanel + +[![集成程度](https://dash.yunohost.org/integration/pufferpanel.svg)](https://dash.yunohost.org/appci/app/pufferpanel) ![工作状态](https://ci-apps.yunohost.org/ci/badges/pufferpanel.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/pufferpanel.maintain.svg) + +[![使用 YunoHost 安装 PufferPanel](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 PufferPanel。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + + +**分发版本：** 2.6.9~ynh2 + +## 截图 + +![PufferPanel 的截图](./doc/screenshots/serverlist.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +或 +sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 939a7d25556e23842d8a748f87660b71ac035c28 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 May 2024 19:01:34 +0000 Subject: [PATCH 25/25] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 1 + README_gl.md | 1 + README_zh_Hans.md | 2 +- 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee el README en español](README_es.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_es.md b/README_es.md new file mode 100644 index 0000000..1bc00bd --- /dev/null +++ b/README_es.md @@ -0,0 +1,48 @@ + + +# PufferPanel para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/pufferpanel.svg)](https://dash.yunohost.org/appci/app/pufferpanel) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/pufferpanel.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/pufferpanel.maintain.svg) + +[![Instalar PufferPanel con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pufferpanel) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarPufferPanel rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + + +**Versión actual:** 2.6.9~ynh2 + +## Capturas + +![Captura de PufferPanel](./doc/screenshots/serverlist.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +o +sudo yunohost app upgrade pufferpanel -u https://github.com/YunoHost-Apps/pufferpanel_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_fr.md b/README_fr.md index 8f47768..c568eaa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,6 +18,7 @@ Il NE doit PAS être modifié à la main. PufferPanel est un système de gestion de serveur de jeu basé sur le Web créé par des joueurs pour des joueurs. PufferPanel vous permet d'exécuter plusieurs serveurs de jeu différents à partir d'un emplacement central et de donner aux autres utilisateurs leurs propres serveurs ou un accès à vos propres serveurs. + **Version incluse :** 2.6.9~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 5c27814..433ffb9 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,6 +18,7 @@ NON debe editarse manualmente. PufferPanel is a web-based Game Server Management System created by players for players. PufferPanel allows you to run multiple different game servers all from one central location, and give other users their own servers, or access to your own servers. + **Versión proporcionada:** 2.6.9~ynh2 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 45fa71a..18e072d 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 PufferPanel +# YunoHost 上的 PufferPanel [![集成程度](https://dash.yunohost.org/integration/pufferpanel.svg)](https://dash.yunohost.org/appci/app/pufferpanel) ![工作状态](https://ci-apps.yunohost.org/ci/badges/pufferpanel.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/pufferpanel.maintain.svg)