1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/noalyss_ynh.git synced 2024-09-03 19:46:20 +02:00

Merge pull request #33 from YunoHost-Apps/testing

Testing
This commit is contained in:
Éric Gaspar 2022-05-11 08:04:49 +02:00 committed by GitHub
commit a3f5df7f63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 22 additions and 69 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Noalyss est un serveur de comptabilité destiné à être hébergé sur Internet afin de contenir la comptabilité dun nombre illimité de sociétés et dutilisateurs ne se connaissant pas. Chaque société a ses propres dossiers comptables , ses propres utilisateurs, et ne peut pas interférer avec la comptabilité des autres, à moins dy être expressément autorisé.
**Shipped version:** 9.0.2.5~ynh1
**Shipped version:** 9.0.2.5~ynh2
**Demo:** http://demo.noalyss.eu/index.php

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Noalyss est un serveur de comptabilité destiné à être hébergé sur Internet afin de contenir la comptabilité dun nombre illimité de sociétés et dutilisateurs ne se connaissant pas. Chaque société a ses propres dossiers comptables , ses propres utilisateurs, et ne peut pas interférer avec la comptabilité des autres, à moins dy être expressément autorisé.
**Version incluse :** 9.0.2.5~ynh1
**Version incluse :** 9.0.2.5~ynh2
**Démo :** http://demo.noalyss.eu/index.php

View file

@ -14,6 +14,7 @@
setup_private=1
setup_public=1
upgrade=1
upgrade=1 from_commit=620065d7dcf5584b22222a7f32505575c460c2c9
backup_restore=1
multi_instance=0
change_url=1
@ -21,7 +22,7 @@
Email=
Notification=none
;;; Upgrade options
; commit=CommitHash
name=Name and date of the commit.
; commit=620065d7dcf5584b22222a7f32505575c460c2c9
name=Merge pull request #31 from YunoHost-Apps/testing
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

View file

@ -5,7 +5,7 @@ define("PG_PATH","/usr/bin");
define("PG_RESTORE","/usr/bin/pg_restore ");
define("PG_DUMP","/usr/bin/pg_dump ");
define ("PSQL","/usr/bin/psql");
define ("noalyss_user","__DB_NAME__");
define ("noalyss_user","__DB_USER__");
define ("noalyss_password","__DB_PWD__");
define ("noalyss_psql_port","5432");
define ("noalyss_psql_host","localhost");
@ -20,7 +20,7 @@ define ("domaine","");
define ("MULTI",1);
define ("dbname","");
// Uncomment to DEBUG
// define ("DEBUG",TRUE);
define ("DEBUG",TRUE);
// Uncomment to log your input
// define ("LOGINPUT",TRUE);
// Uncomment if you want to activate the possibility to reinitialize

View file

@ -3,10 +3,10 @@
"id": "noalyss",
"packaging_format": 1,
"description": {
"en": "Accounting free software (Beligum and French accounting)",
"en": "Accounting free software (Belgian and French accounting)",
"fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)"
},
"version": "9.0.2.5~ynh1",
"version": "9.0.2.5~ynh2",
"url": "http://noalyss.eu",
"upstream": {
"license": "AGPL-3.0-only",
@ -26,7 +26,7 @@
"multi_instance": false,
"services": [
"nginx",
"php7.3-fpm"
"php8.0-fpm"
],
"arguments": {
"install" : [

View file

@ -3,7 +3,7 @@
# COMMON VARIABLES
#=================================================
YNH_PHP_VERSION="7.3"
YNH_PHP_VERSION="8.0"
pkg_dependencies="postgresql apt-transport-https libgd-dev php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-php-gettext"

View file

@ -107,31 +107,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low
# #=================================================
# # SETUP APPLICATION WITH CURL
# #=================================================
# # Set the app as temporarily public for cURL call
# ynh_permission_update --permission "main" --add "visitors"
# # Reload NGINX
# ynh_systemd_action --service_name=nginx --action=reload
# ynh_script_progression --message="Finalizing installation..." --weight=10
# # Installation with cURL
# installUrl="/install.php?submit"
# ynh_local_curl $installUrl "install=2" "lang=fr_FR.utf8"
# # Remove the `install.php` directory from within the Noalyss installation path.
# # The scripts within this directory should not be accessible on a live Noalyss site
# # or on any installation that is accessible via the Internet.
#ynh_secure_remove "$final_path/html/install.php"
# # Set the user chosen at installation as administrator
# #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;"
# =================================================
# MODIFY A CONFIG FILE
# =================================================
@ -139,8 +114,10 @@ ynh_script_progression --message="Modifying $app config file..."
ynh_add_config --template="../conf/noalyss.conf" --destination="$final_path/include/config.inc.php"
chmod 400 "$final_path/include/config.inc.php"
chown $app:$app "$final_path/include/config.inc.php"
chmod 650 "$final_path/include/config.inc.php"
chown $app: "$final_path/include/config.inc.php"
ynh_secure_remove --file="/var/www/noalyss/html/install.php"
#=================================================
# SETUP LOGROTATE

View file

@ -64,13 +64,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring PHP-FPM configuration..."
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# SPECIFIC RESTORATION
#=================================================
@ -81,6 +74,13 @@ ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring PHP-FPM configuration..."
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# RESTORE THE POSTGRESQL DATABASE
#=================================================

View file

@ -115,31 +115,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low
#=================================================
# SETUP APPLICATION WITH CURL
#=================================================
# # Set the app as temporarily public for cURL call
# ynh_permission_update --permission "main" --add "visitors"
# # Reload NGINX
# ynh_systemd_action --service_name=nginx --action=reload
# ynh_script_progression --message="Finalizing installation..." --weight=10
# # Installation with cURL
# installUrl="/install.php?submit"
# ynh_local_curl $installUrl "install=2" "lang=fr_FR.utf8"
# # Remove the `install.php` directory from within the Noalyss installation path.
# # The scripts within this directory should not be accessible on a live Noalyss site
# # or on any installation that is accessible via the Internet.
# ynh_secure_remove "$final_path/html/install.php"
# # Set the user chosen at installation as administrator
# #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;"
#=================================================
# RELOAD NGINX
#=================================================