Merge pull request #12 from CARRIER-project/adapt-config

updated config and docker-compose to the newest version

docker-compose.yml

@@ -13,22 +13,22 @@ services:
       - ./pgdata:/data
 
   vserver:
-    image: "harbor2.vantage6.ai/infrastructure/server:3.11.1"
+    image: "harbor2.vantage6.ai/infrastructure/server:4.0.2"
     depends_on:
       - db
     volumes:
       - ./server:/mnt/
-    command: vserver-local start -c /mnt/config.yml 
+    command: uwsgi --http :5000 --gevent 1000 --http-websockets --master --callable app --disable-logging --wsgi-file /vantage6/vantage6-server/vantage6/server/wsgi.py --pyargv /mnt/config.yml
     ports:
-      - "5001:5000"
+      - "5000:5000"
   gui:
-    image: harbor2.vantage6.ai/infrastructure/ui
+    image: harbor2.vantage6.ai/infrastructure/ui:latest
     depends_on:
       - vserver
     ports:
       - "8080:80"
     environment:
-      - API_URL=http://localhost:5001/api
+      - API_URL=http://localhost:5000/api
 
   jupyter:
     image: jupyter/minimal-notebook:2023-03-06

server/config.yml

@@ -1,33 +1,22 @@
-application: {}
-environments:
-  acc: {}
-  dev: {}
-  prod:
-    allow_drop_all: 'True'
-    api_path: /api
-    description: Server configuration
-    ip: 0.0.0.0
-    logging:
-      backup_count: 5
-      datefmt: '%Y-%m-%d %H:%M:%S'
-      file: server-conf.log
-      format: '%(asctime)s - %(name)-14s - %(levelname)-8s - %(message)s'
-      level: DEBUG
-      max_size: 1024
-      use_console: true
-    port: '5000'
-    uri: postgresql://vantage:vantage@db/vantage
+allow_drop_all: 'True'
+api_path: /api
+description: Server configuration
+ip: 0.0.0.0
+logging:
+  backup_count: 5
+  datefmt: '%Y-%m-%d %H:%M:%S'
+  file: server-conf.log
+  format: '%(asctime)s - %(name)-14s - %(levelname)-8s - %(message)s'
+  level: DEBUG
+  max_size: 1024
+  use_console: true
+port: '5000'
+uri: postgresql://vantage:vantage@db/vantage
 
-    vpn_server:
-      # the URL of your VPN server
-      url:***REMOVED***
-
-      # OATH2 settings, make sure these are the same as in the
-      # configuration file of your EduVPN instance
-    ***REMOVED***
-    ***REMOVED***
-    ***REMOVED***
-
-      # Username and password to acccess the EduVPN portal
-      portal_username: vantage
-      portal_userpass: ***REMOVED***
+vpn_server:
+  url: "https://vpn.carrier-mu.src.surf-hosted.nl/vpn-user-portal"
+  portal_username: "vantage"
+  portal_userpass: "venusvliegenvanger"
+  client_id: "vantage6-server"
+  client_secret: "30faa993f32"
+  redirect_url: http://localhost