Commit aa23e734 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Added preliminary support for tasks auth password and refactored computing conf approach.

parent 2bed0517

containers/MetaDesktop/files/entrypoint.sh

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,22 @@ while read env_var; do 
  fi

done



#---------------------

#   Password

#---------------------



if [ "x$AUTH_PASS" != "x" ]; then

    echo "[INFO] Setting up VNC password..."

    mkdir -p /metauser/.vnc

    /opt/tigervnc/usr/bin/vncpasswd -f <<< $AUTH_PASS > /metauser/.vnc/passwd

    chmod 600 /metauser/.vnc/passwd

    export VNC_AUTH=True

else

    echo "[INFO] Not setting up any VNC password"

        

fi





#---------------------

#  Entrypoint command

#---------------------

containers/MetaDesktop/files/run_vnc.sh

+7 −1
Original line number Diff line number Diff line 
#!/bin/bash



# Exec TigerVNC server 



if [ "x$VNC_AUTH" == "xTrue" ]; then

    /opt/tigervnc/usr/bin/vncserver :0 -SecurityTypes vncauth,tlsvnc -xstartup /opt/tigervnc/xstartup

else

    /opt/tigervnc/usr/bin/vncserver :0 -SecurityTypes None -xstartup /opt/tigervnc/xstartup

fi





# Check it is running. If it is not, exit

while true

containers/MetaDesktop/push.sh

0 → 100755
+3 −0
Original line number Diff line number Diff line 
#!/bin/bash

docker tag rosetta/metadesktop localhost:5000/rosetta/metadesktop

docker push localhost:5000/rosetta/metadesktop

services/webapp/code/rosetta/base_app/admin.py

+3 −2
Original line number Diff line number Diff line 
from django.contrib import admin



from .models import Profile, LoginToken, Task, Container, Computing, ComputingSysConf, ComputingUserConf

from .models import Profile, LoginToken, Task, Container, Computing, ComputingSysConf, ComputingUserConf, Keys



admin.site.register(Profile)

admin.site.register(LoginToken)
@@ -9,3 +9,4 @@ admin.site.register(Container) 
admin.site.register(Computing)

admin.site.register(ComputingSysConf)

admin.site.register(ComputingUserConf)

admin.site.register(Keys)

services/webapp/code/rosetta/base_app/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
import inspect

from django.conf import settings

from django.shortcuts import render

from django.http import HttpResponse

from django.http import HttpResponse, HttpResponseRedirect

from .utils import format_exception, log_user_activity

from .exceptions import ErrorMessage, ConsistencyException