From 2b006aaf4ce0f82a8ecd42f320abe79758280a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 19:08:37 +0200 Subject: [PATCH 1/7] cleaning --- doc/ADMIN.md | 3 --- doc/ADMIN_fr.md | 3 --- scripts/install | 8 ++++---- scripts/restore | 2 -- scripts/upgrade | 15 ++++----------- 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 doc/ADMIN.md delete mode 100644 doc/ADMIN_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100644 index c9b5225..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1,3 +0,0 @@ -This is a dummy admin doc for this app - -The app install dir is `__INSTALL_DIR__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md deleted file mode 100644 index a138028..0000000 --- a/doc/ADMIN_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -Ceci est une fausse doc d'admin pour cette app - -Le dossier d'install de l'app est `__INSTALL_DIR__` diff --git a/scripts/install b/scripts/install index da8e855..9d16cbe 100755 --- a/scripts/install +++ b/scripts/install @@ -41,12 +41,12 @@ chmod 644 "/etc/cron.d/$app" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" +#ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" -chmod 400 "$install_dir/config.php" -chown $app:$app "$install_dir/config.php" +#chmod 400 "$install_dir/config.php" +#chown $app:$app "$install_dir/config.php" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 154a1aa..a95a754 100755 --- a/scripts/restore +++ b/scripts/restore @@ -46,8 +46,6 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -# Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" 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 584ac13..48c6521 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,19 +48,12 @@ ynh_add_nginx_config #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=1 +#ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" +#ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" -chmod 400 "$install_dir/config.php" -chown $app:$app "$install_dir/config.php" - -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 - -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +#chmod 400 "$install_dir/config.php" +#chown $app:$app "$install_dir/config.php" #================================================= # END OF SCRIPT From 40d2e45d01f4b29c860e8c57e18d9def0a9674c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 19:09:08 +0200 Subject: [PATCH 2/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9fb3a03..c59c9b4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Itflow" description.en = "IT documentation, ticketing and accounting system for small MSPs" description.fr = "Système de documentation, de billetterie et de comptabilité pour les petits MSP" -version = "1.0~ynh1" +version = "2023.10.04~ynh1" maintainers = ["eric_G"] From 19e72a3cfdd236660417e2404bad55feac726864 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 4 Oct 2023 17:09:14 +0000 Subject: [PATCH 3/7] 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 6020095..663fbb8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in This is a dummy description of this app features -**Shipped version:** 1.0~ynh1 +**Shipped version:** 2023.10.04~ynh1 **Demo:** https://demo.itflow.org/ diff --git a/README_fr.md b/README_fr.md index 439f834..a2b1df4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Ceci est une fausse description des fonctionalités de l'app -**Version incluse :** 1.0~ynh1 +**Version incluse :** 2023.10.04~ynh1 **Démo :** https://demo.itflow.org/ From c13545c1c34d85d0a2d92059a400fef7c25a3244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 19:20:48 +0200 Subject: [PATCH 4/7] cleaning --- conf/config.php | 13 +++++++++++++ scripts/install | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/conf/config.php b/conf/config.php index e69de29..8922d36 100644 --- a/conf/config.php +++ b/conf/config.php @@ -0,0 +1,13 @@ + Date: Wed, 4 Oct 2023 19:26:01 +0200 Subject: [PATCH 5/7] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index 8922d36..3849b68 100644 --- a/conf/config.php +++ b/conf/config.php @@ -7,7 +7,7 @@ $database = '__DB_NAME__'; $mysqli = mysqli_connect($dbhost, $dbusername, $dbpassword, $database) or die('Database Connection Failed'); $config_app_name = 'ITFlow'; $config_base_url = '__DOMAIN____PATH__'; -$config_https_only = TRUE; +$config_https_only = false; $repo_branch = 'master'; $installation_id = 'BmBuGzc3WzV33egS36g0K3miyQGWOfKP'; $config_enable_setup = 0; From 23a175bda435902b74a8ec7eb5a3e2df837004a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 19:30:12 +0200 Subject: [PATCH 6/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 307c051..0109543 100755 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" -chmod 644 "$install_dir/config.php" +chmod 755 "$install_dir/config.php" chown $app:$app "$install_dir/config.php" #================================================= From 25a700767699640af8ee35127ac6e3b587ca89fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 4 Oct 2023 19:32:32 +0200 Subject: [PATCH 7/7] cleaning --- doc/POST_INSTALL.md | 5 +++-- scripts/install | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index f799f29..6138a15 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,2 +1,3 @@ -db name `__DB_NAME__` -db pwd `__DB_PWD__` \ No newline at end of file +data base name `__DB_NAME__` +data base user `__DB_NAME__` +data base password `__DB_PWD__` \ No newline at end of file diff --git a/scripts/install b/scripts/install index 0109543..3269ce2 100755 --- a/scripts/install +++ b/scripts/install @@ -41,12 +41,12 @@ chmod 644 "/etc/cron.d/$app" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" +#ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" -chmod 755 "$install_dir/config.php" -chown $app:$app "$install_dir/config.php" +#chmod 644 "$install_dir/config.php" +#chown $app:$app "$install_dir/config.php" #================================================= # END OF SCRIPT