diff options
| author | Stephen Finucane <stephen.finucane@intel.com> | 2016-02-02 23:44:34 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephen.finucane@intel.com> | 2016-02-14 16:24:08 +0000 |
| commit | ab05e55a08ded11c6e5b58dc91ba33087d9a2278 (patch) | |
| tree | 385394f3a73dbc60ba2ce8b521d93e0bf2352a6a /lib/apache2 | |
| parent | 2ad82b755b245e2297856cdbbcf1a3a31025682b (diff) | |
| download | patchwork-ab05e55a08ded11c6e5b58dc91ba33087d9a2278.tar patchwork-ab05e55a08ded11c6e5b58dc91ba33087d9a2278.tar.gz | |
lib: Add nginx and uWSGI configuration files
nginx and uWSGI are a well-known option for deploying Django
applications today - might as well embrace them.
Conversely, the mod_python variable and fastcgi service are both
deprecated and should not be used. Remove these.
Signed-off-by: Stephen Finucane <stephen.finucane@intel.com>
Suggested-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Diffstat (limited to 'lib/apache2')
| -rw-r--r-- | lib/apache2/patchwork.fastcgi.conf | 17 | ||||
| -rw-r--r-- | lib/apache2/patchwork.mod_python.conf | 22 |
2 files changed, 0 insertions, 39 deletions
diff --git a/lib/apache2/patchwork.fastcgi.conf b/lib/apache2/patchwork.fastcgi.conf deleted file mode 100644 index a739164..0000000 --- a/lib/apache2/patchwork.fastcgi.conf +++ /dev/null @@ -1,17 +0,0 @@ -NameVirtualHost patchwork.example.com:80 -<VirtualHost patchwork.example.com:80> - DocumentRoot /srv/patchwork/htdocs/ - - Alias /media/ /srv/patchwork/lib/python/django/contrib/admin/media/ - - FastCGIExternalServer /srv/patchwork/htdocs/patchwork.fcgi -socket /srv/patchwork/var/fcgi.sock -pass-header Authorization - - RewriteEngine On - RewriteCond %{REQUEST_URI} !^/(images|css|js|media)/.* - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^/(.*)$ /patchwork.fcgi/$1 [QSA,L] - - LogLevel warn - ErrorLog /var/log/apache2/patchwork-error.log - CustomLog /var/log/apache2/patchwork-acess.log combined -</VirtualHost> diff --git a/lib/apache2/patchwork.mod_python.conf b/lib/apache2/patchwork.mod_python.conf deleted file mode 100644 index c46f86c..0000000 --- a/lib/apache2/patchwork.mod_python.conf +++ /dev/null @@ -1,22 +0,0 @@ -NameVirtualHost patchwork.example.com:80 -<VirtualHost patchwork.example.com:80> - DocumentRoot /srv/patchwork/htdocs/ - - Alias /media/ /srv/patchwork/lib/python/django/contrib/admin/media/ - - <Location "/"> - SetHandler python-program - PythonHandler django.core.handlers.modpython - PythonPath "['/srv/patchwork', '/srv/patchwork/lib/python'] + sys.path" - SetEnv DJANGO_SETTINGS_MODULE settings - </Location> - - <LocationMatch "^/+(images|css|js|media)/"> - SetHandler None - </LocationMatch> - - LogLevel warn - ErrorLog /var/log/apache2/patchwork-error.log - CustomLog /var/log/apache2/patchwork-acess.log combined - -</VirtualHost> |