diff --git a/README.md b/README.md index c9699c3..a555ec6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in IT documentation, ticketing and accounting system for small MSPs. -**Shipped version:** 2023.10.04~ynh1 +**Shipped version:** 2023.10.09~ynh1 **Demo:** https://demo.itflow.org/ diff --git a/README_fr.md b/README_fr.md index 2334b94..ead4e5e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Système de documentation, de billetterie et de comptabilité pour les petits MSP -**Version incluse :** 2023.10.04~ynh1 +**Version incluse :** 2023.10.09~ynh1 **Démo :** https://demo.itflow.org/ diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 6138a15..3c3b7ec 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,3 +1,3 @@ -data base name `__DB_NAME__` -data base user `__DB_NAME__` -data base password `__DB_PWD__` \ No newline at end of file +Database name `__DB_NAME__` +Database user `__DB_NAME__` +Database password `__DB_PWD__` \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..d724a75 --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,3 @@ +Nom de la base de données `__DB_NAME__` +Utilisateur de la base de données `__DB_NAME__` +Mot de passe de la base de données `__DB_PWD__` \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 9cc0817..2978d5e 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 = "2023.10.04~ynh1" +version = "2023.10.09~ynh1" maintainers = ["eric_G"] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/itflow-org/itflow/archive/7e595d943611299c5e91affb8519055f2208a1c8.tar.gz" - sha256 = "a7afbb248c46932f128e29002cc168debef1781133346c5faaf3fcbb62df4cbb" + url = "https://github.com/itflow-org/itflow/archive/537f18efd263a2ad5bf2518100288e8f336ff57e.tar.gz" + sha256 = "188df292d802244e84423b2ac6bd713afd41848372d5818aad9add2d16f847dd" autoupdate.upstream = "https://github.com/itflow-org/itflow" autoupdate.strategy = "latest_github_commit" diff --git a/scripts/install b/scripts/install index 3269ce2..ed0272b 100755 --- a/scripts/install +++ b/scripts/install @@ -26,10 +26,8 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf ynh_add_fpm_config -# Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 48c6521..1004b45 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,7 +29,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" + ynh_setup_source --dest_dir="$install_dir" #--keep="config.php" fi chown -R $app:www-data "$install_dir" diff --git a/tests.toml b/tests.toml index 26bb7e4..94abb79 100644 --- a/tests.toml +++ b/tests.toml @@ -3,65 +3,3 @@ test_format = 1.0 [default] - - # ------------ - # Tests to run - # ------------ - - # NB: the tests to run are automatically deduced by the CI script according to the - # content of the app's manifest. The declarations below allow to customize which - # tests are ran, possibly add special test suite to test special args, or - # declare which commits to test upgrade from. - # - # You can also decide (though this is discouraged!) to ban/ignore some tests, - - exclude = ["install.private", "install.multi"] - # The test IDs to be used in only/exclude statements are: - # * install.root - # * install.subdir - # * install.nourl - # * install.multi - # * backup_restore - # * upgrade - # * upgrade.someCommitId - # * change_url - # NB: you should NOT need this except if you really have a good reason... - - # For special usecases, sometimes you need to setup other things on the machine - # prior to installing the app (such as installing another app) - # (Remove this key entirely if not needed) - preinstall = """ - sudo yunohost app install foobar - sudo yunohost user list - """ - - # ------------------------------- - # Default args to use for install - # ------------------------------- - - # By default, the CI will automagically fill the 'standard' args - # such as domain, path, admin, is_public and password with relevant values - # and also install args with a "default" provided in the manifest.. - # It should only make sense to declare custom args here for args with no default values - - args.language = "fr_FR" - args.multisite = 0 - # NB: you should NOT need those lines unless for custom questions with no obvious/default value - - # ------------------------------- - # Commits to test upgrade from - # ------------------------------- - - test_upgrade_from.00a1a6e7.name = "Upgrade from 5.4" - test_upgrade_from.00a1a6e7.args.foo = "bar" - - -# This is an additional test suite -[some_additional_testsuite] - - # On additional tests suites, you can decide to run only specific tests - - only = ["install.subdir"] - - args.language = "en_GB" - args.multisite = 1