paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1003 from puuu/baseurl

Browse Source 
Fix sub path support
This commit is contained in:
Jonas Winkler 2021-05-15 15:12:00 +02:00 committed by GitHub
commit fcae461430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/configuration.rst
View File

@ -154,10 +154,6 @@ PAPERLESS_FORCE_SCRIPT_NAME=<path>
To host paperless under a subpath url like example.com/paperless you set To host paperless under a subpath url like example.com/paperless you set
this value to /paperless. No trailing slash! this value to /paperless. No trailing slash!
.. note::
I don't know if this works in paperless-ng. Probably not.
Defaults to none, which hosts paperless at "/". Defaults to none, which hosts paperless at "/".
PAPERLESS_STATIC_URL=<path> PAPERLESS_STATIC_URL=<path>

2
gunicorn.conf.py
View File

@ -2,7 +2,7 @@ import os
bind = '0.0.0.0:8000' bind = '0.0.0.0:8000'
workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2)) workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2))
worker_class = 'uvicorn.workers.UvicornWorker' worker_class = 'paperless.workers.ConfigurableWorker'
timeout = 120 timeout = 120
def pre_fork(server, worker): def pre_fork(server, worker):

2
src-ui/src/app/app.component.ts
View File

@ -18,7 +18,7 @@ export class AppComponent implements OnInit, OnDestroy {
constructor (private settings: SettingsService, private consumerStatusService: ConsumerStatusService, private toastService: ToastService, private router: Router) { constructor (private settings: SettingsService, private consumerStatusService: ConsumerStatusService, private toastService: ToastService, private router: Router) {
let anyWindow = (window as any) let anyWindow = (window as any)
anyWindow.pdfWorkerSrc = '/assets/js/pdf.worker.min.js'; anyWindow.pdfWorkerSrc = 'assets/js/pdf.worker.min.js';
this.settings.updateDarkModeSettings() this.settings.updateDarkModeSettings()
} }

2
src-ui/src/app/services/consumer-status.service.ts
View File

@ -125,7 +125,7 @@ export class ConsumerStatusService {
connect() { connect() {
this.disconnect() this.disconnect()
this.statusWebSocket = new WebSocket(`${environment.webSocketProtocol}//${environment.webSocketHost}/ws/status/`); this.statusWebSocket = new WebSocket(`${environment.webSocketProtocol}//${environment.webSocketHost}${environment.webSocketBaseUrl}status/`);
this.statusWebSocket.onmessage = (ev) => { this.statusWebSocket.onmessage = (ev) => {
let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data']) let statusMessage: WebsocketConsumerStatusMessage = JSON.parse(ev['data'])

7
src-ui/src/environments/environment.prod.ts
View File

@ -1,9 +1,12 @@
const base_url = new URL(document.baseURI)
export const environment = { export const environment = {
production: true, production: true,
apiBaseUrl: "/api/", apiBaseUrl: document.baseURI + "api/",
apiVersion: "2", apiVersion: "2",
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "1.4.2", version: "1.4.2",
webSocketHost: window.location.host, webSocketHost: window.location.host,
webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:") webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:"),
webSocketBaseUrl: base_url.pathname + "ws/",
}; };

3
src-ui/src/environments/environment.ts
View File

@ -9,7 +9,8 @@ export const environment = {
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "DEVELOPMENT", version: "DEVELOPMENT",
webSocketHost: "localhost:8000", webSocketHost: "localhost:8000",
webSocketProtocol: "ws:" webSocketProtocol: "ws:",
webSocketBaseUrl: "/ws/",
}; };
/* /*

2
src/documents/templates/index.html
View File

@ -7,7 +7,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Paperless-ng</title> <title>Paperless-ng</title>
<base href="/"> <base href="{% url 'base' %}">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="username" content="{{username}}"> <meta name="username" content="{{username}}">
<meta name="full_name" content="{{full_name}}"> <meta name="full_name" content="{{full_name}}">

2
src/documents/templates/registration/logged_out.html
View File

File diff suppressed because one or more lines are too long

5
src/paperless/settings.py
View File

@ -142,11 +142,14 @@ MIDDLEWARE = [
ROOT_URLCONF = 'paperless.urls' ROOT_URLCONF = 'paperless.urls'
FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME") FORCE_SCRIPT_NAME = os.getenv("PAPERLESS_FORCE_SCRIPT_NAME")
BASE_URL = (FORCE_SCRIPT_NAME or "") + "/"
LOGIN_URL = BASE_URL + "accounts/login/"
WSGI_APPLICATION = 'paperless.wsgi.application' WSGI_APPLICATION = 'paperless.wsgi.application'
ASGI_APPLICATION = "paperless.asgi.application" ASGI_APPLICATION = "paperless.asgi.application"
STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", "/static/") STATIC_URL = os.getenv("PAPERLESS_STATIC_URL", BASE_URL + "static/")
WHITENOISE_STATIC_PREFIX = "/static/"
# TODO: what is this used for? # TODO: what is this used for?
TEMPLATES = [ TEMPLATES = [

19
src/paperless/urls.py
View File

@ -9,6 +9,8 @@ from rest_framework.routers import DefaultRouter
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.conf import settings
from paperless.consumers import StatusConsumer from paperless.consumers import StatusConsumer
from documents.views import ( from documents.views import (
CorrespondentViewSet, CorrespondentViewSet,
@ -73,31 +75,36 @@ urlpatterns = [
re_path(r"^fetch/", include([ re_path(r"^fetch/", include([
re_path( re_path(
r"^doc/(?P<pk>\d+)$", r"^doc/(?P<pk>\d+)$",
RedirectView.as_view(url='/api/documents/%(pk)s/download/'), RedirectView.as_view(url=settings.BASE_URL +
'api/documents/%(pk)s/download/'),
), ),
re_path( re_path(
r"^thumb/(?P<pk>\d+)$", r"^thumb/(?P<pk>\d+)$",
RedirectView.as_view(url='/api/documents/%(pk)s/thumb/'), RedirectView.as_view(url=settings.BASE_URL +
'api/documents/%(pk)s/thumb/'),
), ),
re_path( re_path(
r"^preview/(?P<pk>\d+)$", r"^preview/(?P<pk>\d+)$",
RedirectView.as_view(url='/api/documents/%(pk)s/preview/'), RedirectView.as_view(url=settings.BASE_URL +
'api/documents/%(pk)s/preview/'),
), ),
])), ])),
re_path(r"^push$", csrf_exempt( re_path(r"^push$", csrf_exempt(
RedirectView.as_view(url='/api/documents/post_document/'))), RedirectView.as_view(url=settings.BASE_URL +
'api/documents/post_document/'))),
# Frontend assets TODO: this is pretty bad, but it works. # Frontend assets TODO: this is pretty bad, but it works.
path('assets/<path:path>', path('assets/<path:path>',
RedirectView.as_view(url='/static/frontend/en-US/assets/%(path)s')), RedirectView.as_view(url=settings.STATIC_URL +
'frontend/en-US/assets/%(path)s')),
# TODO: with localization, this is even worse! :/ # TODO: with localization, this is even worse! :/
# login, logout # login, logout
path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django.contrib.auth.urls')),
# Root of the Frontent # Root of the Frontent
re_path(r".*", login_required(IndexView.as_view())), re_path(r".*", login_required(IndexView.as_view()), name='base'),
] ]

11
src/paperless/workers.py Normal file
View File

@ -0,0 +1,11 @@
import os
from uvicorn.workers import UvicornWorker
from django.conf import settings
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "paperless.settings")
class ConfigurableWorker(UvicornWorker):
CONFIG_KWARGS = {
"root_path": settings.FORCE_SCRIPT_NAME or "",
}