The new version pre-setup.

feature/remove-db-abstract
Ruslan Baidan 2024-08-21 16:47:09 +02:00
parent f04efb579a
commit a435bea784
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
6 changed files with 22 additions and 34 deletions

View File

@ -1 +1 @@
{"major":2, "minor":12, "hotfix":7} {"major":2, "minor":13, "hotfix":1}

View File

@ -46,8 +46,8 @@
"ext-pdo": "*", "ext-pdo": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-openssl": "*", "ext-openssl": "*",
"monarc/frontoffice": "^2.12.6", "monarc/frontoffice": "^2.13",
"monarc/core": "^2.12.6", "monarc/core": "^2.13",
"laminas/laminas-mvc": "^3.1", "laminas/laminas-mvc": "^3.1",
"laminas/laminas-di": "^3.1", "laminas/laminas-di": "^3.1",
"laminas/laminas-permissions-rbac": "^3.0", "laminas/laminas-permissions-rbac": "^3.0",

View File

@ -54,39 +54,11 @@ return [
'index' => 4, 'index' => 4,
'label' => 'Nederlands', 'label' => 'Nederlands',
], ],
'es' => [
'index' => 5,
'label' => 'Spanish',
],
'ro' => [
'index' => 6,
'label' => 'Romanian',
],
'it' => [
'index' => 7,
'label' => 'Italian',
],
'pt' => [
'index' => 9,
'label' => 'Portuguese',
],
'pl' => [
'index' => 10,
'label' => 'Polish',
],
'jp' => [
'index' => 11,
'label' => 'Japanese',
],
'zh' => [
'index' => 12,
'label' => 'Chinese',
],
], ],
'defaultLanguageIndex' => 1, 'defaultLanguageIndex' => 1,
'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','zh'), 'activeLanguages' => ['fr','en','de','nl','es','ro','it','ja','pl','pt','zh'],
'appVersion' => $package_json['version'], 'appVersion' => $package_json['version'],
@ -121,4 +93,12 @@ return [
'uploadFolder' => $appdir . '/data/import/files', 'uploadFolder' => $appdir . '/data/import/files',
'isBackgroundProcessActive' => false, 'isBackgroundProcessActive' => false,
], ],
/* Custom configuration of the smtp. The example config below is to make Mailcatcher work for the dev env.
'smtpOptions' => [
'name' => 'localhost',
'host' => '127.0.0.1',
'port' => 1025,
],
*/
]; ];

View File

@ -1,6 +1,6 @@
{ {
"name": "MONARC", "name": "MONARC",
"version": "2.12.7", "version": "2.13.1",
"description": "Monarc front office application", "description": "Monarc front office application",
"private": true, "private": true,
"repository": { "repository": {

3
vagrant/Vagrantfile vendored
View File

@ -26,6 +26,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.network :forwarded_port, guest: 5005, host: 5005 config.vm.network :forwarded_port, guest: 5005, host: 5005
config.vm.network :forwarded_port, guest: 3306, host: 3306 config.vm.network :forwarded_port, guest: 3306, host: 3306
config.vm.network :forwarded_port, guest: 5432, host: 5435 config.vm.network :forwarded_port, guest: 5432, host: 5435
config.vm.network :forwarded_port, guest: 1080, host: 1080
# Create a private network, which allows host-only access to the machine # Create a private network, which allows host-only access to the machine
# using a specific IP. # using a specific IP.
@ -57,7 +58,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# #
# # Use VBoxManage to customize the VM. For example to change memory: # # Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "4092"] vb.customize ["modifyvm", :id, "--memory", "4092"]
vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 22.04 - DEV"] vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 22.04 - NEW DEV"]
end end
# #
# View the documentation for the provider you're using for more # View the documentation for the provider you're using for more

View File

@ -394,6 +394,12 @@ sudo npm install -g grunt-cli
echo -e "\n--- Create initial user and client ---\n" echo -e "\n--- Create initial user and client ---\n"
php ./bin/phinx seed:run -c ./module/Monarc/FrontOffice/migrations/phinx.php php ./bin/phinx seed:run -c ./module/Monarc/FrontOffice/migrations/phinx.php
echo -e "\n--- Install and run mailcatcher ---\n"
sudo apt-get install -y build-essential software-properties-common
sudo apt-get install -y libsqlite3-dev ruby-dev
sudo gem install mailcatcher
sudo mailcatcher --http-ip 0.0.0.0
echo -e "\n--- Restarting Apache… ---\n" echo -e "\n--- Restarting Apache… ---\n"
sudo systemctl restart apache2.service > /dev/null sudo systemctl restart apache2.service > /dev/null
@ -401,3 +407,4 @@ sudo systemctl restart apache2.service > /dev/null
echo -e "MONARC is ready and available at http://127.0.0.1:5001" echo -e "MONARC is ready and available at http://127.0.0.1:5001"
echo -e "Stats service is ready and available at http://127.0.0.1:$STATS_PORT" echo -e "Stats service is ready and available at http://127.0.0.1:$STATS_PORT"
echo -e "Mailcatcher is available http://127.0.0.1:1080"