diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dca1cd6..2dff6418 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added -- None. +- added API reverse proxy in Apache conf. ### Changed -- None. +- replaced true with 1 in SQL statements of myems-api. +- updated user insert sql statement for failed_login_count. ### Fixed -- None. +- fixed typo in virtualmetercarbon. ### Removed - None. diff --git a/myems-admin/README.md b/myems-admin/README.md index 93b70e8f..a8d189af 100644 --- a/myems-admin/README.md +++ b/myems-admin/README.md @@ -164,7 +164,7 @@ Listen 8001 sudo vi /etc/apache2/sites-available/000-default.conf ``` Add a new 'VirtualHost' as below -```xml +``` ServerAdmin MyEMS-admin DocumentRoot /var/www/myems-admin @@ -173,9 +173,19 @@ Add a new 'VirtualHost' as below Options FollowSymLinks AllowOverride All Require all granted + Header set Access-Control-Allow-Origin * ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined + ProxyRequests Off + ProxyPreserveHost On + + + Order Deny,Allow + Allow from all + + ProxyPass /api http://127.0.0.1:8000/ + ProxyPassReverse /api http://127.0.0.1:8000/ ``` diff --git a/myems-web/README.md b/myems-web/README.md index e9176d6e..b29ab4cd 100644 --- a/myems-web/README.md +++ b/myems-web/README.md @@ -230,9 +230,19 @@ Add a new 'VirtualHost' as below Options FollowSymLinks AllowOverride All Require all granted + Header set Access-Control-Allow-Origin * ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined + ProxyRequests Off + ProxyPreserveHost On + + + Order Deny,Allow + Allow from all + + ProxyPass /api http://127.0.0.1:8000/ + ProxyPassReverse /api http://127.0.0.1:8000/ ``` @@ -266,7 +276,7 @@ sudo vi .htaccess ``` Add a IfModule as below: ```bash -IfModule mod_rewrite.c> + RewriteEngine On RewriteBase / RewriteRule ^index\.html$ - [L]