Compare commits
2 Commits
cleanup/re
...
9bd4cb19d3
| Author | SHA1 | Date | |
|---|---|---|---|
| 9bd4cb19d3 | |||
| 9d4c7d5f87 |
@@ -28,7 +28,10 @@ RUN rm -rf /app/Dockerfile* \
|
|||||||
/app/k8s \
|
/app/k8s \
|
||||||
/app/data-loader \
|
/app/data-loader \
|
||||||
/app/keys \
|
/app/keys \
|
||||||
/app/requirements.txt
|
/app/requirements.txt \
|
||||||
|
/app/node_modules \
|
||||||
|
/app/*.json \
|
||||||
|
/app/test_*.py
|
||||||
RUN python3 manage.py collectstatic
|
RUN python3 manage.py collectstatic
|
||||||
CMD ["gunicorn","--bind","0.0.0.0:8000","--workers","3","VorgabenUI.wsgi:application"]
|
CMD ["gunicorn","--bind","0.0.0.0:8000","--workers","3","VorgabenUI.wsgi:application"]
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ INSTALLED_APPS = [
|
|||||||
'mptt',
|
'mptt',
|
||||||
'pages',
|
'pages',
|
||||||
'nested_admin',
|
'nested_admin',
|
||||||
|
'revproxy.apps.RevProxyConfig',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ from django.contrib import admin
|
|||||||
from django.urls import include, path, re_path
|
from django.urls import include, path, re_path
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls.static import static
|
from django.conf.urls.static import static
|
||||||
|
from diagramm_proxy.views import DiagrammProxyView
|
||||||
import dokumente.views
|
import dokumente.views
|
||||||
import pages.views
|
import pages.views
|
||||||
import referenzen.views
|
import referenzen.views
|
||||||
@@ -32,6 +33,7 @@ urlpatterns = [
|
|||||||
path('stichworte/', include("stichworte.urls")),
|
path('stichworte/', include("stichworte.urls")),
|
||||||
path('referenzen/', referenzen.views.tree, name="referenz_tree"),
|
path('referenzen/', referenzen.views.tree, name="referenz_tree"),
|
||||||
path('referenzen/<str:refid>/', referenzen.views.detail, name="referenz_detail"),
|
path('referenzen/<str:refid>/', referenzen.views.detail, name="referenz_detail"),
|
||||||
|
re_path(r'^diagramm/(?P<path>.*)$', DiagrammProxyView.as_view()),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Serve static files
|
# Serve static files
|
||||||
|
|||||||
1
diagramm_proxy/__init__.py
Normal file
1
diagramm_proxy/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
# Diagram proxy module
|
||||||
4
diagramm_proxy/views.py
Normal file
4
diagramm_proxy/views.py
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
from revproxy.views import ProxyView
|
||||||
|
|
||||||
|
class DiagrammProxyView(ProxyView):
|
||||||
|
upstream = "http://svckroki:8000/"
|
||||||
@@ -31,6 +31,6 @@
|
|||||||
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
<div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
|
||||||
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
<div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
|
||||||
</div>
|
</div>
|
||||||
<div>VorgabenUI v0.945</div>
|
<div>VorgabenUI v0.944</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
"""
|
|
||||||
Simple script to test Vorgaben sanity checking
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import django
|
|
||||||
|
|
||||||
# Setup Django
|
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'VorgabenUI.settings')
|
|
||||||
django.setup()
|
|
||||||
|
|
||||||
from dokumente.utils import check_vorgabe_conflicts, format_conflict_report
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("Running Vorgaben sanity check...")
|
|
||||||
print("=" * 50)
|
|
||||||
|
|
||||||
# Check for conflicts
|
|
||||||
conflicts = check_vorgabe_conflicts()
|
|
||||||
|
|
||||||
# Generate and display report
|
|
||||||
report = format_conflict_report(conflicts, verbose=True)
|
|
||||||
print(report)
|
|
||||||
|
|
||||||
print("=" * 50)
|
|
||||||
|
|
||||||
if conflicts:
|
|
||||||
print(f"\n⚠️ Found {len(conflicts)} conflicts that need attention!")
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
|
||||||
print("✅ All Vorgaben are valid!")
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
Reference in New Issue
Block a user