Merged differences

athenarc · Jun 5, 2022 · a11f51d · a11f51d
2 parents fc69feb + 6bd4426
commit a11f51d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/controllers/SiteController.php b/controllers/SiteController.php
@@ -151,7 +151,6 @@ public function actionAuthConfirmed($token)
                 User::createNewUser($username, $persistent_id);
                 $identity=User::findByUsername($username);
                 $message="A new user with username $username has been created";
-                EmailEventsAdmin::NotifyByEmail('user_creation', -1,$message);
             }
             else if ((!empty($identityU)) && empty($identityP))
             {

diff --git a/database_schema/schema_db.sql b/database_schema/schema_db.sql
@@ -1779,10 +1779,10 @@ COPY public.jupyter_images (id, description, image) FROM stdin;
 5	Tensorflow notebook	jupyter/tensorflow-notebook:latest
 \.
 
-alter table workflow add column workflow_type varchar(100);
-alter table workflow_upload add column workflow_type varchar(100);
-create index workflow_type_idx on workflow_upload(workflow_type);
-create index workflow_upload_type_idx on workflow_upload(workflow_type);
-alter table jupyter_images add column gpu boolean default false;
-alter table jupyter_server add column state varchar(20);
-alter table jupyter_server add column image_id bigint;
+alter table public.workflow add column workflow_type varchar(100);
+alter table public.workflow_upload add column workflow_type varchar(100);
+create index workflow_type_idx on public.workflow_upload(workflow_type);
+create index workflow_upload_type_idx on public.workflow_upload(workflow_type);
+alter table public.jupyter_images add column gpu boolean default false;
+alter table public.jupyter_server add column state varchar(20);
+alter table public.jupyter_server add column image_id bigint;
diff --git a/deployment/templates/schema/schema-secret.yaml b/deployment/templates/schema/schema-secret.yaml
@@ -41,6 +41,8 @@ stringData:
       {
           "domain": "{{ .Values.jupyter.app_name }}.{{ .Values.domain }}"
       },
+      "cleanTeskJobs": {{ .Values.schema.cleanTeskJobs}},
+      "cleanTeskWFJobs":{{ .Values.schema.cleanTeskWFJobs}},
       {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
       "platform": "kubernetes" 
       {{- else if .Capabilities.APIVersions.Has "route.openshift.io/v1/Route" }} 

diff --git a/deployment/values.yaml b/deployment/values.yaml
@@ -104,8 +104,8 @@ ftp:
   deployment:
       image: diwis/schema-ftp:1
       domain: ftp
-      username: tesk-1
-      password: Z6fsH6MG
+      username: test
+      password: test
 
 minio:
   app_name: minio