diff --git a/base_requirements.txt b/base_requirements.txt index 383628fe3..b773bfd73 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -80,10 +80,6 @@ feedparser # Pinned to v3.0.0 for GraphiQL UI issue (see #12762) graphene_django==3.0.0 -# WSGI HTTP server -# https://docs.gunicorn.org/en/latest/news.html -gunicorn - # Platform-agnostic template rendering engine # https://jinja.palletsprojects.com/changes/ Jinja2 @@ -120,6 +116,10 @@ Pillow # https://github.com/psycopg/psycopg/blob/master/docs/news.rst psycopg[binary,pool] +# WSGI HTTP server +# https://uwsgi-docs.readthedocs.io/en/latest/index.html#release-notes +pyuwsgi + # YAML rendering library # https://github.com/yaml/pyyaml/blob/master/CHANGES PyYAML diff --git a/docs/configuration/index.md b/docs/configuration/index.md index 6a2ecdc7f..21b2cc7ed 100644 --- a/docs/configuration/index.md +++ b/docs/configuration/index.md @@ -40,7 +40,7 @@ Some configuration parameters are primarily controlled via NetBox's admin interf ## Modifying the Configuration -The configuration file may be modified at any time. However, the WSGI service (e.g. Gunicorn) must be restarted before these changes will take effect: +The configuration file may be modified at any time. However, the WSGI service (e.g. uWSGI) must be restarted before these changes will take effect: ```no-highlight $ sudo systemctl restart netbox diff --git a/docs/introduction.md b/docs/introduction.md index b8442dad7..ed2cd75bb 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -77,7 +77,7 @@ NetBox is built on the [Django](https://djangoproject.com/) Python framework and | Function | Component | |--------------------|-------------------| | HTTP service | nginx or Apache | -| WSGI service | gunicorn or uWSGI | +| WSGI service | uWSGI or gunicorn | | Application | Django/Python | | Database | PostgreSQL 12+ | | Task queuing | Redis/django-rq | diff --git a/mkdocs.yml b/mkdocs.yml index 354c10608..b704806d5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -94,10 +94,11 @@ nav: - 1. PostgreSQL: 'installation/1-postgresql.md' - 2. Redis: 'installation/2-redis.md' - 3. NetBox: 'installation/3-netbox.md' - - 4. Gunicorn: 'installation/4-gunicorn.md' + - 4. uWSGI: 'installation/4-uwsgi.md' - 5. HTTP Server: 'installation/5-http-server.md' - 6. LDAP (Optional): 'installation/6-ldap.md' - Upgrading NetBox: 'installation/upgrading.md' + - Gunicorn: 'installation/gunicorn.md' - Getting Started: - Planning: 'getting-started/planning.md' - Populating Data: 'getting-started/populating-data.md' diff --git a/requirements.txt b/requirements.txt index 72b086912..ccdf71af0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,6 @@ drf-spectacular==0.27.1 drf-spectacular-sidecar==2024.3.4 feedparser==6.0.11 graphene-django==3.0.0 -gunicorn==21.2.0 Jinja2==3.1.3 Markdown==3.5.2 mkdocs-material==9.5.13 @@ -27,6 +26,7 @@ netaddr==1.2.1 nh3==0.2.15 Pillow==10.2.0 psycopg[c,pool]==3.1.18 +pyuwsgi==2.0.23.post0 PyYAML==6.0.1 requests==2.31.0 social-auth-app-django==5.4.0