From dfc16e1ee2f178f60f8efd998ba02d5d93c5505c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:13:20 +0200 Subject: [PATCH 01/61] upgrade to version 5.2.14 --- check_process | 15 +++------------ conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 1 + 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 06cffda..81b80aa 100644 --- a/check_process +++ b/check_process @@ -1,13 +1,8 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" language="fr" ; Checks pkg_linter=1 @@ -20,11 +15,7 @@ #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/app.src b/conf/app.src index fe0570d..8ae2ddb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.0.38-release/invoiceninja.zip -SOURCE_SUM=faf38209035ec0d5e6d8dd5b4a25243e7e437944ce9dfa88340eaf6fa139319a +SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.2.14/invoiceninja.zip +SOURCE_SUM=c5bea83418884e3bee335db385cce6dd2acf48ccaded07efbaa8f38c01a9c9bf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index f3462cd..6d2284d 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Create and email invoices, track payments and expenses, and time tasks" }, - "version": "5.0.35~ynh1", + "version": "5.2.14~ynh1", "url": "https://invoiceninja.org", "license": "AAL", "maintainer": { @@ -14,7 +14,7 @@ "url": "https://github.com/YunoHost-Apps/invoiceninja5_ynh/" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 13eacfb..37902ca 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,6 +5,7 @@ #================================================= YNH_PHP_VERSION="7.4" + nodejs_version=12 # dependencies used by the app From 442fdb01803f505d817b8ef4c3dff8ee8878621f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:17:25 +0200 Subject: [PATCH 02/61] Add_config --- conf/cron | 1 + conf/invoiceninja.cron | 1 - scripts/install | 11 +++-------- scripts/upgrade | 12 ------------ 4 files changed, 4 insertions(+), 21 deletions(-) create mode 100644 conf/cron delete mode 100644 conf/invoiceninja.cron diff --git a/conf/cron b/conf/cron new file mode 100644 index 0000000..8100d34 --- /dev/null +++ b/conf/cron @@ -0,0 +1 @@ +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/artisan schedule:run >> /dev/null 2>&1 diff --git a/conf/invoiceninja.cron b/conf/invoiceninja.cron deleted file mode 100644 index 4759b32..0000000 --- a/conf/invoiceninja.cron +++ /dev/null @@ -1 +0,0 @@ -* * * * * __USER__ /usr/bin/php__YNH_PHP_VERSION__ __DESTDIR__/artisan schedule:run >> /dev/null 2>&1 diff --git a/scripts/install b/scripts/install index cc31d86..0b6fc37 100755 --- a/scripts/install +++ b/scripts/install @@ -167,14 +167,9 @@ popd #================================================= ynh_script_progression --message="Adding a cron job..." -cron_path="/etc/cron.d/$app" -cp -a ../conf/invoiceninja.cron "$cron_path" -chown root: "$cron_path" -chmod 644 "$cron_path" - -ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$cron_path" -ynh_replace_string --match_string="__DESTDIR__" --replace_string="$final_path" --target_file="$cron_path" -ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$YNH_PHP_VERSION" --target_file="$cron_path" +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 6559530..96f7a88 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,18 +62,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -# N.B. : this is for app installations before YunoHost 2.7 -# where this value might be something like /foo/ or foo/ -# instead of /foo .... -# If nobody installed your app before 2.7, then you may -# safely remove this line -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From bfb36f313c2f3639e92910efb966c9d39d752131 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:17:58 +0200 Subject: [PATCH 03/61] Update php-fpm.conf --- conf/php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab5dca9..ab1a471 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -33,7 +33,7 @@ group = __USER__ ; (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/php7.0-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. ; Default Value: 511 (-1 on FreeBSD and OpenBSD) From a93ada3001fcef2cef1d1b1e4848909baa10e70e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:28:14 +0200 Subject: [PATCH 04/61] Fix --- conf/nginx.conf | 2 +- conf/systemd.service | 4 ++-- scripts/_common.sh | 5 +++- scripts/install | 36 +++++++++++------------------ scripts/remove | 8 +++++++ scripts/restore | 34 +++++++++++++-------------- scripts/upgrade | 55 ++++++++++++++++++++++++++------------------ 7 files changed, 76 insertions(+), 68 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8c9099c..c89e930 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,7 +25,7 @@ location ^~ __PATH__/ { location ~ ^__PATH__/index\.php(/.*|)$ { fastcgi_split_path_info ^(.+?\.php)(/.*|)$; set $path_info $fastcgi_path_info; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; diff --git a/conf/systemd.service b/conf/systemd.service index 76cdf64..8d37f0e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,12 +1,12 @@ [Unit] -Description=Small description of the service +Description=invoiceninja: Create and email invoices After=network.target [Service] Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__/ +WorkingDirectory=__FINALPATH__ ExecStart=__FINALPATH__/script >> /var/log/__APP__/__APP__.log 2>&1 [Install] diff --git a/scripts/_common.sh b/scripts/_common.sh index 37902ca..449a6a1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,10 @@ YNH_PHP_VERSION="7.4" nodejs_version=12 # dependencies used by the app -pkg_dependencies="phantomjs php7.4-zip php7.4-gmp php7.4-gd php7.4-bcmath php7.4-fileinfo php7.4-json php7.4-mbstring php7.4-pdo php7.4-tokenizer php7.4-xml php7.4-curl php7.4-mysql gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" +pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" + +extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql" + #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 0b6fc37..4fc1f82 100755 --- a/scripts/install +++ b/scripts/install @@ -72,7 +72,6 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -83,6 +82,14 @@ ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -92,6 +99,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -100,21 +111,13 @@ ynh_script_progression --message="Configuring nginx web server..." # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Configuring php-fpm..." # Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -171,19 +174,6 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions to app files -#chown -R root: $final_path - -chmod -R 755 $final_path/ -chown -R $app: $final_path/ - #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/remove b/scripts/remove index b82d4b9..db21366 100755 --- a/scripts/remove +++ b/scripts/remove @@ -74,6 +74,14 @@ ynh_script_progression --message="Removing the cron file..." # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" +#================================================= +# REMOVE DEDICATED USER +#================================================= +ynh_script_progression --message="Removing the dedicated system user..." + +# Delete a system user +ynh_system_user_delete --username=$app + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 124a46e..1286ab3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -52,6 +52,14 @@ ynh_script_progression --message="Restoring the nginx configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -59,32 +67,20 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - -#================================================= -# RESTORE USER RIGHTS -#================================================= -ynh_script_progression --message="Restoring user rights..." - -# Restore permissions on app files -chown -R root: $final_path - +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" chmod -R 755 $final_path/storage -chown -R $app: $final_path/storage $final_path/bootstrap $final_path/public/logo $final_path/.env #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring PHP-FPM configuration..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_add_fpm_config --package="$extra_php_dependencies" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -108,6 +104,8 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Restoring the cron file..." ynh_restore_file --origin_path="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 96f7a88..73bc368 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,6 +31,20 @@ db_user=$db_name 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)..." + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -48,19 +62,20 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors + ynh_app_setting_delete --app=$app --key=is_public +fi + +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -77,6 +92,10 @@ then ynh_setup_source --dest_dir="$final_path" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -93,21 +112,13 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." ynh_add_nginx_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading php-fpm configuration..." # Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC UPGRADE @@ -164,10 +175,8 @@ popd ynh_script_progression --message="Securing files and directories..." # Set permissions on app files -chown -R root: $final_path chmod -R 755 $final_path/storage -chown -R $app: $final_path/storage $final_path/bootstrap $final_path/public/logo $final_path/.env #================================================= # RELOAD NGINX From 53d4d83833b09b3d3787005215347c6d56d9c2c2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:37:26 +0200 Subject: [PATCH 05/61] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4fc1f82..e651fa7 100755 --- a/scripts/install +++ b/scripts/install @@ -77,7 +77,7 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies +#ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs From ebd171f277c587aaa7730271bb48ec9a9e0e4e74 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:37:39 +0200 Subject: [PATCH 06/61] Fix --- manifest.json | 16 ++-------------- scripts/_common.sh | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/manifest.json b/manifest.json index 6d2284d..5ba3b59 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "invoiceninja5", "packaging_format": 1, "description": { - "en": "Create and email invoices, track payments and expenses, and time tasks" + "en": "Create and email invoices, track payments, expenses, and time tasks" }, "version": "5.2.14~ynh1", "url": "https://invoiceninja.org", @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.4-fpm", "mysql" ], "arguments": { @@ -27,29 +27,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for InvoiceNinja", - "fr": "Choisissez un nom de domaine pour InvoiceNinja" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for InvoiceNinja. Seule l'installation dans le répertoire racine est possible", - "fr": "Choisissez un chemin pour InvoiceNinja. Only installation in root is currently working" - }, "example": "/", "default": "/" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, "example": "johndoe" }, { diff --git a/scripts/_common.sh b/scripts/_common.sh index 449a6a1..2540d9b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ YNH_PHP_VERSION="7.4" nodejs_version=12 # dependencies used by the app -pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" +#pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql" From b07939f0e7519bf06a015d031770900c30b0ecb6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:39:09 +0200 Subject: [PATCH 07/61] Fix --- LICENSE | 676 ++++++++++++++++++++++++++++++++++++++++++++- scripts/_common.sh | 2 +- 2 files changed, 674 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index f3cff84..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,674 @@ -File containing the license of your package. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/scripts/_common.sh b/scripts/_common.sh index 2540d9b..00b70ee 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="7.3" nodejs_version=12 From d1c6dc5db74d01ea5b86065f938452090541b246 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:00:38 +0200 Subject: [PATCH 08/61] Fix --- conf/default.env | 57 ++++++++++++++++++++++++++++++++++++++++++++++ scripts/_common.sh | 4 +--- scripts/install | 34 ++++++--------------------- 3 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 conf/default.env diff --git a/conf/default.env b/conf/default.env new file mode 100644 index 0000000..19aaf53 --- /dev/null +++ b/conf/default.env @@ -0,0 +1,57 @@ +APP_NAME="Invoice Ninja" +APP_ENV=production +APP_KEY=base64:3E5HVZ/T+VbZu+oA4GNlwnvwFe3jNtkGbR95K0uwr7A= +APP_DEBUG=false + +APP_URL=http://localhost + +DB_CONNECTION=mysql +MULTI_DB_ENABLED=false + +DB_HOST=localhost +DB_DATABASE=__DB_NAME__ +DB_USERNAME=__DB_NAME__ +DB_PASSWORD=__DB_PWD__ +DB_PORT=3306 + +DEMO_MODE=false + +BROADCAST_DRIVER=log +LOG_CHANNEL=stack +CACHE_DRIVER=file +QUEUE_CONNECTION=sync +SESSION_DRIVER=file +SESSION_LIFETIME=120 + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=smtp +MAIL_HOST=smtp.__DOMAIN__ +MAIL_PORT=25 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS='__EMAIL__' +MAIL_FROM_NAME='__EMAIL_NAME__' + +POSTMARK_API_TOKEN= +REQUIRE_HTTPS=false + +GOOGLE_MAPS_API_KEY= +ERROR_EMAIL= +TRUSTED_PROXIES= + +NINJA_ENVIRONMENT=selfhost + +#options - snappdf / phantom / hosted_ninja +PDF_GENERATOR=phantom + +PHANTOMJS_KEY='__PHANTOMJS_KEY__' +PHANTOMJS_SECRET=__APP_KEY__ + +UPDATE_SECRET=__API_SECRET__ + +COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' +SENTRY_LARAVEL_DSN=https://cc7e8e2c678041689e53e409b7dba236@sentry.invoicing.co/5 diff --git a/scripts/_common.sh b/scripts/_common.sh index 00b70ee..68382f0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,14 +6,12 @@ YNH_PHP_VERSION="7.3" -nodejs_version=12 - # dependencies used by the app #pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" +pkg_dependencies="phantomjs" extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index e651fa7..50be883 100755 --- a/scripts/install +++ b/scripts/install @@ -55,8 +55,8 @@ ynh_app_setting_set --app=$app --key=api_secret --value="$(ynh_string_random --l ynh_app_setting_set --app=$app --key=app_key --value="$(ynh_string_random --length=32)" ynh_app_setting_set --app=$app --key=phantomjs_key --value="$(ynh_string_random --length=32)" -ynh_app_setting_set --app=$app --key=mail_from_address --value="$(ynh_user_get_info $admin mail)" -ynh_app_setting_set --app=$app --key=mail_from_name --value="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)" +ynh_app_setting_set --app=$app --key=email --value="$(ynh_user_get_info $admin mail)" +ynh_app_setting_set --app=$app --key=email__name --value="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)" #================================================= # STANDARD MODIFICATIONS @@ -77,10 +77,7 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= ynh_script_progression --message="Installing dependencies..." -#ynh_install_app_dependencies $pkg_dependencies - -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_use_nodejs +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER @@ -106,7 +103,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated nginx config ynh_add_nginx_config @@ -114,7 +111,7 @@ ynh_add_nginx_config #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." +ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated php-fpm config ynh_add_fpm_config --package="$extra_php_dependencies" @@ -127,24 +124,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Modifying a config file..." -config="$final_path/.env" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$config" - -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" -ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$config" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config" -ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$config" -ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$config" - -ynh_replace_string --match_string="__API_SECRET__" --replace_string="$(ynh_app_setting_get --app=$app --key=api_secret)" --target_file="$config" -ynh_replace_string --match_string="__APP_KEY__" --replace_string="$(ynh_app_setting_get --app=$app --key=app_key)" --target_file="$config" -ynh_replace_string --match_string="__PHANTOMJS_KEY__" --replace_string="$(ynh_app_setting_get --app=$app --key=phantomjs_jey)" --target_file="$config" - -ynh_replace_string --match_string="__MAIL_FROM_ADDRESS__" --replace_string="$(ynh_app_setting_get --app=$app --key=mail_from_address)" --target_file="$config" -ynh_replace_string --match_string="__MAIL_FROM_NAME__" --replace_string="$(ynh_app_setting_get --app=$app --key=mail_from_name)" --target_file="$config" - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$config" +ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" #================================================= # BUILD THE APPLICATION @@ -177,7 +157,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From d32636f37584d01e91843bfc19f4b64733983d96 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:10:37 +0200 Subject: [PATCH 09/61] fix --- conf/systemd.service | 2 +- scripts/install | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 8d37f0e..d4d89d2 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=invoiceninja: Create and email invoices +Description=InvoiceNinja: Create and email invoices After=network.target [Service] diff --git a/scripts/install b/scripts/install index 50be883..a7725b7 100755 --- a/scripts/install +++ b/scripts/install @@ -30,6 +30,12 @@ language=$YNH_APP_ARG_LANGUAGE app=$YNH_APP_INSTANCE_NAME +api_secret="$(ynh_string_random --length=32)" +app_key="$(ynh_string_random --length=32)" +phantomjs_key="$(ynh_string_random --length=32)" +email_name="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)" +email="$(ynh_user_get_info $admin mail)" + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -51,13 +57,6 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=api_secret --value="$(ynh_string_random --length=32)" -ynh_app_setting_set --app=$app --key=app_key --value="$(ynh_string_random --length=32)" -ynh_app_setting_set --app=$app --key=phantomjs_key --value="$(ynh_string_random --length=32)" - -ynh_app_setting_set --app=$app --key=email --value="$(ynh_user_get_info $admin mail)" -ynh_app_setting_set --app=$app --key=email__name --value="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)" - #================================================= # STANDARD MODIFICATIONS #================================================= From 9a4afab2036c954f16abf7b3d4a45fe009ed4f32 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:19:10 +0200 Subject: [PATCH 10/61] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index c89e930..f69f2be 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -20,7 +20,7 @@ location ^~ __PATH__/ { more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "Referrer-Policy: no-referrer"; - #index index.php; + index index.php; location ~ ^__PATH__/index\.php(/.*|)$ { fastcgi_split_path_info ^(.+?\.php)(/.*|)$; From e5731279f733221d6d275b93bdeeb99e3da595ae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:19:33 +0200 Subject: [PATCH 11/61] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f69f2be..1e4ab2c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,7 +3,7 @@ location ^~ __PATH__/ { # Path to source - alias __FINALPATH__/public/ ; + alias __FINALPATH__/public/; try_files $uri $uri/ =404; From cac3ab08a8c53e31a01e5a58da5f3b772cd52343 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:21:52 +0200 Subject: [PATCH 12/61] 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 68382f0..2ccc82f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.3" #pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" pkg_dependencies="phantomjs" -extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql" +extra_php_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mysql" #================================================= # PERSONAL HELPERS From f2d7993218977fca42be2cbc066daec2a5807a65 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:22:48 +0200 Subject: [PATCH 13/61] Update nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1e4ab2c..4031a35 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -20,7 +20,7 @@ location ^~ __PATH__/ { more_set_headers "X-Permitted-Cross-Domain-Policies: none"; more_set_headers "Referrer-Policy: no-referrer"; - index index.php; + index index.php index.html index.htm; location ~ ^__PATH__/index\.php(/.*|)$ { fastcgi_split_path_info ^(.+?\.php)(/.*|)$; From 4a9f49d2bf8fe48cafc801d942b6eab03bfa4a0a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:33:12 +0200 Subject: [PATCH 14/61] Fix --- scripts/install | 6 ++++++ scripts/upgrade | 36 ++++++++---------------------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/scripts/install b/scripts/install index a7725b7..da56fea 100755 --- a/scripts/install +++ b/scripts/install @@ -57,6 +57,12 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=language --value=$language +ynh_app_setting_set --app=$app --key=api_secret --value=$api_secret +ynh_app_setting_set --app=$app --key=app_key --value=$app_key +ynh_app_setting_set --app=$app --key=phantomjs_key --value=$phantomjs_key +ynh_app_setting_set --app=$app --key=email_name --value=$email_name +ynh_app_setting_set --app=$app --key=email --value=$email + #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 73bc368..85f795b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,12 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_user=$db_name +api_secret=$(ynh_app_setting_get --app=$app --key=api_secret) +app_key=$(ynh_app_setting_get --app=$app --key=app_key) +phantomjs_key=$(ynh_app_setting_get --app=$app --key=phantomjs_key) +email_name=$(ynh_app_setting_get --app=$app --key=email_name) +email=$(ynh_app_setting_get --app=$app --key=email) + #================================================= # CHECK VERSION #================================================= @@ -95,6 +101,7 @@ fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +chmod -R 755 $final_path/storage #================================================= # UPGRADE DEPENDENCIES @@ -128,25 +135,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Modifying a config file..." - - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$config" - - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$config" - ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$config" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$config" - ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="$config" - ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$config" - - ynh_replace_string --match_string="__API_SECRET__" --replace_string="$(ynh_app_setting_get --app=$app --key=api_secret)" --target_file="$config" - ynh_replace_string --match_string="__APP_KEY__" --replace_string="$(ynh_app_setting_get --app=$app --key=app_key)" --target_file="$config" - ynh_replace_string --match_string="__PHANTOMJS_KEY__" --replace_string="$(ynh_app_setting_get --app=$app --key=phantomjs_jey)" --target_file="$config" - - ynh_replace_string --match_string="__MAIL_FROM_ADDRESS__" --replace_string="$(ynh_app_setting_get --app=$app --key=mail_from_address)" --target_file="$config" - ynh_replace_string --match_string="__MAIL_FROM_NAME__" --replace_string="$(ynh_app_setting_get --app=$app --key=mail_from_name)" --target_file="$config" - - # Calculate and store the config file checksum into the app settings - ynh_store_file_checksum --file="$config" + ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" fi #================================================= @@ -169,15 +158,6 @@ pushd "$final_path" php$phpversion artisan up --no-interaction --verbose popd -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions on app files - -chmod -R 755 $final_path/storage - #================================================= # RELOAD NGINX #================================================= From 821544f664beec126b84b4739f631b618fdb2122 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:47:39 +0200 Subject: [PATCH 15/61] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 81b80aa..c478c9a 100644 --- a/check_process +++ b/check_process @@ -6,11 +6,11 @@ language="fr" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 - setup_private=0 - setup_public=0 + setup_private=1 + setup_public=1 upgrade=1 #upgrade=1 from_commit=CommitHash backup_restore=1 From 721d52e881640899f5f98b2fd34008fcfcbc52b7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:49:23 +0200 Subject: [PATCH 16/61] Update install --- scripts/install | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index da56fea..f421336 100755 --- a/scripts/install +++ b/scripts/install @@ -159,6 +159,14 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Configuring permissions..." --weight=3 + +# Restrict access to admin only +ynh_permission_update --permission="main" --remove="all_users" --add=$admin + #================================================= # RELOAD NGINX #================================================= From f0c787682771cd424c35e865bb00046d9d7ec305 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:51:28 +0200 Subject: [PATCH 17/61] Fix --- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/remove b/scripts/remove index db21366..ad26ef1 100755 --- a/scripts/remove +++ b/scripts/remove @@ -51,7 +51,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated nginx config ynh_remove_nginx_config @@ -59,7 +59,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." +ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 1286ab3..d852441 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,7 +48,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -112,7 +112,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 85f795b..4aac265 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,7 +113,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config @@ -122,7 +122,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." +ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config --package="$extra_php_dependencies" @@ -161,7 +161,7 @@ popd #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From 62fcd217f5753d5e7e74d2b72351d1d3431fe485 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:53:52 +0200 Subject: [PATCH 18/61] Add templates --- .../ISSUE_TEMPLATE.md | 39 ++++++++++++------- .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++ doc/DISCLAIMER.md | 0 pull_request_template.md | 18 --------- 4 files changed, 40 insertions(+), 33 deletions(-) rename issue_template.md => .github/ISSUE_TEMPLATE.md (51%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 doc/DISCLAIMER.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 51% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index a12d565..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,46 +1,55 @@ --- name: Bug report -about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all. +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. --- **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* - - *Otherwise, the issue may be due to Invoice Ninja itself. Refer to its documentation or repository for help.* - - *If you have a doubt, post here, we will figure it out together.* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- -**Describe the bug** +### Describe the bug + *A clear and concise description of what the bug is.* -**Versions** +### Context + - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* -**To Reproduce** -*Steps to reproduce the behavior.* +### Steps to reproduce + - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install invoiceninja + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* -**Expected behavior** +### Expected behavior + *A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* -**Logs** -*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.* +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + *If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index eb14a79..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,18 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/invoiceninja_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/invoiceninja_ynh%20PR-NUM-%20(USERNAME)/) From ff83fd6a7b4299fdaa05867af014fecf0ff6a1bb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 26 Jul 2021 09:54:08 +0000 Subject: [PATCH 19/61] Auto-update README --- README.md | 84 ++++++++++++++-------------------------------------- README_fr.md | 36 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 62 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index f10d976..690b50f 100644 --- a/README.md +++ b/README.md @@ -1,80 +1,40 @@ -# Invoice Ninja 5 for YunoHost + -[![Integration level](https://dash.yunohost.org/integration/invoiceninja.svg)](https://dash.yunohost.org/appci/app/invoiceninja) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja.maintain.svg) -[![Install Invoice Ninja with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=invoiceninja) +# InvoiceNinja 5 for YunoHost -> *This package allows you to install Invoice Ninja quickly and simply on a YunoHost server. +[![Integration level](https://dash.yunohost.org/integration/invoiceninja5.svg)](https://dash.yunohost.org/appci/app/invoiceninja5) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja5.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja5.maintain.svg) +[![Install InvoiceNinja 5 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invoiceninja5) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install InvoiceNinja 5 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 -### Warning +Create and email invoices, track payments, expenses, and time tasks -This is the new version of InvoiceNinja. There are several things not working at the moment: +**Shipped version:** 5.2.14~ynh1 -* migration from v4 -* installation into a sub-directory -* sending mails -Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. -**Shipped version:** v5.0.24 +## Documentation and resources -## Screenshots +* YunoHost documentation for this app: https://yunohost.org/app_invoiceninja5 +* Report a bug: https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues -![](https://www.invoiceninja.com/wp-content/uploads/2015/11/Create-Invoices-in-Seconds.png) +## Developer info -## Demo - -* [Official demo](https://app.invoiceninja.com/dashboard) - -## Configuration - -Configuration happens in the application itself. - -## Documentation - - * Official documentation: https://docs.invoiceninja.com/index.html - -## YunoHost specific features - -#### Multi-user support - -* There is no official LDAP support -* The first user gets created after installing Invoice Ninja -* Other users can be created from inside the application - -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/invoiceninja%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/invoiceninja/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/invoiceninja%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/invoiceninja/) - -## Limitations - -* Any known limitations. - -## Links - - * Report a bug: https://github.com/YunoHost-Apps/invoiceninja_ynh/issues - * App website: https://www.invoiceninja.org/ - * Upstream app repository: https://github.com/invoiceninja/invoiceninja - * YunoHost website: https://yunohost.org/ - -## TODOs - -* If possible, create initial user -* Test upgrade - ---- - -Developer info ----------------- - -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/invoiceninja_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/invoiceninja_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing --debug or -sudo yunohost app upgrade invoiceninja -u https://github.com/YunoHost-Apps/invoiceninja_ynh/tree/testing --debug +sudo yunohost app upgrade invoiceninja5 -u https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..ccf77ff --- /dev/null +++ b/README_fr.md @@ -0,0 +1,36 @@ +# InvoiceNinja 5 pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/invoiceninja5.svg)](https://dash.yunohost.org/appci/app/invoiceninja5) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja5.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invoiceninja5.maintain.svg) +[![Installer InvoiceNinja 5 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invoiceninja5) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer InvoiceNinja 5 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.* + +## Vue d'ensemble + + + +**Version incluse :** 5.2.14~ynh1 + + + +## Documentations et ressources + +* Documentation YunoHost pour cette app : https://yunohost.org/app_invoiceninja5 +* Signaler un bug : https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing --debug +ou +sudo yunohost app upgrade invoiceninja5 -u https://github.com/YunoHost-Apps/invoiceninja5_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From c644d645515d945f138d86c93a943b78fae38fc4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:55:26 +0200 Subject: [PATCH 20/61] Update manifest.json --- manifest.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 5ba3b59..8cecee3 100644 --- a/manifest.json +++ b/manifest.json @@ -7,11 +7,18 @@ }, "version": "5.2.14~ynh1", "url": "https://invoiceninja.org", + "upstream": { + "license": "AAL", + "website": "https://invoiceninja.org", + "demo": "https://app.invoiceninja.com/dashboard", + "admindoc": "https://docs.invoiceninja.com/index.html", + "userdoc": "https://yunohost.org/apps", + "code": "https://github.com/invoiceninja/invoiceninja" + }, "license": "AAL", "maintainer": { "name": "Sebastian Gumprich", - "email": "yunohost AT gumpri DOT ch", - "url": "https://github.com/YunoHost-Apps/invoiceninja5_ynh/" + "email": "yunohost AT gumpri DOT ch" }, "requirements": { "yunohost": ">= 4.2.0" From 3bb82a3a92e453d50e63c219fa977bcb39b3438c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:56:40 +0200 Subject: [PATCH 21/61] Create Create-Invoices-in-Seconds.png --- doc/screenshots/Create-Invoices-in-Seconds.png | Bin 0 -> 63091 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/screenshots/Create-Invoices-in-Seconds.png diff --git a/doc/screenshots/Create-Invoices-in-Seconds.png b/doc/screenshots/Create-Invoices-in-Seconds.png new file mode 100644 index 0000000000000000000000000000000000000000..ddafd75199721dcfb90177af0cbbd6f567518a5f GIT binary patch literal 63091 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 J%Q~loCIF=BJ~aRU literal 0 HcmV?d00001 From 91178cefa8b0f1e5b00e857ec68b3fd1545b611b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 11:56:45 +0200 Subject: [PATCH 22/61] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..9536ce9 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,17 @@ +### Warning + +This is the new version of InvoiceNinja. There are several things not working at the moment: + +* migration from v4 +* installation into a sub-directory +* sending mails + +Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. + +## YunoHost specific features + +#### Multi-user support + +* There is no official LDAP support +* The first user gets created after installing Invoice Ninja +* Other users can be created from inside the application From 3de482e0aa1e9b7811cd20408f1009b372fde361 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 26 Jul 2021 09:56:56 +0000 Subject: [PATCH 23/61] Auto-update README --- README.md | 28 ++++++++++++++++++++++++++++ README_fr.md | 28 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/README.md b/README.md index 690b50f..06696ad 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,38 @@ Create and email invoices, track payments, expenses, and time tasks **Shipped version:** 5.2.14~ynh1 +**Demo:** https://app.invoiceninja.com/dashboard +## Screenshots + +![](./doc/screenshots/Create-Invoices-in-Seconds.png) + +## Disclaimers / important information + +### Warning + +This is the new version of InvoiceNinja. There are several things not working at the moment: + +* migration from v4 +* installation into a sub-directory +* sending mails + +Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. + +## YunoHost specific features + +#### Multi-user support + +* There is no official LDAP support +* The first user gets created after installing Invoice Ninja +* Other users can be created from inside the application ## Documentation and resources +* Official app website: https://invoiceninja.org +* Official user documentation: https://yunohost.org/apps +* Official admin documentation: https://docs.invoiceninja.com/index.html +* Upstream app code repository: https://github.com/invoiceninja/invoiceninja * YunoHost documentation for this app: https://yunohost.org/app_invoiceninja5 * Report a bug: https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues diff --git a/README_fr.md b/README_fr.md index ccf77ff..9a312a8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,10 +15,38 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour **Version incluse :** 5.2.14~ynh1 +**Démo :** https://app.invoiceninja.com/dashboard +## Captures d'écran + +![](./doc/screenshots/Create-Invoices-in-Seconds.png) + +## Avertissements / informations importantes + +### Warning + +This is the new version of InvoiceNinja. There are several things not working at the moment: + +* migration from v4 +* installation into a sub-directory +* sending mails + +Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. + +## YunoHost specific features + +#### Multi-user support + +* There is no official LDAP support +* The first user gets created after installing Invoice Ninja +* Other users can be created from inside the application ## Documentations et ressources +* Site officiel de l'app : https://invoiceninja.org +* Documentation officielle utilisateur : https://yunohost.org/apps +* Documentation officielle de l'admin : https://docs.invoiceninja.com/index.html +* Dépôt de code officiel de l'app : https://github.com/invoiceninja/invoiceninja * Documentation YunoHost pour cette app : https://yunohost.org/app_invoiceninja5 * Signaler un bug : https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues From e6106c1f3e4da3d0bd35986f09079ab37dc88336 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 12:16:15 +0200 Subject: [PATCH 24/61] Fix --- scripts/_common.sh | 2 +- scripts/change_url | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2ccc82f..9388454 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" # dependencies used by the app #pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" diff --git a/scripts/change_url b/scripts/change_url index 27cd9a0..ed90f04 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -67,13 +67,10 @@ then change_path=1 fi -#================================================= -# STANDARD MODIFICATIONS -#================================================= #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." +ynh_script_progression --message="Updating NGINX web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -106,20 +103,13 @@ fi #================================================= ynh_script_progression --message="Modifying a config file..." -config="$final_path/.env" -ynh_backup_if_checksum_is_different --file="$final_path/CONFIG_FILE" +ynh_replace_string --match_string="$old_domain$old_path" --replace_string="$new_domain$new_path" --target_file="$final_path/.env" +ynh_store_file_checksum --file="$final_path/.env" -ynh_replace_string --match_string="$old_domain$old_path" --replace_string="$new_domain$new_path" --target_file="$config" - -ynh_store_file_checksum --file="$config" - -#================================================= -# GENERIC FINALISATION -#================================================= #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From 9933bfadc09506b5e0d748010e70f751f2ba2097 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 14:07:30 +0200 Subject: [PATCH 25/61] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4aac265..7a0b704 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,10 +133,10 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # MODIFY A CONFIG FILE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" -fi +# if [ "$upgrade_type" == "UPGRADE_APP" ] +# then +# ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" +# fi #================================================= # UPGRADE DATABASE From 2dc778efc3df284625f2defc177659d35749d44f Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 29 Aug 2021 19:33:27 +0200 Subject: [PATCH 26/61] update to 5.3.1 and update license --- conf/app.src | 4 ++-- manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 8ae2ddb..fa384d4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.2.14/invoiceninja.zip -SOURCE_SUM=c5bea83418884e3bee335db385cce6dd2acf48ccaded07efbaa8f38c01a9c9bf +SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.3.1/invoiceninja.zip +SOURCE_SUM=dbcd9fb8db31bc155e425d4c1548f14b23937f36fd3e01ed598057e11a6ef31d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 8cecee3..a9d6881 100644 --- a/manifest.json +++ b/manifest.json @@ -5,10 +5,10 @@ "description": { "en": "Create and email invoices, track payments, expenses, and time tasks" }, - "version": "5.2.14~ynh1", + "version": "5.3.1~ynh1", "url": "https://invoiceninja.org", "upstream": { - "license": "AAL", + "license": "ELv2", "website": "https://invoiceninja.org", "demo": "https://app.invoiceninja.com/dashboard", "admindoc": "https://docs.invoiceninja.com/index.html", From e1a9f613363e97f3cad9fd4a98a3b7ea5f640c2f Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 29 Aug 2021 19:34:31 +0200 Subject: [PATCH 27/61] add new cronjobs --- conf/cron | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index 8100d34..f7121f5 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1,2 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __FINALPATH__/artisan schedule:run >> /dev/null 2>&1 +* * * * * __APP__ cd __FINALPATH__ && /usr/bin/php__PHPVERSION__ -d register_argc_argv=On artisan schedule:run >> /dev/null 2>&1 +* * * * * __APP__ cd __FINALPATH__ && /usr/bin/php__PHPVERSION__ -d register_argc_argv=On artisan queue:work --stop-when-empty >> /dev/null 2>&1 From 6b652a5e242f7dbcbcab0850f32403933e759b3d Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 29 Aug 2021 19:34:44 +0200 Subject: [PATCH 28/61] make installation work --- conf/default.env | 9 +++++---- scripts/install | 19 +++++++------------ scripts/remove | 2 +- scripts/upgrade | 32 ++++++++++++++++++++------------ 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/conf/default.env b/conf/default.env index 19aaf53..4d18148 100644 --- a/conf/default.env +++ b/conf/default.env @@ -3,7 +3,7 @@ APP_ENV=production APP_KEY=base64:3E5HVZ/T+VbZu+oA4GNlwnvwFe3jNtkGbR95K0uwr7A= APP_DEBUG=false -APP_URL=http://localhost +APP_URL=https://__DOMAIN____PATH__ DB_CONNECTION=mysql MULTI_DB_ENABLED=false @@ -19,7 +19,6 @@ DEMO_MODE=false BROADCAST_DRIVER=log LOG_CHANNEL=stack CACHE_DRIVER=file -QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 @@ -32,9 +31,9 @@ MAIL_HOST=smtp.__DOMAIN__ MAIL_PORT=25 MAIL_USERNAME=null MAIL_PASSWORD=null -MAIL_ENCRYPTION=null +MAIL_ENCRYPTION=tls MAIL_FROM_ADDRESS='__EMAIL__' -MAIL_FROM_NAME='__EMAIL_NAME__' +MAIL_FROM_NAME="__EMAIL_NAME__" POSTMARK_API_TOKEN= REQUIRE_HTTPS=false @@ -55,3 +54,5 @@ UPDATE_SECRET=__API_SECRET__ COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' SENTRY_LARAVEL_DSN=https://cc7e8e2c678041689e53e409b7dba236@sentry.invoicing.co/5 + +PRECONFIGURED_INSTALL=true diff --git a/scripts/install b/scripts/install index f421336..55ee27e 100755 --- a/scripts/install +++ b/scripts/install @@ -101,10 +101,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # NGINX CONFIGURATION #================================================= @@ -140,15 +136,14 @@ pushd "$final_path" # Run the database migrations and initially fill the db php$phpversion artisan optimize --no-interaction --verbose php$phpversion artisan migrate:fresh --seed --no-interaction --verbose --force + php$phpversion artisan ninja:create-account --email $email --password changeme --no-interaction --verbose + php$phpversion artisan view:clear + php$phpversion artisan cache:clear popd -# ynh_app_setting_set --app=$app --key=unprotected_uris --value='/' - -# first_name="$(ynh_app_setting_get --app=$app --key=mail_from_name) | cut -d ' ' -f 1" -# last_name="$(ynh_app_setting_get --app=$app --key=mail_from_name) | cut -d ' ' -f 2" -# mail_from_address="$(ynh_user_get_info $admin mail)" - -# curl --silent --show-error --insecure --location -H "Content-Type:application/json" --header "Host: $domain" --header "X-Requested-With: XMLHttpRequest" --resolve $domain:443:127.0.0.1 --data "{\"report_errors\":true,\"email\":\"$mail_from_address\",\"password\":\"insecurechangeme\",\"first_name\":\"$first_name\",\"last_name\":\"$last_name\",\"terms_of_service\":\"1\",\"privacy_policy\":\"1\"}" 'https://localhost/api/v1/signup?first_load=true' --cookie-jar /tmp/ynh--cookie.txt --cookie /tmp/ynh--cookie.txt +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # ADD A CRON JOB @@ -165,7 +160,7 @@ chmod 644 "/etc/cron.d/$app" ynh_script_progression --message="Configuring permissions..." --weight=3 # Restrict access to admin only -ynh_permission_update --permission="main" --remove="all_users" --add=$admin +ynh_permission_update --permission "main" --add visitors #================================================= # RELOAD NGINX diff --git a/scripts/remove b/scripts/remove index ad26ef1..a46c348 100755 --- a/scripts/remove +++ b/scripts/remove @@ -38,7 +38,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name ynh_script_progression --message="Removing dependencies..." # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR diff --git a/scripts/upgrade b/scripts/upgrade index 7a0b704..6502074 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,11 +98,6 @@ then ynh_setup_source --dest_dir="$final_path" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" -chmod -R 755 $final_path/storage - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -110,6 +105,15 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +#================================================= +# ADD A CRON JOB +#================================================= +ynh_script_progression --message="Adding a cron job..." + +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" + #================================================= # NGINX CONFIGURATION #================================================= @@ -133,14 +137,15 @@ ynh_add_fpm_config --package="$extra_php_dependencies" # MODIFY A CONFIG FILE #================================================= -# if [ "$upgrade_type" == "UPGRADE_APP" ] -# then -# ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" -# fi + if [ "$upgrade_type" == "UPGRADE_APP" ] + then + ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" + fi #================================================= # UPGRADE DATABASE #================================================= + ynh_script_progression --message="Upgrading the database..." pushd "$final_path" @@ -148,16 +153,19 @@ pushd "$final_path" php$phpversion artisan down --no-interaction --verbose # Optimize the framework for better performance - php$phpversion artisan optimize --force --no-interaction --verbose + php$phpversion artisan optimize --no-interaction --verbose # Run the database migrations - php$phpversion artisan migrate --no-interaction --verbose - php$phpversion artisan db:seed --class=UpdateSeeder --force --no-interaction --verbose + php$phpversion artisan migrate --force --no-interaction --verbose # Bring the application out of maintenance mode php$phpversion artisan up --no-interaction --verbose popd +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # RELOAD NGINX #================================================= From 0eed533898d13bce95072292903bb95e8ae2452c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 29 Aug 2021 17:34:52 +0000 Subject: [PATCH 29/61] 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 06696ad..e19c194 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Create and email invoices, track payments, expenses, and time tasks -**Shipped version:** 5.2.14~ynh1 +**Shipped version:** 5.3.1~ynh1 **Demo:** https://app.invoiceninja.com/dashboard diff --git a/README_fr.md b/README_fr.md index 9a312a8..e44d8ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour -**Version incluse :** 5.2.14~ynh1 +**Version incluse :** 5.3.1~ynh1 **Démo :** https://app.invoiceninja.com/dashboard From 575db1502c5257e856210d624a317383a574c5fa Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 12 Sep 2021 22:01:12 +0200 Subject: [PATCH 30/61] make it possible to set app to public/private --- scripts/install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 55ee27e..fbdd515 100755 --- a/scripts/install +++ b/scripts/install @@ -159,8 +159,11 @@ chmod 644 "/etc/cron.d/$app" #================================================= ynh_script_progression --message="Configuring permissions..." --weight=3 -# Restrict access to admin only -ynh_permission_update --permission "main" --add visitors +# Make app public if necessary +if [ $is_public -eq 1 ] +then + ynh_permission_update --permission="main" --add="visitors" +fi #================================================= # RELOAD NGINX From fd1c92b94cd670168e9b3605e944a344a76f2fe2 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 15 Sep 2021 19:31:50 +0200 Subject: [PATCH 31/61] make it possible to set app to public/private --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index fbdd515..225abb7 100755 --- a/scripts/install +++ b/scripts/install @@ -27,6 +27,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE +is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME From 1af0241682ded887c2509ab9e03351bb8633cbab Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 15 Sep 2021 19:43:17 +0200 Subject: [PATCH 32/61] make it possible to set app to public/private --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index c478c9a..ecca792 100644 --- a/check_process +++ b/check_process @@ -4,6 +4,7 @@ path="/path" admin="john" language="fr" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=0 From a0fafd4ab87d46438ae03ee80aeedb569c5fd5f7 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 15 Sep 2021 19:55:59 +0200 Subject: [PATCH 33/61] make it possible to set app to public/private --- check_process | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index ecca792..4bd08b6 100644 --- a/check_process +++ b/check_process @@ -5,6 +5,7 @@ admin="john" language="fr" is_public=1 + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=0 @@ -16,7 +17,7 @@ #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - change_url=1 + change_url=0 ;;; Options Email= Notification=none From 89fb45c442eee8e6ef0911898cb0c69c8736ca28 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 15 Sep 2021 20:09:46 +0200 Subject: [PATCH 34/61] make it possible to set app to public/private --- manifest.json | 9 +++++++-- scripts/install | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index a9d6881..c16330c 100644 --- a/manifest.json +++ b/manifest.json @@ -11,8 +11,8 @@ "license": "ELv2", "website": "https://invoiceninja.org", "demo": "https://app.invoiceninja.com/dashboard", - "admindoc": "https://docs.invoiceninja.com/index.html", - "userdoc": "https://yunohost.org/apps", + "admindoc": "https://invoiceninja.github.io/", + "userdoc": "https://invoiceninja.github.io/", "code": "https://github.com/invoiceninja/invoiceninja" }, "license": "AAL", @@ -56,6 +56,11 @@ }, "choices": ["fr", "en"], "default": "en" + }, + { + "name": "is_public", + "type": "boolean", + "default": true } ] } diff --git a/scripts/install b/scripts/install index 225abb7..ec26ee6 100755 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors From 20ce2fad61f436ca7ec03a0d0dcf5923ba6e4cfe Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 15 Sep 2021 18:09:54 +0000 Subject: [PATCH 35/61] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e19c194..135ce6b 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ Invoice Ninja is the #1 open-source platform to create & email invoices, track p ## Documentation and resources * Official app website: https://invoiceninja.org -* Official user documentation: https://yunohost.org/apps -* Official admin documentation: https://docs.invoiceninja.com/index.html +* Official user documentation: https://invoiceninja.github.io/ +* Official admin documentation: https://invoiceninja.github.io/ * Upstream app code repository: https://github.com/invoiceninja/invoiceninja * YunoHost documentation for this app: https://yunohost.org/app_invoiceninja5 * Report a bug: https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues diff --git a/README_fr.md b/README_fr.md index e44d8ff..43d09df 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,8 +44,8 @@ Invoice Ninja is the #1 open-source platform to create & email invoices, track p ## Documentations et ressources * Site officiel de l'app : https://invoiceninja.org -* Documentation officielle utilisateur : https://yunohost.org/apps -* Documentation officielle de l'admin : https://docs.invoiceninja.com/index.html +* Documentation officielle utilisateur : https://invoiceninja.github.io/ +* Documentation officielle de l'admin : https://invoiceninja.github.io/ * Dépôt de code officiel de l'app : https://github.com/invoiceninja/invoiceninja * Documentation YunoHost pour cette app : https://yunohost.org/app_invoiceninja5 * Signaler un bug : https://github.com/YunoHost-Apps/invoiceninja5_ynh/issues From 928e0e239305fdea49c10e30c6c6ccff2add59b6 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Wed, 15 Sep 2021 22:09:57 +0200 Subject: [PATCH 36/61] fix config checksum creation --- scripts/backup | 3 --- scripts/install | 7 +++++++ scripts/restore | 1 - scripts/upgrade | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/backup b/scripts/backup index 73cf595..fd931cd 100755 --- a/scripts/backup +++ b/scripts/backup @@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index ec26ee6..86548c7 100755 --- a/scripts/install +++ b/scripts/install @@ -143,6 +143,13 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# STORE THE CHECKSUM OF THE CONFIG FILE +#================================================= + +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum --file="$final_path/.env" + #================================================= # ADD A CRON JOB #================================================= diff --git a/scripts/restore b/scripts/restore index d852441..1226e8d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -70,7 +70,6 @@ ynh_restore_file --origin_path="$final_path" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod -R 755 $final_path/storage #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 6502074..7a7b878 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,8 +19,9 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) +is_public=$YNH_APP_ARG_IS_PUBLIC + db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) db_user=$db_name @@ -88,7 +89,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= config="$final_path/.env" -ynh_backup_if_checksum_is_different --file="$final_path/CONFIG_FILE" +ynh_backup_if_checksum_is_different --file="$final_path/.env" if [ "$upgrade_type" == "UPGRADE_APP" ] then From 9971ac9b92f37272056e3a9351e9b528fe5f0cfd Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Thu, 16 Sep 2021 21:13:23 +0200 Subject: [PATCH 37/61] add final path to upgrade script --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 7a7b878..c528326 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,6 +32,8 @@ phantomjs_key=$(ynh_app_setting_get --app=$app --key=phantomjs_key) email_name=$(ynh_app_setting_get --app=$app --key=email_name) email=$(ynh_app_setting_get --app=$app --key=email) +final_path=/var/www/$app + #================================================= # CHECK VERSION #================================================= From f472d8c49ef649cf7cc0417a25e09753e25dd921 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Thu, 16 Sep 2021 21:19:30 +0200 Subject: [PATCH 38/61] fix linting --- manifest.json | 11 ++++++----- scripts/restore | 5 ----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index c16330c..ff18ab9 100644 --- a/manifest.json +++ b/manifest.json @@ -33,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -44,8 +43,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "language", @@ -60,7 +58,10 @@ { "name": "is_public", "type": "boolean", - "default": true + "default": true, + "help": { + "en": "Since your clients should have the possibility to access your invoices, the app is public. If you only want to send invoices via mail (or not at all), deactivate public access" + } } ] } diff --git a/scripts/restore b/scripts/restore index 1226e8d..0875bdd 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,11 +38,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - #================================================= # STANDARD RESTORATION STEPS #================================================= From 8c63326e4515f4944b478d375d62d3293752b68f Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Thu, 16 Sep 2021 22:20:14 +0200 Subject: [PATCH 39/61] fix config checksum creation --- scripts/install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 86548c7..2ff4f8b 100755 --- a/scripts/install +++ b/scripts/install @@ -125,6 +125,13 @@ ynh_script_progression --message="Modifying a config file..." ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" +#================================================= +# STORE THE CHECKSUM OF THE CONFIG FILE +#================================================= + +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum --file="$final_path/.env" + #================================================= # BUILD THE APPLICATION #================================================= @@ -143,13 +150,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/.env" - #================================================= # ADD A CRON JOB #================================================= From 71a7255c850b893f15193d7ea638000958585cc1 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 18 Sep 2021 17:09:12 +0200 Subject: [PATCH 40/61] try to fix upgrade --- conf/default.env | 2 +- scripts/install | 11 +++++--- scripts/upgrade | 69 ++++++++++++++++++++---------------------------- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/conf/default.env b/conf/default.env index 4d18148..91638a7 100644 --- a/conf/default.env +++ b/conf/default.env @@ -33,7 +33,7 @@ MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=tls MAIL_FROM_ADDRESS='__EMAIL__' -MAIL_FROM_NAME="__EMAIL_NAME__" +MAIL_FROM_NAME="__EMAIL_FIRSTNAME__ __EMAIL_LASTNAME__" POSTMARK_API_TOKEN= REQUIRE_HTTPS=false diff --git a/scripts/install b/scripts/install index 2ff4f8b..3229e81 100755 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,8 @@ app=$YNH_APP_INSTANCE_NAME api_secret="$(ynh_string_random --length=32)" app_key="$(ynh_string_random --length=32)" phantomjs_key="$(ynh_string_random --length=32)" -email_name="$(ynh_user_get_info $admin firstname) $(ynh_user_get_info $admin lastname)" +email_firstname="$(ynh_user_get_info $admin firstname)" +email_lastname="$(ynh_user_get_info $admin lastname)" email="$(ynh_user_get_info $admin mail)" #================================================= @@ -58,7 +59,8 @@ ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=api_secret --value=$api_secret ynh_app_setting_set --app=$app --key=app_key --value=$app_key ynh_app_setting_set --app=$app --key=phantomjs_key --value=$phantomjs_key -ynh_app_setting_set --app=$app --key=email_name --value=$email_name +ynh_app_setting_set --app=$app --key=email_firstname --value="$email_firstname" +ynh_app_setting_set --app=$app --key=email_lastname --value="$email_lastname" ynh_app_setting_set --app=$app --key=email --value=$email #================================================= @@ -123,7 +125,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Modifying a config file..." -ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" +ynh_add_config --template="default.env" --destination="$final_path/.env" + +chmod 400 "$final_path/.env" +chown $app:$app "$final_path/.env" #================================================= # STORE THE CHECKSUM OF THE CONFIG FILE diff --git a/scripts/upgrade b/scripts/upgrade index c528326..3ac45e0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,13 +12,14 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_script_progression --message="Loading installation settings..." --time --weight=1 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) is_public=$YNH_APP_ARG_IS_PUBLIC @@ -29,10 +30,10 @@ db_user=$db_name api_secret=$(ynh_app_setting_get --app=$app --key=api_secret) app_key=$(ynh_app_setting_get --app=$app --key=app_key) phantomjs_key=$(ynh_app_setting_get --app=$app --key=phantomjs_key) -email_name=$(ynh_app_setting_get --app=$app --key=email_name) +email_firstname=$(ynh_app_setting_get --app=$app --key=email_firstname) +email_lastname=$(ynh_app_setting_get --app=$app --key=email_lastname) email=$(ynh_app_setting_get --app=$app --key=email) -final_path=/var/www/$app #================================================= # CHECK VERSION @@ -48,40 +49,16 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name -fi - -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path -fi - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." +ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -90,19 +67,26 @@ ynh_system_user_create --username=$app --home_dir="$final_path" # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -config="$final_path/.env" -ynh_backup_if_checksum_is_different --file="$final_path/.env" - if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." + ynh_script_progression --message="Upgrading source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" fi +# FIXME: this should be managed by the core in the future +# Here, as a packager, you may have to tweak the ownerhsip/permissions +# such that the appropriate users (e.g. maybe www-data) can access +# files in some cases. +# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - +# this will be treated as a security issue. +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= -# UPGRADE DEPENDENCIES +# NGINX CONFIGURATION #================================================= ynh_script_progression --message="Upgrading dependencies..." @@ -135,15 +119,18 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= -# SPECIFIC UPGRADE -#================================================= -# MODIFY A CONFIG FILE +# UPDATE A CONFIG FILE #================================================= - if [ "$upgrade_type" == "UPGRADE_APP" ] - then - ynh_add_config --template="../conf/default.env" --destination="$final_path/.env" - fi +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Updating a configuration file..." + + ynh_add_config --template="default.env" --destination="$final_path/.env" + + chmod 400 "$final_path/.env" + chown $app:$app "$final_path/.env" +fi #================================================= # UPGRADE DATABASE From 76a570e908887de31864a483e5b4bf3d09ace78e Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 19 Sep 2021 14:20:02 +0200 Subject: [PATCH 41/61] make installation work --- scripts/upgrade | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3ac45e0..7d9c0de 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,7 +72,7 @@ then ynh_script_progression --message="Upgrading source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" fi # FIXME: this should be managed by the core in the future @@ -118,20 +118,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config --package="$extra_php_dependencies" -#================================================= -# UPDATE A CONFIG FILE -#================================================= - -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Updating a configuration file..." - - ynh_add_config --template="default.env" --destination="$final_path/.env" - - chmod 400 "$final_path/.env" - chown $app:$app "$final_path/.env" -fi - #================================================= # UPGRADE DATABASE #================================================= From 301a90169f0c586b9d293110814460e5bb0cd790 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 19 Sep 2021 20:18:54 +0200 Subject: [PATCH 42/61] make installation work --- scripts/upgrade | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7d9c0de..739633c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,7 +72,7 @@ then ynh_script_progression --message="Upgrading source files..." --time --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" + ynh_setup_source --dest_dir="$final_path" --keep=".env" fi # FIXME: this should be managed by the core in the future @@ -118,6 +118,20 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config --package="$extra_php_dependencies" +#================================================= +# UPDATE A CONFIG FILE +#================================================= + +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Updating a configuration file..." + + ynh_add_config --template="default.env" --destination="$final_path/.env" + + chmod 400 "$final_path/.env" + chown $app:$app "$final_path/.env" +fi + #================================================= # UPGRADE DATABASE #================================================= From b8fd235e510984b16506978a0e3588348d826398 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 19 Sep 2021 20:24:10 +0200 Subject: [PATCH 43/61] remove is_public from upgrade script --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 739633c..524354a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) -is_public=$YNH_APP_ARG_IS_PUBLIC db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) From 897af1109492b3534770640244e2b017b2fee02c Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 3 Oct 2021 10:32:13 +0200 Subject: [PATCH 44/61] try to fix nging --- conf/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4031a35..f6ad844 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,10 +5,10 @@ location ^~ __PATH__/ { # Path to source alias __FINALPATH__/public/; - try_files $uri $uri/ =404; + try_files $uri $uri/ index.php?q=; if (!-e $request_filename) { - rewrite ^(.+)$ /index.php?q= last; + rewrite ^(.+)$ __PATH__/index.php?q= last; } # Add headers to serve security related headers @@ -52,7 +52,7 @@ location ^~ __PATH__/ { } location ~* \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ { - try_files $uri __FINALPATH__/index.php$request_uri; + try_files $uri __FINALPATH__/public/index.php$request_uri; # Optional: Don't log access to other assets access_log off; } From 60e457a0617d76f8d90b5a1c26880f8b60338ed2 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 18:50:06 +0200 Subject: [PATCH 45/61] Update scripts/upgrade Co-authored-by: Alexandre Aubin --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 524354a..1301d98 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,7 +68,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --keep=".env" From c2721be22b7a545a664f7150d1a4e81a2b770a6e Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 19:06:52 +0200 Subject: [PATCH 46/61] remove time and weight options from script progression --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 524354a..9fbbf81 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..."=1 app=$YNH_APP_INSTANCE_NAME @@ -57,7 +57,7 @@ ynh_abort_if_errors #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..."=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -68,7 +68,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." --time --weight=1 + ynh_script_progression --message="Upgrading source files..."=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --keep=".env" From 5d4a640f2a445a7bf4d62d6dab09a4b0ba21397e Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 19:07:26 +0200 Subject: [PATCH 47/61] auto-generate app key --- conf/default.env | 8 ++++---- scripts/install | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/default.env b/conf/default.env index 91638a7..988ac4a 100644 --- a/conf/default.env +++ b/conf/default.env @@ -1,7 +1,9 @@ APP_NAME="Invoice Ninja" APP_ENV=production -APP_KEY=base64:3E5HVZ/T+VbZu+oA4GNlwnvwFe3jNtkGbR95K0uwr7A= +APP_KEY= + APP_DEBUG=false +EXPANDED_LOGGING=false APP_URL=https://__DOMAIN____PATH__ @@ -51,8 +53,6 @@ PHANTOMJS_KEY='__PHANTOMJS_KEY__' PHANTOMJS_SECRET=__APP_KEY__ UPDATE_SECRET=__API_SECRET__ - -COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' -SENTRY_LARAVEL_DSN=https://cc7e8e2c678041689e53e409b7dba236@sentry.invoicing.co/5 +API_SECRET=__API_SECRET__ PRECONFIGURED_INSTALL=true diff --git a/scripts/install b/scripts/install index 3229e81..dd75620 100755 --- a/scripts/install +++ b/scripts/install @@ -144,9 +144,10 @@ ynh_script_progression --message="Building the application..." pushd "$final_path" # Run the database migrations and initially fill the db - php$phpversion artisan optimize --no-interaction --verbose + php$phpversion artisan key:generate --no-interaction --verbose php$phpversion artisan migrate:fresh --seed --no-interaction --verbose --force php$phpversion artisan ninja:create-account --email $email --password changeme --no-interaction --verbose + php$phpversion artisan optimize --no-interaction --verbose php$phpversion artisan view:clear php$phpversion artisan cache:clear popd From 2e1fe65450ba8027991726a41fee1644956d28a5 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 19:07:40 +0200 Subject: [PATCH 48/61] fix nginx config --- conf/nginx.conf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index f6ad844..82bf57b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,12 +5,6 @@ location ^~ __PATH__/ { # Path to source alias __FINALPATH__/public/; - try_files $uri $uri/ index.php?q=; - - if (!-e $request_filename) { - rewrite ^(.+)$ __PATH__/index.php?q= last; - } - # Add headers to serve security related headers more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;"; more_set_headers "X-Content-Type-Options: nosniff"; @@ -22,6 +16,8 @@ location ^~ __PATH__/ { index index.php index.html index.htm; + try_files $uri $uri/ __PATH__/__PATH__/index.php?q=; + location ~ ^__PATH__/index\.php(/.*|)$ { fastcgi_split_path_info ^(.+?\.php)(/.*|)$; set $path_info $fastcgi_path_info; From 8ebdbe0a0934be50e8887195dfe59faeb02d1bfd Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 19:31:11 +0200 Subject: [PATCH 49/61] Enable sub dir test --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 4bd08b6..b3cdc64 100644 --- a/check_process +++ b/check_process @@ -8,7 +8,7 @@ password="1Strong-Password" ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 From 1d51c3dc81b59503dc1494ed47af2f87b7037f7b Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 20:54:48 +0200 Subject: [PATCH 50/61] store app key in yunohost so upgrade works --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index dd75620..68258ec 100755 --- a/scripts/install +++ b/scripts/install @@ -125,6 +125,10 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Modifying a config file..." +# generate app key and save it as a environment variable +app_key="php$phpversion artisan key:generate --show" +ynh_app_setting_set --app=$app --key=app_key --value=$app_key + ynh_add_config --template="default.env" --destination="$final_path/.env" chmod 400 "$final_path/.env" @@ -144,7 +148,6 @@ ynh_script_progression --message="Building the application..." pushd "$final_path" # Run the database migrations and initially fill the db - php$phpversion artisan key:generate --no-interaction --verbose php$phpversion artisan migrate:fresh --seed --no-interaction --verbose --force php$phpversion artisan ninja:create-account --email $email --password changeme --no-interaction --verbose php$phpversion artisan optimize --no-interaction --verbose From 9012b43b6eca106c31f8777124fe9509aef9a129 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 20:55:04 +0200 Subject: [PATCH 51/61] store app key in yunohost so upgrade works --- conf/default.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/default.env b/conf/default.env index 988ac4a..b6e171b 100644 --- a/conf/default.env +++ b/conf/default.env @@ -1,6 +1,6 @@ APP_NAME="Invoice Ninja" APP_ENV=production -APP_KEY= +APP_KEY=__APP_KEY__ APP_DEBUG=false EXPANDED_LOGGING=false From 1d240652b2befa7277214246aea28a5bf1e4ba1d Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sat, 30 Oct 2021 21:34:26 +0200 Subject: [PATCH 52/61] fix install --- scripts/install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 68258ec..c1f9152 100755 --- a/scripts/install +++ b/scripts/install @@ -125,11 +125,14 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Modifying a config file..." +ynh_add_config --template="default.env" --destination="$final_path/.env" + # generate app key and save it as a environment variable -app_key="php$phpversion artisan key:generate --show" +pushd "$final_path" + app_key="`php$phpversion artisan key:generate --show`" +popd ynh_app_setting_set --app=$app --key=app_key --value=$app_key -ynh_add_config --template="default.env" --destination="$final_path/.env" chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" From b18def9c2ee74af3f92967218951b44f7319a100 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Dec 2021 08:30:36 +0100 Subject: [PATCH 53/61] v5.3.39 --- check_process | 2 +- conf/app.src | 4 ++-- manifest.json | 6 ------ scripts/_common.sh | 3 +-- scripts/install | 5 ++--- scripts/remove | 18 +++++++++--------- scripts/restore | 7 ------- scripts/upgrade | 13 +++---------- 8 files changed, 18 insertions(+), 40 deletions(-) diff --git a/check_process b/check_process index b3cdc64..4bd08b6 100644 --- a/check_process +++ b/check_process @@ -8,7 +8,7 @@ password="1Strong-Password" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 diff --git a/conf/app.src b/conf/app.src index fa384d4..c5b41c0 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.3.1/invoiceninja.zip -SOURCE_SUM=dbcd9fb8db31bc155e425d4c1548f14b23937f36fd3e01ed598057e11a6ef31d +SOURCE_URL=https://github.com/invoiceninja/invoiceninja/releases/download/v5.3.39/invoiceninja.zip +SOURCE_SUM=a8d644c4e4a6c3f6f9a1492af8818ea27ac3c1a8dfa32ca2deefe6089dcc9109 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index ff18ab9..e5ec69e 100644 --- a/manifest.json +++ b/manifest.json @@ -35,12 +35,6 @@ "name": "domain", "type": "domain" }, - { - "name": "path", - "type": "path", - "example": "/", - "default": "/" - }, { "name": "admin", "type": "user" diff --git a/scripts/_common.sh b/scripts/_common.sh index 9388454..53032f1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,9 +8,8 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app #pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" -pkg_dependencies="phantomjs" -extra_php_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mysql" +pkg_dependencies="phantomjs php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mysql" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index c1f9152..69e0409 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url="/" admin=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE is_public=$YNH_APP_ARG_IS_PUBLIC @@ -115,7 +115,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -133,7 +133,6 @@ pushd "$final_path" popd ynh_app_setting_set --app=$app --key=app_key --value=$app_key - chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" diff --git a/scripts/remove b/scripts/remove index a46c348..563f4eb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,14 +32,6 @@ ynh_script_progression --message="Removing the MySQL database..." # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - -# Remove metapackage and its dependencies -#ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -61,9 +53,17 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing PHP-FPM configuration..." -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 0875bdd..2028b66 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,11 +33,6 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." - #================================================= # STANDARD RESTORATION STEPS #================================================= @@ -73,8 +68,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --package="$extra_php_dependencies" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c3c65f4..cb7e9e3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) @@ -33,7 +34,6 @@ email_firstname=$(ynh_app_setting_get --app=$app --key=email_firstname) email_lastname=$(ynh_app_setting_get --app=$app --key=email_lastname) email=$(ynh_app_setting_get --app=$app --key=email) - #================================================= # CHECK VERSION #================================================= @@ -74,12 +74,6 @@ then ynh_setup_source --dest_dir="$final_path" --keep=".env" fi -# FIXME: this should be managed by the core in the future -# Here, as a packager, you may have to tweak the ownerhsip/permissions -# such that the appropriate users (e.g. maybe www-data) can access -# files in some cases. -# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder - -# this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" @@ -107,15 +101,14 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." -# Create a dedicated php-fpm config -ynh_add_fpm_config --package="$extra_php_dependencies" +# Create a dedicated PHP-FPM config +ynh_add_fpm_config #================================================= # UPDATE A CONFIG FILE From 5883b0203e3c68161f55b8f21e7cc1d50bccfea5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Dec 2021 09:29:01 +0100 Subject: [PATCH 54/61] Fix --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e5ec69e..775592b 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "yunohost AT gumpri DOT ch" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 53032f1..d68741e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app #pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" -pkg_dependencies="phantomjs php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mysql" +pkg_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql" #================================================= # PERSONAL HELPERS From 7b30490287bf06441f0b01c6c8b5df3fdd7d2787 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Dec 2021 09:46:34 +0100 Subject: [PATCH 55/61] Fix --- conf/default.env | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/default.env b/conf/default.env index b6e171b..0533c99 100644 --- a/conf/default.env +++ b/conf/default.env @@ -47,7 +47,7 @@ TRUSTED_PROXIES= NINJA_ENVIRONMENT=selfhost #options - snappdf / phantom / hosted_ninja -PDF_GENERATOR=phantom +PDF_GENERATOR=snappdf PHANTOMJS_KEY='__PHANTOMJS_KEY__' PHANTOMJS_SECRET=__APP_KEY__ diff --git a/manifest.json b/manifest.json index 775592b..d153d0c 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Create and email invoices, track payments, expenses, and time tasks" }, - "version": "5.3.1~ynh1", + "version": "5.3.39~ynh1", "url": "https://invoiceninja.org", "upstream": { "license": "ELv2", From 5a5db33a5b5b96c79221fd8106bbf169c8b05014 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 22 Dec 2021 08:46:39 +0000 Subject: [PATCH 56/61] 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 135ce6b..c17d3a4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Create and email invoices, track payments, expenses, and time tasks -**Shipped version:** 5.3.1~ynh1 +**Shipped version:** 5.3.39~ynh1 **Demo:** https://app.invoiceninja.com/dashboard diff --git a/README_fr.md b/README_fr.md index 43d09df..f17b073 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour -**Version incluse :** 5.3.1~ynh1 +**Version incluse :** 5.3.39~ynh1 **Démo :** https://app.invoiceninja.com/dashboard From 6efab7be10e6d1f4d3c76ec807080c5e9dc989b0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Dec 2021 10:59:47 +0100 Subject: [PATCH 57/61] Fix --- check_process | 4 ++-- conf/default.env | 40 ++++++++++++++++++++-------------------- conf/systemd.service | 13 ------------- manifest.json | 12 ++++++++---- scripts/install | 18 ++++++------------ scripts/remove | 1 - scripts/restore | 1 - 7 files changed, 36 insertions(+), 53 deletions(-) delete mode 100644 conf/systemd.service diff --git a/check_process b/check_process index 4bd08b6..1dacf58 100644 --- a/check_process +++ b/check_process @@ -4,8 +4,8 @@ path="/path" admin="john" language="fr" - is_public=1 - password="1Strong-Password" + is_public=1 + password="1Strong-Password" ; Checks pkg_linter=1 setup_sub_dir=0 diff --git a/conf/default.env b/conf/default.env index 0533c99..2b177fa 100644 --- a/conf/default.env +++ b/conf/default.env @@ -1,21 +1,30 @@ -APP_NAME="Invoice Ninja" APP_ENV=production +APP_DEBUG=true +APP_NAME="Invoice Ninja" +APP_URL=https://__DOMAIN__ APP_KEY=__APP_KEY__ +APP_CIPHER=AES-256-CBC +APP_LOCALE=__LANGUAGE__ -APP_DEBUG=false EXPANDED_LOGGING=false -APP_URL=https://__DOMAIN____PATH__ - DB_CONNECTION=mysql -MULTI_DB_ENABLED=false - +DB_STRICT=false DB_HOST=localhost DB_DATABASE=__DB_NAME__ DB_USERNAME=__DB_NAME__ DB_PASSWORD=__DB_PWD__ DB_PORT=3306 +MAIL_MAILER=smtp +MAIL_HOST=localhost +MAIL_PORT=25 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS='__EMAIL__' +MAIL_FROM_NAME="__EMAIL_FIRSTNAME__ __EMAIL_LASTNAME__" + DEMO_MODE=false BROADCAST_DRIVER=log @@ -24,25 +33,16 @@ CACHE_DRIVER=file SESSION_DRIVER=file SESSION_LIFETIME=120 -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 +#REDIS_HOST=127.0.0.1 +#REDIS_PASSWORD=null +#REDIS_PORT=6379 -MAIL_MAILER=smtp -MAIL_HOST=smtp.__DOMAIN__ -MAIL_PORT=25 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=tls -MAIL_FROM_ADDRESS='__EMAIL__' -MAIL_FROM_NAME="__EMAIL_FIRSTNAME__ __EMAIL_LASTNAME__" - -POSTMARK_API_TOKEN= +#POSTMARK_API_TOKEN= REQUIRE_HTTPS=false GOOGLE_MAPS_API_KEY= ERROR_EMAIL= -TRUSTED_PROXIES= +TRUSTED_PROXIES=* NINJA_ENVIRONMENT=selfhost diff --git a/conf/systemd.service b/conf/systemd.service deleted file mode 100644 index d4d89d2..0000000 --- a/conf/systemd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=InvoiceNinja: Create and email invoices -After=network.target - -[Service] -Type=simple -User=__APP__ -Group=__APP__ -WorkingDirectory=__FINALPATH__ -ExecStart=__FINALPATH__/script >> /var/log/__APP__/__APP__.log 2>&1 - -[Install] -WantedBy=multi-user.target diff --git a/manifest.json b/manifest.json index d153d0c..2e76fc6 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "userdoc": "https://invoiceninja.github.io/", "code": "https://github.com/invoiceninja/invoiceninja" }, - "license": "AAL", + "license": "ELv2", "maintainer": { "name": "Sebastian Gumprich", "email": "yunohost AT gumpri DOT ch" @@ -53,9 +53,13 @@ "name": "is_public", "type": "boolean", "default": true, - "help": { - "en": "Since your clients should have the possibility to access your invoices, the app is public. If you only want to send invoices via mail (or not at all), deactivate public access" - } + "help": { + "en": "Since your clients should have the possibility to access your invoices, the app is public. If you only want to send invoices via mail (or not at all), deactivate public access" + } + }, + { + "name": "password", + "type": "password" } ] } diff --git a/scripts/install b/scripts/install index 69e0409..e95210a 100755 --- a/scripts/install +++ b/scripts/install @@ -25,6 +25,7 @@ path_url="/" admin=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE is_public=$YNH_APP_ARG_IS_PUBLIC +password=$YNH_APP_ARG_PASSWORD app=$YNH_APP_INSTANCE_NAME @@ -128,21 +129,14 @@ ynh_script_progression --message="Modifying a config file..." ynh_add_config --template="default.env" --destination="$final_path/.env" # generate app key and save it as a environment variable -pushd "$final_path" - app_key="`php$phpversion artisan key:generate --show`" -popd -ynh_app_setting_set --app=$app --key=app_key --value=$app_key +# pushd "$final_path" +# app_key="`php$phpversion artisan key:generate --show`" +# popd +# ynh_app_setting_set --app=$app --key=app_key --value=$app_key chmod 400 "$final_path/.env" chown $app:$app "$final_path/.env" -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/.env" - #================================================= # BUILD THE APPLICATION #================================================= @@ -151,7 +145,7 @@ ynh_script_progression --message="Building the application..." pushd "$final_path" # Run the database migrations and initially fill the db php$phpversion artisan migrate:fresh --seed --no-interaction --verbose --force - php$phpversion artisan ninja:create-account --email $email --password changeme --no-interaction --verbose + php$phpversion artisan ninja:create-account --email $email --password $password --no-interaction --verbose php$phpversion artisan optimize --no-interaction --verbose php$phpversion artisan view:clear php$phpversion artisan cache:clear diff --git a/scripts/remove b/scripts/remove index 563f4eb..b43b1a7 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,7 +17,6 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) 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) diff --git a/scripts/restore b/scripts/restore index 2028b66..2e379db 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) From 0fb23cc6fe8134b0385f11a13d3adc710dd6843e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Dec 2021 14:39:25 +0100 Subject: [PATCH 58/61] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e95210a..f1b0c19 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ admin=$YNH_APP_ARG_ADMIN language=$YNH_APP_ARG_LANGUAGE is_public=$YNH_APP_ARG_IS_PUBLIC password=$YNH_APP_ARG_PASSWORD - +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME api_secret="$(ynh_string_random --length=32)" From 55ae72b32624df190fb8bf310421bc87a94faa27 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 6 Feb 2022 21:18:22 +0000 Subject: [PATCH 59/61] Apply suggestions from code review --- README.md | 5 ++--- README_fr.md | 2 +- conf/default.env | 2 +- conf/nginx.conf | 4 ++++ doc/DISCLAIMER.md | 5 ++--- manifest.json | 3 ++- scripts/_common.sh | 1 - 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c17d3a4..f9e856a 100644 --- a/README.md +++ b/README.md @@ -31,18 +31,17 @@ Create and email invoices, track payments, expenses, and time tasks This is the new version of InvoiceNinja. There are several things not working at the moment: -* migration from v4 * installation into a sub-directory * sending mails -Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. +Invoice Ninja is the the leading self-hosted invoicing platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. ## YunoHost specific features #### Multi-user support * There is no official LDAP support -* The first user gets created after installing Invoice Ninja +* The first user gets created after installing Invoice Ninja. The email-address is the one of your administrator user of the app. The password is the administration password you provided while installing. * Other users can be created from inside the application ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index f17b073..70fe37f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,7 +38,7 @@ Invoice Ninja is the #1 open-source platform to create & email invoices, track p #### Multi-user support * There is no official LDAP support -* The first user gets created after installing Invoice Ninja +* The first user gets created after installing Invoice Ninja. The email-address is the one of your administrator user of the app. The password is the administration password you provided while installing. * Other users can be created from inside the application ## Documentations et ressources diff --git a/conf/default.env b/conf/default.env index 2b177fa..c5210f1 100644 --- a/conf/default.env +++ b/conf/default.env @@ -1,5 +1,5 @@ APP_ENV=production -APP_DEBUG=true +APP_DEBUG=false APP_NAME="Invoice Ninja" APP_URL=https://__DOMAIN__ APP_KEY=__APP_KEY__ diff --git a/conf/nginx.conf b/conf/nginx.conf index 82bf57b..1cbd20f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -15,6 +15,10 @@ location ^~ __PATH__/ { more_set_headers "Referrer-Policy: no-referrer"; index index.php index.html index.htm; + + if (!-e $request_filename) { + rewrite ^(.+)$ /index.php?q= last; + } try_files $uri $uri/ __PATH__/__PATH__/index.php?q=; diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 9536ce9..d2f61f2 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -2,16 +2,15 @@ This is the new version of InvoiceNinja. There are several things not working at the moment: -* migration from v4 * installation into a sub-directory * sending mails -Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. +Invoice Ninja is the the leading self-hosted invoicing platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. ## YunoHost specific features #### Multi-user support * There is no official LDAP support -* The first user gets created after installing Invoice Ninja +* The first user gets created after installing Invoice Ninja. The email-address is the one of your administrator user of the app. The password is the administration password you provided while installing. * Other users can be created from inside the application diff --git a/manifest.json b/manifest.json index 2e76fc6..95d42b4 100644 --- a/manifest.json +++ b/manifest.json @@ -59,7 +59,8 @@ }, { "name": "password", - "type": "password" + "type": "password", + "help": "Password must contain an upper case character and a number." } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index d68741e..7b44130 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,6 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app -#pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" pkg_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql" From 6585f151543b072f09d2781d8e7cbd6269198e36 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 6 Feb 2022 21:18:25 +0000 Subject: [PATCH 60/61] Auto-update README --- README_fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 70fe37f..5ade938 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,11 +27,10 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour This is the new version of InvoiceNinja. There are several things not working at the moment: -* migration from v4 * installation into a sub-directory * sending mails -Invoice Ninja is the #1 open-source platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. +Invoice Ninja is the the leading self-hosted invoicing platform to create & email invoices, track payments and expenses, and time billable tasks & projects for clients. ## YunoHost specific features From 3ba64a8a11677b2d5b8c55b094e9c417c622a4b3 Mon Sep 17 00:00:00 2001 From: Sebastian Gumprich Date: Sun, 6 Feb 2022 22:27:03 +0100 Subject: [PATCH 61/61] add dependencies for snappdf --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7b44130..ccb44ff 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql" +pkg_dependencies="php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql libnss3-dev libatk1.0-0 libatk-bridge2.0-0 libxcomposite1 libxrandr2 libasound2" #================================================= # PERSONAL HELPERS