diff --git a/conf/database.json b/conf/database.json index e3e2ca6..efdf529 100644 --- a/conf/database.json +++ b/conf/database.json @@ -1,6 +1,14 @@ { - "OmbiDatabase": { - "Type":"MySQL", - "ConnectionString":"Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" +"OmbiDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" + }, +"SettingsDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" + }, +"ExternalDatabase": { + "Type": "MySQL", + "ConnectionString": "Server=localhost;Port=3306;Database=__DB_NAME__;User=__DB_USER__;Password=__DB_PWD__" } } diff --git a/scripts/upgrade b/scripts/upgrade index 5f83177..741bd9a 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="database.json" 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