diff --git a/.gitignore b/.gitignore index ece11d8..77599c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -nbproject ._* .buildpath .DS_Store @@ -8,7 +7,6 @@ nbproject *.cache migrations !tests/migrations -*.sublime-* vagrant/.vagrant/ vagrant/*.log vendor/ @@ -22,4 +20,6 @@ module/ npm-debug.log node_modules/ bin/ +!data/import/files/.gitkeep data/* +.docker/mariaDb/data/* diff --git a/composer.lock b/composer.lock index c1ae0f9..1359df9 100644 --- a/composer.lock +++ b/composer.lock @@ -1086,16 +1086,16 @@ }, { "name": "doctrine/doctrine-laminas-hydrator", - "version": "3.2.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine-laminas-hydrator.git", - "reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba" + "reference": "84610892fb75584e9c85724b3032f5826b833b69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba", - "reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba", + "url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/84610892fb75584e9c85724b3032f5826b833b69", + "reference": "84610892fb75584e9c85724b3032f5826b833b69", "shasum": "" }, "require": { @@ -1148,7 +1148,7 @@ "type": "tidelift" } ], - "time": "2022-11-18T09:49:57+00:00" + "time": "2023-02-06T09:18:11+00:00" }, { "name": "doctrine/doctrine-module", @@ -8058,12 +8058,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "92f4424ad5419a427f950f7d1df1aae30b02687d" + "reference": "90538aab13dced1209eb1b30e169308fea0fd783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/92f4424ad5419a427f950f7d1df1aae30b02687d", - "reference": "92f4424ad5419a427f950f7d1df1aae30b02687d", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/90538aab13dced1209eb1b30e169308fea0fd783", + "reference": "90538aab13dced1209eb1b30e169308fea0fd783", "shasum": "" }, "conflict": { @@ -8087,6 +8087,7 @@ "arc/web": "<3", "area17/twill": "<1.2.5|>=2,<2.5.3", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", + "automad/automad": "<1.8", "awesome-support/awesome-support": "<=6.0.7", "aws/aws-sdk-php": ">=3,<3.2.1", "backdrop/backdrop": "<=1.23", @@ -8451,6 +8452,7 @@ "sukohi/surpass": "<1", "sulu/sulu": "= 2.4.0-RC1|<1.6.44|>=2,<2.2.18|>=2.3,<2.3.8", "sumocoders/framework-user-bundle": "<1.4", + "swag/paypal": "<5.4.4", "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", @@ -8620,7 +8622,7 @@ "type": "tidelift" } ], - "time": "2023-02-03T01:33:09+00:00" + "time": "2023-02-04T01:32:15+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index 358a1b4..ccbfe8c 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -10,6 +10,9 @@ * in ZendSkeletonApplication. This is a good practice, as it prevents sensitive * credentials from accidentally being committed into version control. */ + +$appdir = getenv('APP_DIR') ?: '/var/lib/monarc'; + $package_json = json_decode(file_get_contents('./package.json'), true); return [ @@ -113,4 +116,9 @@ return [ 'baseUrl' => 'http://127.0.0.1:5005', 'apiKey' => '', ], + + 'import' => [ + 'uploadFolder' => $appdir . '/data/import/files', + 'isBackgroundProcessActive' => false, + ], ]; diff --git a/data/import/files/.gitkeep b/data/import/files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/scripts/run-background-import-for-all-clients.sh b/scripts/run-background-import-for-all-clients.sh new file mode 100644 index 0000000..4bd283f --- /dev/null +++ b/scripts/run-background-import-for-all-clients.sh @@ -0,0 +1,19 @@ +#! /usr/bin/env bash + +# local use: +#for conf_file_path in /home/vagrant/monarc/config/*/local.php + +for conf_file_path in /var/www/*/local.php +do + config_path=$(dirname "$conf_file_path") + export APP_CONF_DIR=$config_path + + echo "[$(date)] Import analyses for: $config_path." + + # local use: + #./bin/console monarc:import-analyses >> data/background_import.log + + /var/lib/monarc/fo/bin/console monarc:import-analyses >> "$config_path"/data/background_import.log + + echo "[$(date)] Finished." +done