diff --git a/.gitignore b/.gitignore index 77599c3..aed88b9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,5 @@ module/ npm-debug.log node_modules/ bin/ -!data/import/files/.gitkeep data/* .docker/mariaDb/data/* diff --git a/INSTALL/INSTALL.debian10.md b/INSTALL/INSTALL.debian10.md index fbc499f..cb07a7a 100644 --- a/INSTALL/INSTALL.debian10.md +++ b/INSTALL/INSTALL.debian10.md @@ -81,7 +81,9 @@ https://github.com/monarc-project/MonarcAppFO/blob/master/vagrant/bootstrap.sh#L $ git clone https://github.com/monarc-project/MonarcAppFO.git /var/lib/monarc/fo $ cd /var/lib/monarc/fo $ mkdir -p data/cache + $ mkdir -p data/DoctrineORMModule/Proxy $ mkdir -p data/LazyServices/Proxy + $ mkdir -p data/import/files $ composer install -o # chown -R www-data:www-data data/ # chmod -R 700 data/ diff --git a/INSTALL/INSTALL.rhel7.9.md b/INSTALL/INSTALL.rhel7.9.md index 3846ae2..a259c0f 100644 --- a/INSTALL/INSTALL.rhel7.9.md +++ b/INSTALL/INSTALL.rhel7.9.md @@ -114,6 +114,8 @@ CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_ge [root@monarc ~]# cd /var/www/html/monarc/fo [root@monarc fo]# mkdir -p data/cache [root@monarc fo]# mkdir -p data/LazyServices/Proxy +[root@monarc fo]# mkdir -p data/DoctrineORMModule/Proxy +[root@monarc fo]# mkdir -p data/import/files [root@monarc fo]# chmod -R g+w data [root@monarc fo]# yum remove php-5.4.16 php-cli-5.4.16 php-common-5.4.16 ``` diff --git a/INSTALL/INSTALL.ubuntu1804.md b/INSTALL/INSTALL.ubuntu1804.md index 3b6ee1d..dc166d5 100644 --- a/INSTALL/INSTALL.ubuntu1804.md +++ b/INSTALL/INSTALL.ubuntu1804.md @@ -81,6 +81,7 @@ Especially by setting a strong root password. $ mkdir -p data/cache $ mkdir -p data/DoctrineORMModule/Proxy $ mkdir -p data/LazyServices/Proxy + $ mkdir -p data/import/files $ chmod -R g+w data $ composer install -o diff --git a/INSTALL/INSTALL.ubuntu2004.md b/INSTALL/INSTALL.ubuntu2004.md index 36465ed..14f5383 100644 --- a/INSTALL/INSTALL.ubuntu2004.md +++ b/INSTALL/INSTALL.ubuntu2004.md @@ -103,7 +103,7 @@ $ tar -xzf /var/lib/monarc/releases/`basename $MONARCFO_RELEASE_URL` -C /var/lib # Create release symlink $ ln -s /var/lib/monarc/releases/`basename $MONARCFO_RELEASE_URL | sed 's/.tar.gz//'` $PATH_TO_MONARC # Create data and caches directories -$ mkdir -p $PATH_TO_MONARC_DATA/cache $PATH_TO_MONARC_DATA/DoctrineORMModule/Proxy $PATH_TO_MONARC_DATA/LazyServices/Proxy +$ mkdir -p $PATH_TO_MONARC_DATA/cache $PATH_TO_MONARC_DATA/DoctrineORMModule/Proxy $PATH_TO_MONARC_DATA/LazyServices/Proxy $PATH_TO_MONARC_DATA/import/files # Create data directory symlink $ ln -s $PATH_TO_MONARC_DATA $PATH_TO_MONARC/data ``` diff --git a/data/import/files/.gitkeep b/data/import/files/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index e372098..2d368d9 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -377,6 +377,7 @@ echo -e "\n--- Creating cache folders for backend… ---\n" mkdir -p $PATH_TO_MONARC/data/cache mkdir -p $PATH_TO_MONARC/data/LazyServices/Proxy mkdir -p $PATH_TO_MONARC/data/DoctrineORMModule/Proxy +mkdir -p $PATH_TO_MONARC/data/import/files echo -e "\n--- Adjusting user mod… ---\n"