From af8b9aa131bca1a92467bd8424beb0603a1e96c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Najborowski?= Date: Sun, 30 Jan 2022 15:25:45 +0100 Subject: [PATCH 1/4] add loader view --- MUOR/MUOR/settings.py | 2 +- MUOR/MUOR/urls.py | 7 +++---- MUOR/MUOR/views.py | 2 -- MUOR/db.sqlite3 | Bin 143360 -> 143360 bytes MUOR/templates/base.html | 13 +++++++++++-- MUOR/templates/loader.html | 13 +++++++++++++ 6 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 MUOR/templates/loader.html diff --git a/MUOR/MUOR/settings.py b/MUOR/MUOR/settings.py index afc479883..ccee8f7a9 100644 --- a/MUOR/MUOR/settings.py +++ b/MUOR/MUOR/settings.py @@ -126,7 +126,7 @@ STATICFILES_DIRS = ( STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') -LOGIN_REDIRECT_URL = 'home' +LOGIN_REDIRECT_URL = 'loader' LOGOUT_REDIRECT_URL = 'home' # Default primary key field type diff --git a/MUOR/MUOR/urls.py b/MUOR/MUOR/urls.py index 66476216a..4a143369b 100644 --- a/MUOR/MUOR/urls.py +++ b/MUOR/MUOR/urls.py @@ -25,9 +25,8 @@ urlpatterns = [ path('admin/', admin.site.urls), path('', include('django.contrib.auth.urls')), path('signup/', SignUpView.as_view(), name='signup'), - path('welcome/', TemplateView.as_view(template_name='home.html'), - name='home'), - path('favicon.ico', RedirectView.as_view( - url=staticfiles_storage.url('images/favicon.ico'))), + path('loader/', TemplateView.as_view(template_name='loader.html'), name='loader'), + path('welcome/', TemplateView.as_view(template_name='home.html'), name='home'), + path('favicon.ico', RedirectView.as_view(url=staticfiles_storage.url('images/favicon.ico'))), path('', views.home, name='home') ] diff --git a/MUOR/MUOR/views.py b/MUOR/MUOR/views.py index 780c959ec..944f84540 100644 --- a/MUOR/MUOR/views.py +++ b/MUOR/MUOR/views.py @@ -1,6 +1,4 @@ -from django.contrib.auth import logout from django.contrib.auth.forms import UserCreationForm -from django.http import JsonResponse from django.shortcuts import redirect from django.urls import reverse_lazy from django.views import generic diff --git a/MUOR/db.sqlite3 b/MUOR/db.sqlite3 index 66b5fe7549d2cb2439f86900fceff2c2c9acca3d..b8f09abba56629f3e0a64b7d7fe258223824b238 100644 GIT binary patch delta 1001 zcmaiy%WD%+6vpRKYf?$BF9^N`>q?s5XYQRq!Lhcr+L+chR_#J&=1!)Qq)D1b(-a|1 zm%6ElxDwn5E?gJ_x^U@V;KH3kapR`o&PClgO;Mx^JzUP_9Pal!-#P1Bq4llM<|&mu zK0SJXDe)Vd9r^s+F-1}O!G;drgKuC1yavy}r%t;7o~#dNjvfx_7u8fIed~U?Qp)-T zSL=QoJ_!$jl%hr#l;}cqq0>%BTkVntl=g@jjzuDu!eO%=DcgCO#rLa=7G{Y-f?*JY z%Y{+FQ+MYo<*GC*xBMxOEYDsYyth)DP9xvsP0X%LUb|LXEw7D_(Mf4dt=7|`GF+td zvlH3bM%5d^5aS_;h6p^5NRk*y1mm;?4Fd{GF8Re?y4=fgr?j-Mog^`jbA|;Y!buoB z;WC?11Sw*+bb~)^Nu}!|CbKq5aLaH6Cs~Kuwy*@sCbHPFDHWE1L||KYcjVBCNaV@g z(yK$@hoXXQ1#E*K-6Q2K5Dn`wwFjaFy#w8y*1(H?6+BhI)1dwcw0yN+)l%(<7ArS# zu~DzCF=|^L!cEs$YtThbY%3><9x5Qmb%jeH7KAdwEn+a&VUD1};mja{OUHtg+8ko& zKq-hYB(w}n-K<4yjQBu6pn{)D@cu;S!3KD|>4H984QqQ1I||t89$Ehm4k`z9EgUPq zomTtagfwtm0T03PPWxl@*_WusTQ#jO)inP{9S|o`am<`ClYDL^-w-qT#rnjQe><0u zC^u6pjGNbu44$aW6~`K;Bu=SXL6dtc!$XMtwPDB+!!>nRmH4Zzyj#dssuI_i7V94N z3|d%T=8Y9QS4X+#Z`rAdq$j6MZ@QYfN-~w(tG<0Rz2c$KJ9&ApWEtj=KR%zIyHcoH zY<^~+EKR~hoC+h*-StKT?-cMkNWJLB$}d4?P*17 - + {% block title %}MultiUserOpenRefine{% endblock %} @@ -25,5 +25,14 @@ + + + \ No newline at end of file diff --git a/MUOR/templates/loader.html b/MUOR/templates/loader.html new file mode 100644 index 000000000..6702a8658 --- /dev/null +++ b/MUOR/templates/loader.html @@ -0,0 +1,13 @@ + +{% extends 'base.html' %} + +{% block title %}Loader{% endblock %} + +{% block content %} +

Your instance is getting ready. Please wait...

+
+ +
+{% endblock %} \ No newline at end of file From 1c67dc4ae3fca42d9a215f1d010575e2d73d7424 Mon Sep 17 00:00:00 2001 From: makram89 Date: Sun, 30 Jan 2022 15:30:37 +0100 Subject: [PATCH 2/4] uwsgi.ini --- MUOR/MUOR/configs/uwsgi.ini | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 MUOR/MUOR/configs/uwsgi.ini diff --git a/MUOR/MUOR/configs/uwsgi.ini b/MUOR/MUOR/configs/uwsgi.ini new file mode 100644 index 000000000..451d497e7 --- /dev/null +++ b/MUOR/MUOR/configs/uwsgi.ini @@ -0,0 +1,8 @@ +[uwsgi] +chdir=/home/randomsec/RandomSec/MUOR +module=MUOR.wsgi:application +master=True +pidfile=/home/randomsec/project-master.pid +vacuum=True +max-requests=5000 +daemonize=/home/randomsec/RandomSec/log/logs.log \ No newline at end of file From 5243b24a5ad193ecca395c297dc037c0c92aad94 Mon Sep 17 00:00:00 2001 From: makram89 Date: Sun, 30 Jan 2022 15:36:34 +0100 Subject: [PATCH 3/4] docekr image in settings --- MUOR/MUOR/DockerManager.py | 3 ++- MUOR/MUOR/settings.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MUOR/MUOR/DockerManager.py b/MUOR/MUOR/DockerManager.py index bc45f6b0d..1f30979b2 100644 --- a/MUOR/MUOR/DockerManager.py +++ b/MUOR/MUOR/DockerManager.py @@ -1,11 +1,12 @@ import docker import hashlib +from settings import DOCKER_IMAGE class DockerManager: def __init__(self): self.client = docker.from_env() - self.image = 'felixlohmeier/openrefine' + self.image = DOCKER_IMAGE def create_new_volume(self, username): # Hashing username to get volume name diff --git a/MUOR/MUOR/settings.py b/MUOR/MUOR/settings.py index ccee8f7a9..efdfe671f 100644 --- a/MUOR/MUOR/settings.py +++ b/MUOR/MUOR/settings.py @@ -139,4 +139,6 @@ AUTH_USER_MODEL = "MUOR.Profile" AVAILABLE_PORTS_RANGE = (6000, 7000) +DOCKER_IMAGE = 'openrefine:latest' + From 6c078fda8b596d07eb6874ba2ef33a9761b376a0 Mon Sep 17 00:00:00 2001 From: makram89 Date: Sun, 30 Jan 2022 15:40:05 +0100 Subject: [PATCH 4/4] settings correction --- MUOR/MUOR/DockerManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MUOR/MUOR/DockerManager.py b/MUOR/MUOR/DockerManager.py index 1f30979b2..02ec139f9 100644 --- a/MUOR/MUOR/DockerManager.py +++ b/MUOR/MUOR/DockerManager.py @@ -1,12 +1,12 @@ import docker import hashlib -from settings import DOCKER_IMAGE +from django.conf import settings class DockerManager: def __init__(self): self.client = docker.from_env() - self.image = DOCKER_IMAGE + self.image = settings.DOCKER_IMAGE def create_new_volume(self, username): # Hashing username to get volume name