diff --git a/Make-MinGW.bat b/Make-MinGW.bat index 66e5e4db0..fb6d6ecb1 100644 --- a/Make-MinGW.bat +++ b/Make-MinGW.bat @@ -402,7 +402,6 @@ REM Main function Ends :CLEANUP_ENV ECHO Cleaning up private environment... rd "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q - rd "%PGBUILDPATH%\%VIRTUALENV%\Scripts" /S /Q DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" ECHO Cleaned up private environment successfully. diff --git a/Make.bat b/Make.bat index 499ebac25..a06898f1b 100644 --- a/Make.bat +++ b/Make.bat @@ -506,7 +506,6 @@ REM Main function Ends :CLEANUP_ENV ECHO Cleaning up private environment... rd "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q - rd "%PGBUILDPATH%\%VIRTUALENV%\Scripts" /S /Q DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" ECHO Cleaned up private environment successfully. diff --git a/docs/en_US/server_deployment.rst b/docs/en_US/server_deployment.rst index 39d4e7ddd..bf3be8bab 100644 --- a/docs/en_US/server_deployment.rst +++ b/docs/en_US/server_deployment.rst @@ -120,6 +120,17 @@ application may be configured similarly to the example below: Allow from all + +Now open the file ``C:\Program Files\pgAdmin4\web\pgAdmin4.wsgi`` with your favorite editor and add the code +below which will activate Python virtual environment when Apache server runs. + +.. code-block:: apache + + activate_this = 'C:\Program Files\pgAdmin4\venv\Scripts\activate_this.py' + execfile(activate_this, dict(__file__=activate_this)) + + +**Note:** The changes made in ``pgAdmin4.wsgi`` file will revert when pgAdmin4 is either upgraded or downgraded. Apache HTTPD Configuration (Linux/Unix) --------------------------------------- @@ -132,7 +143,7 @@ application may be configured similarly to the example below: ServerName pgadmin.example.com - WSGIDaemonProcess pgadmin processes=1 threads=25 + WSGIDaemonProcess pgadmin processes=1 threads=25 python-home=/path/to/python/virtualenv/ WSGIScriptAlias / /opt/pgAdmin4/web/pgAdmin4.wsgi