Merge remote-tracking branch 'origin/master'
# Conflicts: # MUOR/MUOR/settings.py
This commit is contained in:
commit
14288de087
@ -1,11 +1,12 @@
|
||||
import docker
|
||||
import hashlib
|
||||
from django.conf import settings
|
||||
|
||||
|
||||
class DockerManager:
|
||||
def __init__(self):
|
||||
self.client = docker.from_env()
|
||||
self.image = 'felixlohmeier/openrefine'
|
||||
self.image = settings.DOCKER_IMAGE
|
||||
|
||||
def create_new_volume(self, username):
|
||||
# Hashing username to get volume name
|
||||
|
8
MUOR/MUOR/configs/uwsgi.ini
Normal file
8
MUOR/MUOR/configs/uwsgi.ini
Normal file
@ -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
|
@ -139,6 +139,8 @@ AUTH_USER_MODEL = "MUOR.Profile"
|
||||
|
||||
AVAILABLE_PORTS_RANGE = (6000, 7000)
|
||||
|
||||
DOCKER_IMAGE = 'openrefine:latest'
|
||||
|
||||
SESSION_EXPIRE_AT_BROWSER_CLOSE = True
|
||||
SESSION_COOKIE_AGE = 60 * 60
|
||||
|
||||
|
@ -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')
|
||||
]
|
||||
|
@ -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
|
||||
|
BIN
MUOR/db.sqlite3
BIN
MUOR/db.sqlite3
Binary file not shown.
@ -2,8 +2,8 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
|
||||
integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
|
||||
integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
|
||||
<meta charset="utf-8">
|
||||
<title>{% block title %}MultiUserOpenRefine{% endblock %}</title>
|
||||
</head>
|
||||
@ -25,5 +25,14 @@
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
|
||||
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
|
||||
crossorigin="anonymous"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"
|
||||
integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
|
||||
crossorigin="anonymous"></script>
|
||||
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
|
||||
integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
|
||||
crossorigin="anonymous"></script>
|
||||
</body>
|
||||
</html>
|
13
MUOR/templates/loader.html
Normal file
13
MUOR/templates/loader.html
Normal file
@ -0,0 +1,13 @@
|
||||
<!-- templates/loader.html -->
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block title %}Loader{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h3 style="text-align: center;">Your instance is getting ready. Please wait... </h3>
|
||||
<div class="d-flex justify-content-center">
|
||||
<div class="spinner-grow" style="width: 3rem; height: 3rem;" role="status">
|
||||
<span class="sr-only">Loading...</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
Loading…
Reference in New Issue
Block a user