diff --git a/.gitignore b/.gitignore index 0597e3e..155fc56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /settings.ini /settings.ini.example.original +/uwsgi.ini session libs/__pycache__ \ No newline at end of file diff --git a/README.md b/README.md index 2970c72..979dd82 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [pypi-bottle]: https://pypi.python.org/pypi/bottle/ [pypi-ldap3]: https://pypi.python.org/pypi/ldap3 [settings]: https://git.lainoa.eus/aitzol/ldap-python-webui/src/branch/master/settings.ini.example +[uwsgi]: https://git.lainoa.eus/aitzol/ldap-python-webui/src/branch/master/uwsgi.ini.example [GPL3]: https://www.gnu.org/licenses/gpl-3.0.txt [LICENSE]: https://www.gnu.org/licenses/licenses.html [wsgiref]: https://docs.python.org/3/library/wsgiref.html#module-wsgiref.simple_server @@ -50,7 +51,11 @@ Konfiguraketa [settings.ini][settings] fitxategian ezartzen da. Fitxategi honen ``` uwsgi --http :8080 --enable-threads --wsgi-file app.py ``` +edo [uwsgi.ini][ uwsgi ] fitxategia sortu eta exekutatu: +``` + uwsgi -i uwsgi.ini +``` * Berezko Bottle zerbitzariaren bidez zuzenean `app.py` exekutatuz: ``` diff --git a/libs/__pycache__/flist.cpython-39.pyc b/libs/__pycache__/flist.cpython-39.pyc index d1a1008..69a8ea1 100644 Binary files a/libs/__pycache__/flist.cpython-39.pyc and b/libs/__pycache__/flist.cpython-39.pyc differ diff --git a/libs/__pycache__/helper.cpython-39.pyc b/libs/__pycache__/helper.cpython-39.pyc index ff1546f..ee422e3 100644 Binary files a/libs/__pycache__/helper.cpython-39.pyc and b/libs/__pycache__/helper.cpython-39.pyc differ diff --git a/libs/__pycache__/localization.cpython-39.pyc b/libs/__pycache__/localization.cpython-39.pyc index 99af77f..1b78d5b 100644 Binary files a/libs/__pycache__/localization.cpython-39.pyc and b/libs/__pycache__/localization.cpython-39.pyc differ diff --git a/libs/__pycache__/slist.cpython-39.pyc b/libs/__pycache__/slist.cpython-39.pyc index 4d2b8a4..845c99e 100644 Binary files a/libs/__pycache__/slist.cpython-39.pyc and b/libs/__pycache__/slist.cpython-39.pyc differ diff --git a/settings.ini.example b/settings.ini.example index 2a54054..23ff3c7 100644 --- a/settings.ini.example +++ b/settings.ini.example @@ -14,17 +14,6 @@ search_filter = uid={uid} #base = ou=People,dc=example,dc=org #search_filter = uid={uid} -[uwsgi] -plugins = python3 -socket = /run/uwsgi/main.sock -chdir = /var/www/scripts -logger = file:/var/log/uwsgi/main.log -processes = 1 -threads = 2 -# map URI paths to applications -mount = /admin/ldap-python-webui=ldap-python-webui/app.py -manage-script-name = true - [server] server = auto host = localhost @@ -32,7 +21,7 @@ port = 8080 [session] type = file -expire = 300 +expire = 900 data_dir = ./session auto = true diff --git a/uwsgi.ini.example b/uwsgi.ini.example new file mode 100644 index 0000000..ea517e6 --- /dev/null +++ b/uwsgi.ini.example @@ -0,0 +1,8 @@ +; https://uwsgi-docs.readthedocs.io/en/latest/Configuration.html#magic-variables + +[uwsgi] +http = :9090 +chdir = %v +wsgi-file = %v/app.py +processes = 1 +threads = 2