From d3930db007ebe125c46fd8b49a08fe2018154652 Mon Sep 17 00:00:00 2001
From: Steffen Hauf <steffen.hauf@xfel.eu>
Date: Mon, 8 Apr 2019 14:59:47 +0200
Subject: [PATCH] Remove specific config
---
webservice/webservice.yaml | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/webservice/webservice.yaml b/webservice/webservice.yaml
index 80d6ce874..498a306c0 100644
--- a/webservice/webservice.yaml
+++ b/webservice/webservice.yaml
@@ -1,19 +1,19 @@
config-repo:
- url: https://haufs:E8wEEeAnzGmdsxEZWk8N@git.xfel.eu/gitlab/detectors/calibration_configurations.git
- local-path: /home/xcal/calibration_config/
+ url: https://git.xfel.eu/gitlab/detectors/calibration_configurations.git
+ local-path: /home/haufs/calibration_config/
web-service:
port: 5555
bind-to: tcp://*
- allowed-ips: 192.168.192.41, 131.169.247.60, 131.169.4.237, 131.169.4.239, 192.168.172.50, 192.168.172.47, 192.168.172.48, 192$
+ allowed-ips:
job-db: ./webservice_jobs.sqlite
- job-update-interval: 60
+ job-update-interval: 30
job-timeout: 3600
metadata-client:
- user-id: 'cf66a1e6f7bfd03f0aa188b1a4ea7ef9c0aa6363a993bf5b57d377b6397408fd'
- user-secret: '5a3569a8261be12f4fe69fc9aed1ee3fdea8f667598a0f68ae7731e50c82bd8e'
- user-email: 'calibration@example.com'
+ user-id:
+ user-secret:
+ user-email:
metadata-web-app-url: 'https://in.xfel.eu/metadata'
metadata-web-app-url: 'https://in.xfel.eu/metadata'
token-url: 'https://in.xfel.eu/metadata/oauth/token'
@@ -24,9 +24,4 @@ metadata-client:
correct:
in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw
- out-folder: /gpfs/exfel/d/proc/{instrument}/{cycle}/p{proposal}
-
-dark:
- in-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/raw
- out-folder: /gpfs/exfel/u/usr/{instrument}/{cycle}/p{proposal}/dark/runs_{runs}
-
+ out-folder: /gpfs/exfel/exp/{instrument}/{cycle}/p{proposal}/proc
--
GitLab