From 876e56f5817d9e0d021a9eebca55fa86817244af Mon Sep 17 00:00:00 2001
From: root <josepmaria@isardvdi.com>
Date: Sun, 30 May 2021 10:48:35 +0200
Subject: [PATCH] last fixes before production

---
 admin/docker/docker-entrypoint.sh |  4 ++++
 admin/src/admin/lib/admin.py      | 22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/admin/docker/docker-entrypoint.sh b/admin/docker/docker-entrypoint.sh
index 78b4dfc..b830d5f 100755
--- a/admin/docker/docker-entrypoint.sh
+++ b/admin/docker/docker-entrypoint.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 ssh-keygen -A
+## Only in development
+cd /admin/admin
+yarn install
+## End Only in development
 cd /admin
 python3 start.py &
 /usr/sbin/sshd -D -e -f /etc/ssh/sshd_config
\ No newline at end of file
diff --git a/admin/src/admin/lib/admin.py b/admin/src/admin/lib/admin.py
index df080b2..fd5280c 100644
--- a/admin/src/admin/lib/admin.py
+++ b/admin/src/admin/lib/admin.py
@@ -40,6 +40,15 @@ class Admin():
                 sleep(2)
         log.warning('Moodle connected.')
 
+        ready=False
+        while not ready:
+            try:
+                with open(os.path.join(app.root_path, "../moodledata/saml2/moodle."+app.config['DOMAIN']+".pem"),"r") as pem:
+                    ready=True
+            except IOError:
+                log.warning('Could not get moodle SAML2 pem certificate. Retrying...')
+                sleep(2)
+
         ready=False
         while not ready:
             try:
@@ -51,9 +60,18 @@ class Admin():
         log.warning('Nextcloud connected.')
 
         self.default_setup()
-
         self.internal={}
-        self.resync_data()
+        # self.resync_data()
+
+        ready=False
+        while not ready:
+            try:
+                self.resync_data()
+                ready=True
+            except:
+                log.error('Could not connect to moodle, waiting to be online...')
+                sleep(2)
+
         self.external={'users':[],
                         'groups':[],
                         'roles':[]}