From ca0fe37a9d6dd7e7734c18847dcb919139325dfe Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 29 Jul 2021 11:33:14 +0800 Subject: [PATCH 1/2] Added how to install Apache --- admin/README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ web/README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/admin/README.md b/admin/README.md index 15a0a5ac..0ef12057 100644 --- a/admin/README.md +++ b/admin/README.md @@ -75,3 +75,54 @@ The 'upload' folder is for user uploaded files. DO NOT delete/move/overwrite the ``` /var/www/html/admin/upload ``` + + +## Install Apache2 Server +sudo apt-get install apache2 + +* Configure Apache2 +``` +$ sudo vi /etc/apache2/ports.conf +``` +add a Listen +``` +Listen 8001 +``` +$ sudo vi /etc/apache2/sites-available/000-default.conf +``` +Add a new 'VirtualHost' as below +``` + + ServerAdmin MyEMS-admin + DocumentRoot /var/www/admin + + + Options FollowSymLinks + AllowOverride All + Require all granted + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + +``` +* Download myems-admin +``` +$ cd ~ +$ git clone https://github.com/MyEMS/myems.git +``` +Build and Compress +``` +$ cd ~/myems/admin/ +$ sudo npm run build +$ tar czvf myems-admin.tar.gz build +``` +Install Upload the file myems-admin.tar.gz to you admin server. Note that the following path should be same as that was configured in nginx.conf. +``` +$ tar xzf myems-admin.tar.gz +$ sudo rm -r /var/www/admin +$ sudo mv build /var/www/admin +``` +Restart Apache2 +``` +$ sudo service apache2 restart +``` \ No newline at end of file diff --git a/web/README.md b/web/README.md index 9664cc61..6804aba4 100644 --- a/web/README.md +++ b/web/README.md @@ -104,3 +104,54 @@ $ sudo systemctl restart nginx $ sudo rm -r /var/www/html/web $ sudo mv build /var/www/html/web ``` + +## Install Apache2 Server +sudo apt-get install apache2 + +* Configure Apache2 +``` +$ sudo vi /etc/apache2/ports.conf +``` +add a Listen +``` +Listen 8002 +``` +$ sudo vi /etc/apache2/sites-available/000-default.conf +``` +Add a new 'VirtualHost' as below +``` + + ServerAdmin MyEMS-web + DocumentRoot /var/www/web + + + Options FollowSymLinks + AllowOverride All + Require all granted + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + +* Download myems-web +``` +$ cd ~ +$ git clone https://github.com/MyEMS/myems.git +``` +Build and Compress +``` +$ cd ~/myems/web/ +$ sudo npm run build +$ tar czvf myems-web.tar.gz build +``` +Install Upload the file myems-web.tar.gz to you web server. Note that the following path should be same as that was configured in nginx.conf. +``` +$ tar xzf myems-web.tar.gz +$ sudo rm -r /var/www/web +$ sudo mv build /var/www/web + +``` +Restart Apache2 +``` +$ sudo service apache2 restart +``` \ No newline at end of file From fcc2c3e30bcda9dfc07a9e3c0bfc4d306f533412 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 29 Jul 2021 13:26:50 +0800 Subject: [PATCH 2/2] updated REAEME files in Admin UI and Web UI --- admin/README.md | 37 ++++++++++++++++---------------- web/README.md | 56 ++++++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 43 deletions(-) diff --git a/admin/README.md b/admin/README.md index 0ef12057..1ecae0b2 100644 --- a/admin/README.md +++ b/admin/README.md @@ -8,9 +8,9 @@ Providing admin panel for MyEMS system administration and configuration nginx-1.18.0 or later -## Installation +## Option 1: Install on NGINX Server -* Install NGINX Server +* Install NGINX Server refer to http://nginx.org/en/docs/install.html @@ -53,7 +53,7 @@ Add a new 'server' section with direstives as below: } ``` -* Download myems-admin +* Download myems ``` $ cd ~ $ git clone https://github.com/MyEMS/myems.git @@ -77,17 +77,20 @@ The 'upload' folder is for user uploaded files. DO NOT delete/move/overwrite the ``` -## Install Apache2 Server -sudo apt-get install apache2 +## Option 2: Install on Apache2 Server +* Install Apache2 Server + +refer to https://httpd.apache.org/docs/2.4/install.html * Configure Apache2 ``` -$ sudo vi /etc/apache2/ports.conf + $ sudo vi /etc/apache2/ports.conf ``` -add a Listen +Add a Listen ``` Listen 8001 ``` +``` $ sudo vi /etc/apache2/sites-available/000-default.conf ``` Add a new 'VirtualHost' as below @@ -105,24 +108,20 @@ Add a new 'VirtualHost' as below CustomLog ${APACHE_LOG_DIR}/access.log combined ``` + * Download myems-admin ``` $ cd ~ $ git clone https://github.com/MyEMS/myems.git ``` -Build and Compress + +* Install myems-admin : + If the server can not connect to the internet, please compress the myems/admin folder and upload it to the server and extract it to ~/myems/admin ``` -$ cd ~/myems/admin/ -$ sudo npm run build -$ tar czvf myems-admin.tar.gz build +$ sudo cp -r ~/myems/admin /var/www/html/admin +$ sudo chmod 0755 -R /var/www/html/admin ``` -Install Upload the file myems-admin.tar.gz to you admin server. Note that the following path should be same as that was configured in nginx.conf. + Check the config file and change it if necessary: ``` -$ tar xzf myems-admin.tar.gz -$ sudo rm -r /var/www/admin -$ sudo mv build /var/www/admin -``` -Restart Apache2 -``` -$ sudo service apache2 restart +$ sudo nano /var/www/html/admin/app/api.js ``` \ No newline at end of file diff --git a/web/README.md b/web/README.md index 6804aba4..be402f5c 100644 --- a/web/README.md +++ b/web/README.md @@ -30,7 +30,7 @@ This will create an optimized production build by compililing, merging and minif You can run 'node server.js' to run the production build locally at http://localhost:5000. -## Install Production Build on NGINX Server +## Option 1: Install Production Build on NGINX Server * Install NGINX Server @@ -105,22 +105,25 @@ $ sudo systemctl restart nginx $ sudo mv build /var/www/html/web ``` -## Install Apache2 Server -sudo apt-get install apache2 +## Option 2: Install Production Build on Apache2 Server +* Install Apache2 Server + +refer to https://httpd.apache.org/docs/2.4/install.html * Configure Apache2 ``` -$ sudo vi /etc/apache2/ports.conf + $ sudo vi /etc/apache2/ports.conf ``` -add a Listen +Add a Listen ``` -Listen 8002 +Listen 80 ``` -$ sudo vi /etc/apache2/sites-available/000-default.conf +``` + $ sudo vi /etc/apache2/sites-available/000-default.conf ``` Add a new 'VirtualHost' as below ``` - + ServerAdmin MyEMS-web DocumentRoot /var/www/web @@ -132,26 +135,31 @@ Add a new 'VirtualHost' as below ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined +``` -* Download myems-web +* Download myems: ``` -$ cd ~ -$ git clone https://github.com/MyEMS/myems.git + $ cd ~ + $ git clone https://github.com/MyEMS/myems.git ``` -Build and Compress -``` -$ cd ~/myems/web/ -$ sudo npm run build -$ tar czvf myems-web.tar.gz build -``` -Install Upload the file myems-web.tar.gz to you web server. Note that the following path should be same as that was configured in nginx.conf. -``` -$ tar xzf myems-web.tar.gz -$ sudo rm -r /var/www/web -$ sudo mv build /var/www/web +* Install myems-web : + Check and change the config file if necessary: ``` -Restart Apache2 + $ cd ~/myems/web + $ sudo nano src/config.js ``` -$ sudo service apache2 restart + Build and Compress +``` + $ cd ~/myems/web/ + $ sudo npm run build + $ tar czvf myems-web.tar.gz build +``` + Install + Upload the file myems-web.tar.gz to you web server. + Note that the following path should be same as that was configured in 000-default.conf +``` + $ tar xzf myems-web.tar.gz + $ sudo rm -r /var/www/web + $ sudo mv build /var/www/web ``` \ No newline at end of file