diff --git a/Deprecated/Deployment_Guidance_of_Station_Software.docx b/Deprecated/Deployment_Guidance_of_Station_Software.docx
deleted file mode 100644
index d38f00d2fe73b61131a27e159902fd4929ad3912..0000000000000000000000000000000000000000
Binary files a/Deprecated/Deployment_Guidance_of_Station_Software.docx and /dev/null differ
diff --git a/Deprecated/Deployment_Guidance_of_Station_Software_For_Docker_Compose.docx b/Deprecated/Deployment_Guidance_of_Station_Software_For_Docker_Compose.docx
deleted file mode 100644
index b6856697d14bdc231fe4c93e147c167676585a3a..0000000000000000000000000000000000000000
Binary files a/Deprecated/Deployment_Guidance_of_Station_Software_For_Docker_Compose.docx and /dev/null differ
diff --git a/Deprecated/StationEnvironmentFiles/.env-aachenbeeck b/Deprecated/StationEnvironmentFiles/.env-aachenbeeck
deleted file mode 100644
index e04e0d976b1f160661bda11bc5bf97a75e92776f..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-aachenbeeck
+++ /dev/null
@@ -1,25 +0,0 @@
-STATION_ID=aachenbeeck
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=aachenbeeck
-HARBOR_PASSWORD=Q4h+@Wq3@k#Q
-HARBOR_CLI=CU146e5g9EFNQxZwGec0UlgWDJox04Tq
-OTHER_HARBOR_CLI=6n757ho8teukkz07ewta9t8570sovcbl
-HARBOR_EMAIL=aachenbeeck@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-aachenbruegel b/Deprecated/StationEnvironmentFiles/.env-aachenbruegel
deleted file mode 100644
index 94a60d9fd8195d19c8a48f616d604f6df3cd58d4..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-aachenbruegel
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=aachenbruegel
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=aachenbruegel
-HARBOR_PASSWORD=Vjt9@KJHuvJ+
-HARBOR_CLI=H9SucgDFaI2Pe3lff11d0woHGz9zsWhs
-HARBOR_EMAIL=aachenbruegel@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-aachenjannik b/Deprecated/StationEnvironmentFiles/.env-aachenjannik
deleted file mode 100644
index 79f723ff41a55534206d909b249d32f5926f996b..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-aachenjannik
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=aachenjannik
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=aachenjannik
-HARBOR_PASSWORD=H5@+d8aZjfxX
-HARBOR_CLI=c2twGpRMSJMlh3MBYgNlmTRF0NdBYUAw
-HARBOR_EMAIL=aachenjannik@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-aachenmenzel b/Deprecated/StationEnvironmentFiles/.env-aachenmenzel
deleted file mode 100644
index 4019e2422bb9e29e4151fc1cd9289c89444ffd31..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-aachenmenzel
+++ /dev/null
@@ -1,25 +0,0 @@
-STATION_ID=aachenmenzel
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=aachenmenzel
-HARBOR_PASSWORD=WtR2H+qxM5Lu
-HARBOR_CLI=580wcOykS
-HARBOR_EMAIL=aachenmenzel@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
-VAULT_TOKEN=s.x0PoaaWNLojOoi7WQLD0NT4Z
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-dic_koeln b/Deprecated/StationEnvironmentFiles/.env-dic_koeln
deleted file mode 100644
index 2276aadb1b0a134f631da333b0b74a4337904470..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-dic_koeln
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=dic_koeln
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=dic_koeln
-HARBOR_PASSWORD=E+f_#sNcW4UD
-HARBOR_CLI=k5hdq6aao70c889k5eeolrouxujs5xvm
-HARBOR_EMAIL=dic_koeln@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-goettingen b/Deprecated/StationEnvironmentFiles/.env-goettingen
deleted file mode 100644
index f2e464b2a7db5f3b3198d771a5d5ed797360f976..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-goettingen
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=goettingen
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=goettingen
-HARBOR_PASSWORD=5d8@b+4M6NC!
-HARBOR_CLI=9yjah3qx0cbpqw821kdncdjq5wti02lt
-HARBOR_EMAIL=goettingen@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-leipzig b/Deprecated/StationEnvironmentFiles/.env-leipzig
deleted file mode 100644
index 28d790ebf4ecba16af12daa78c4ccfa7f2fc0e63..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-leipzig
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=leipzig
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=leipzig
-HARBOR_PASSWORD=qE@2kfLVzS+r
-HARBOR_CLI=wn1ms2u1ayla9e8xbvy65f05if2ouux2
-HARBOR_EMAIL=leipzig@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-mittweida b/Deprecated/StationEnvironmentFiles/.env-mittweida
deleted file mode 100644
index 9056401395f2dc8a7f0460f0d319e52195c69a03..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-mittweida
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=mittweida
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=mittweida
-HARBOR_PASSWORD=E!x9LYW44g+4
-HARBOR_CLI=ckupestp30g1zqj3zyrb33ddbw3o4mgj
-HARBOR_EMAIL=mittweida@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.env-ukaachen b/Deprecated/StationEnvironmentFiles/.env-ukaachen
deleted file mode 100644
index 624e42366d2c80a7ccca3d891a3d90d6b12bde32..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/.env-ukaachen
+++ /dev/null
@@ -1,24 +0,0 @@
-STATION_ID=ukaachen
-MONGO_HOST=pht-mongo
-MONGO_PORT=27017
-MONGO_USER=admin
-MONGO_PASSWORD=admin
-MONGO_DB=pht
-DOCKER_HOST=pht-dind
-DOCKER_PORT=2376
-HARBOR_ADDRESS=menzel.informatik.rwth-aachen.de
-HARBOR_PORT=3007
-HARBOR_USER=ukaachen
-HARBOR_PASSWORD=kCtL@C+Me6vF
-HARBOR_CLI=fyx5fgw3gi57ldeq1h6j61drywwmuybu
-HARBOR_EMAIL=ukaachen@pht.de
-HARBOR_WEBHOOK_SECRET=secret
-CENTRALSERVICE_ADDRESS=menzel.informatik.rwth-aachen.de
-CENTRALSERVICE_PORT=3005
-AUTH_SERVER_ADDRESS=menzel.informatik.rwth-aachen.de
-AUTH_SERVER_PORT=3006
-JWT_SECRET=rwthi5-pht-jwt
-SESSION_SECRET=rwthi5-pht-session
-VAULT_HOST=pht-vault
-VAULT_PORT=8200
-METADATAPROVIDER_ENDPOINT=http://metadataservice:9988
\ No newline at end of file
diff --git a/Deprecated/StationEnvironmentFiles/.gitkeep b/Deprecated/StationEnvironmentFiles/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Deprecated/StationEnvironmentFiles/station.json b/Deprecated/StationEnvironmentFiles/station.json
deleted file mode 100644
index ace3bbfeb6469707fbb720024eb8323613715da0..0000000000000000000000000000000000000000
--- a/Deprecated/StationEnvironmentFiles/station.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[
- {
- "station_registry_uuid":"78c53fbb-f6b4-4866-8191-99cc766450fb",
- "username": "aachenbruegel",
- "password":"Vjt9@KJHuvJ+",
- "harbor_cli":"72f0g3u8vdspfqmbjek95ubpkjgqwtpe"
- },
- {
- "station_registry_uuid":"36158f2c-2ad4-42e9-99e3-7713bf2883ee",
- "username": "aachenmenzel",
- "password":"WtR2H+qxM5Lu",
- "harbor_cli":"djq2cwhp92pmxf4rsjndjn4i7hu0m4sq"
- },
- {
- "station_registry_uuid":"e4dd9f96-28cf-4599-b855-50f771ac4ee8",
- "username": "mittweida",
- "password":"E!x9LYW44g+4",
- "harbor_cli":"ckupestp30g1zqj3zyrb33ddbw3o4mgj"
- },
- {
- "station_registry_uuid":"ca4c78fc-4728-4dbd-ae48-a5e37535f3ac",
- "username": "leipzig",
- "password":"qE@2kfLVzS+r",
- "harbor_cli":"wn1ms2u1ayla9e8xbvy65f05if2ouux2"
- },
- {
- "station_registry_uuid":"ca4c78fc-4728-4dbd-ae48-a5e37535f3ac",
- "username": "goettingen",
- "password":"5d8@b+4M6NC!",
- "harbor_cli":"9yjah3qx0cbpqw821kdncdjq5wti02lt"
- }
-]
-
-
-
diff --git a/Deprecated/windowsServer2019DeploymentStepbyStep.docx b/Deprecated/windowsServer2019DeploymentStepbyStep.docx
deleted file mode 100644
index c3cd4fd10774b70c0f063c015f2e2417f2ca5690..0000000000000000000000000000000000000000
Binary files a/Deprecated/windowsServer2019DeploymentStepbyStep.docx and /dev/null differ
diff --git a/StationDeploymentFiles/docker-compose-dev.yml b/StationDeploymentFiles/docker-compose-dev.yml
index 0f250376fd5e465c3728e80dddd5fada4fedd442..32aa2a09d82d6f1bdaed5e0a33026fee859d2126 100644
--- a/StationDeploymentFiles/docker-compose-dev.yml
+++ b/StationDeploymentFiles/docker-compose-dev.yml
@@ -35,7 +35,7 @@ services:
restart: unless-stopped
dind:
- image: 'registry.git.rwth-aachen.de/padme-development/padme-station-software/dind:prerelease'
+ image: 'registry.git.rwth-aachen.de/padme-development/dind/dind:prerelease'
container_name: '${PROJECTNAME}pht-dind'
environment:
- DOCKER_TLS_CERTDIR=/certs
diff --git a/StationDeploymentFiles/docker-compose.dind-bind-mount.yml b/StationDeploymentFiles/docker-compose.dind-bind-mount.yml
deleted file mode 100644
index 9dde9f038d7eda0662b935962712b3ba3ecf218f..0000000000000000000000000000000000000000
--- a/StationDeploymentFiles/docker-compose.dind-bind-mount.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
- dind:
- volumes:
- - "${HOST_MOUNT_DIR}:${DIND_MOUNT_DIR}"
diff --git a/StationDeploymentFiles/mongo/init-mongo.js b/StationDeploymentFiles/mongo/init-mongo.js
index 551f9c3a8215b3d478028c9bbafae9838345df6c..9f0699070bc28b57f0203dbe72ddd34198aab348 100644
--- a/StationDeploymentFiles/mongo/init-mongo.js
+++ b/StationDeploymentFiles/mongo/init-mongo.js
@@ -1,22 +1,4 @@
db = db.getSiblingDB('pht')
-db.createUser(
- {
- user: "admin",
- pwd: "admin",
- roles: [
- {
- role: "readWrite",
- db: "pht"
- },
- {
- role: "dbAdmin",
- db: "pht"
- }
- ],
- mechanisms: ["SCRAM-SHA-1"]
- }
-)
-db = db.getSiblingDB('metadatapersistence')
db.createUser(
{
user: "admin",
diff --git a/federated/flJobWorker.js b/federated/flJobWorker.js
index 4b6e00b362839626582a45a438317f0c4c7ef32a..02bb2120bd0e2abf3b94fef89c5bbde5c2632044 100644
--- a/federated/flJobWorker.js
+++ b/federated/flJobWorker.js
@@ -837,14 +837,14 @@ class FLJobWorker extends EventEmitter
}
await self.#cleanupContainerAfterRound(self, container);
- await self.#logMessageOnCancle(self);
+ await self.#logMessageOnCancel(self);
}
/**
* Logs a last message after job cancellation
* @param {*} self
*/
- async #logMessageOnCancle(self)
+ async #logMessageOnCancel(self)
{
if (await self.#jobIsInState(self, FLJobState.CANCELED))
{
@@ -921,7 +921,7 @@ class FLJobWorker extends EventEmitter
/**
* Should be called when the user inspected the results for the current learning round
*/
- async handleUserInpectedResults()
+ async handleUserInspectedResults()
{
return this.#resolvePromiseIfDefined(this.#userInspectResultPromiseResolve, "inspected");
}
diff --git a/installationWizard/orig.js b/installationWizard/orig.js
deleted file mode 100644
index c340a3a60e0ffacb1a2a08fe430f9d9ec03805a7..0000000000000000000000000000000000000000
--- a/installationWizard/orig.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const crypto = require('crypto');
-const fs = require('fs');
-const algorithm = 'aes-256-ctr';
-
-const encrypt = (buffer, key) => {
- // Create an initialization vector
- const iv = crypto.randomBytes(16);
- // Create a new cipher using the algorithm, key, and iv
- const cipher = crypto.createCipheriv(algorithm, key, iv);
- // Create the new (encrypted) buffer
- const result = Buffer.concat([iv, cipher.update(buffer), cipher.final()]);
- return result;
-};
-
-const decrypt = (encrypted, key) => {
- // Get the iv: the first 16 bytes
- const iv = encrypted.slice(0, 16);
- // Get the rest
- encrypted = encrypted.slice(16);
- // Create a decipher
- const decipher = crypto.createDecipheriv(algorithm, key, iv);
- // Actually decrypt it
- const result = Buffer.concat([decipher.update(encrypted), decipher.final()]);
- return result;
-};
-
-let func = null
-try {
- func = process.argv[2];
-
-} catch (error) {
- console.log(error);
-}
-
-if (func == "encrypt") {
- let stationOtp = "PASSWORD";
- let envBuffer = fs.readFileSync("./env");
- hashKey = crypto.createHash('sha256').update(String(stationOtp)).digest('base64').substr(0, 32);
- const envBufferEncrypted = encrypt(envBuffer, hashKey);
- fs.writeFileSync("./env.enc", envBufferEncrypted);
-}
-
-if (func == "decrypt") {
-
- let envEncrypted = fs.readFileSync("./env.enc");
- let stationOtp = "PASSWORD";
- let key = crypto.createHash('sha256').update(String(stationOtp)).digest('base64').substr(0, 32);
-
- const decrypted = decrypt(envEncrypted, key);
- console.log(decrypted.toString());
-
-}
\ No newline at end of file
diff --git a/routes/dashboard/dashboard.js b/routes/dashboard/dashboard.js
index 5175b66775521c0a414b07afc2dc5283f2e990ed..0a942054ff0ace759dea6c69eb25d748b6d40082 100644
--- a/routes/dashboard/dashboard.js
+++ b/routes/dashboard/dashboard.js
@@ -281,7 +281,7 @@ router.get(
// Describe the occuring problem better
if (error.message.includes("EAI_AGAIN")) {
error.message +=
- " This means that the DNS resolution for the domain menzel.informatik.rwth-aachen.de ist NOT successfull. Most likely, the container has problems accessing the internet. Confirm this by using the command docker exec -it stationdeploymentfiles-pht-web /bin/bash and execute apt update. When the update is not successfull, the container has no working internet connection.";
+ " This means that the DNS resolution for the Central Service domain ist NOT successful. Most likely, the container has problems accessing the internet. Confirm this by using the command docker exec -it stationdeploymentfiles-pht-web /bin/bash and execute apt update. When the update is not successfull, the container has no working internet connection.";
}
console.log("error: ", error.message);
req.flash("error_msg", error.message);
diff --git a/routes/docker/docker.js b/routes/docker/docker.js
index 7e2ab136cea4cf1dd15062c47505e2e02f6bbbc1..9561ea8f240ba353a4dbb5627ff9183d9cb577cd 100644
--- a/routes/docker/docker.js
+++ b/routes/docker/docker.js
@@ -488,7 +488,7 @@ router.get('/image/remove', function(req, res) {
req.flash('success_msg', 'Image ' + image + ' has been removed.');
TransactionLog.create({user:req.user.email, logMessage:'Image ' + image + ' removed'});
- // remove temp direcotry
+ // remove temp directory
removeJobTempDir(jobId);
res.redirect('/dashboard/images');
@@ -614,88 +614,6 @@ router.get('/container/start', function(req, res) {
});
});
-// // Commit Container - OLD - WITHOUT ENCRYPTION
-// router.get('/container/commit', function (req, res) {
-// const { container, repo, tag, image } = req.query;
-// var options = {
-// uri: 'https://' + process.env.DOCKER_HOST + ':' + process.env.DOCKER_PORT + '/commit?container=' + container + '&repo=' + repo + '&tag=' + tag,
-// method: 'POST',
-// headers: {
-// "Content-Type": "application/json",
-// },
-// json: {},
-// agentOptions: getAgentOptions()
-// };
-// request(options, (error, response, body) => {
-// if (error) {
-// console.error(error);
-// req.flash('error_msg', error.message);
-// res.redirect('/dashboard/containers');
-// }
-// if (response.statusCode == 201) {
-// console.log("step1 - commit container: ", body);
-
-// // DELETE container after commit
-// var options = {
-// uri: 'https://' + process.env.DOCKER_HOST + ':' + process.env.DOCKER_PORT + '/containers/' + container,
-// method: 'DELETE',
-// agentOptions: getAgentOptions()
-// };
-// request(options, (error, response, body) => {
-// if (error) {
-// console.error(error);
-// req.flash('error_msg', error.message);
-// res.redirect('/dashboard/containers');
-// }
-// if (response.statusCode == 204) {
-// console.log("step2 - remove container: ", body);
-
-// if(process.env.STATION_ID === tag ){
-// req.flash('success_msg', 'Container ' + container + ' has been committed.');
-// res.redirect('/dashboard/images');
-// return;
-// }
-
-// // DELETE image
-// var options = {
-// uri: 'https://' + process.env.DOCKER_HOST + ':' + process.env.DOCKER_PORT + '/images/' + image + '?force=true',
-// method: 'DELETE',
-// agentOptions: getAgentOptions()
-// };
-// request(options, (error, response, body) => {
-// if (error) {
-// console.error(error);
-// req.flash('error_msg', error.message);
-// res.redirect('/dashboard/containers');
-// }
-// if (response.statusCode == 200) {
-// console.log("step3 - remove image: ", body);
-// req.flash('success_msg', 'Container ' + container + ' has been committed.');
-// TransactionLog.create({user:req.user.email, logMessage:'Container ' + container + ' committed'});
-// res.redirect('/dashboard/images');
-
-// } else {
-// console.error(body);
-// req.flash('error_msg', body);
-// res.redirect('/dashboard/containers');
-// }
-// });
-
-// } else {
-// console.error(body);
-// req.flash('error_msg', body);
-// res.redirect('/dashboard/containers');
-// }
-// });
-
-// } else {
-// console.error(body);
-// req.flash('error_msg', body);
-// res.redirect('/dashboard/containers');
-// }
-// });
-// });
-
router.get('/container/remove', function (req, res) {
const { jobId, container } = req.query;
var options = {
@@ -714,7 +632,7 @@ router.get('/container/remove', function (req, res) {
req.flash('success_msg', 'Container ' + container + ' has been removed.');
TransactionLog.create({ user: req.user.email, logMessage: 'Container ' + container + ' removed' });
- // remove temp direcotry
+ // remove temp directory
removeContainerTempDir(jobId, container);
res.redirect('/dashboard/containers');
diff --git a/routes/federated/federated.js b/routes/federated/federated.js
index 9c44fef1a6893583582394e0fccd9b2312f1dfa8..7ba2cced729d8fcd10928146ab7f6ce025090d0f 100644
--- a/routes/federated/federated.js
+++ b/routes/federated/federated.js
@@ -484,7 +484,7 @@ router.get('/results/:id', ensureAuthenticated, async (req, res) => {
}
//Update the worker that the user inspected the results
- await worker.handleUserInpectedResults();
+ await worker.handleUserInspectedResults();
res.status(200).send(JSON.stringify(createDataTree(changes)));
});
diff --git a/routes/vault/vault.js b/routes/vault/vault.js
index 65d24094b4cef18975fe98ba505943fde17679e4..3172eb6280a76c42514646919d2d3894bb8c775d 100644
--- a/routes/vault/vault.js
+++ b/routes/vault/vault.js
@@ -367,9 +367,4 @@ router.post('/kv/secret/edit', utility.asyncHandler(async (req, res, next) => {
}));
-module.exports = router;
-
-
-//http://menzel.informatik.rwth-aachen.de:8200/v1/sys/mounts/test1
-// {"path":"test1","type":"kv","config":{},"options":{"version":2},"generate_signing_key":true}
-//{"path":"test2","type":"kv","config":{},"options":{"version":1},"generate_signing_key":true}
\ No newline at end of file
+module.exports = router;
\ No newline at end of file
diff --git a/tools/restartContainerTest.sh b/tools/restartContainerTest.sh
deleted file mode 100644
index fe11fbbdb5ad1c3f5e9297feb256424c2c31476a..0000000000000000000000000000000000000000
--- a/tools/restartContainerTest.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-docker stop pht-web-test
-docker rm pht-web-test
-docker rmi pht-web-test
-docker build -t pht-web-test .
-docker run --name pht-web-test -d -p 3031:3030 \
- -v stationdeploymentfiles_pht-dind-certs-client:/usr/src/app/dind-certs-client/certs:ro \
- -v stationdeploymentfiles_pht-vault-certs-client:/usr/src/app/vault-certs-client/certs:ro \
- --dns 134.130.5.1 \
- --dns 134.130.4.1 \
- --env-file /home/jaberansary/pht-architecture/StationEnvironmentFiles/.env-aachenmenzel \
- pht-web-test
-docker network connect pht-net pht-web-test
-docker logs -f pht-web-test
\ No newline at end of file
diff --git a/tools/runDev.sh b/tools/runDev.sh
deleted file mode 100755
index a9840c1947ded4adab929d3045c7508a62b27752..0000000000000000000000000000000000000000
--- a/tools/runDev.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-docker build ../ --tag smithpht/station-software:latest
-#Run two versions of the station software
-export PROJECTNAME=
-export STATION_PORT=3030
-export COMMAND=
-docker-compose -f ../StationDeploymentFiles/docker-compose-dev.yml up -d
-if [ $1 -eq 2 ];
-then
-export PROJECTNAME=second
-export STATION_PORT=3031
-docker-compose -f ../StationDeploymentFiles/docker-compose-dev.yml -p second up -d
-{ docker logs pht-web -f & docker logs secondpht-web -f; }
-else
-docker logs pht-web -f
-fi;
\ No newline at end of file
diff --git a/tools/stopTest.sh b/tools/stopTest.sh
deleted file mode 100644
index 378517aa642e281e6913f45aa3ad6230b7c13ec0..0000000000000000000000000000000000000000
--- a/tools/stopTest.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export PROJECTNAME=
-export STATION_PORT=3030
-docker-compose -f ../StationDeploymentFiles/docker-compose-dev.yml down
-export PROJECTNAME=second
-export STATION_PORT=3031
-docker-compose -f ../StationDeploymentFiles/docker-compose-dev.yml -p second down
\ No newline at end of file
diff --git a/utils/accurids/accurids.test.js b/utils/accurids/accurids.test.js
deleted file mode 100644
index 6ebdc34bc3b60280629deb9bbfcc8b62a16d22eb..0000000000000000000000000000000000000000
--- a/utils/accurids/accurids.test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-test("test correct serverHost Creation", async () => {
- const pg = require("./index")
- i1 = new pg("https://test.example.org/accurids/graphql", "", "test")
- i2 = new pg("https://test.example.org/graphql", "", "test")
- i3 = new pg("https://test.example.org/miau", "", "test")
- i4 = new pg("", "", "test")
-
- expect(i1.serverHost).toEqual("https://test.example.org/accurids/dataset/details/test")
- expect(i2.serverHost).toEqual("https://test.example.org/dataset/details/test")
- expect(i3.serverHost).toEqual("https://test.example.org/miau/dataset/details/test")
- expect(i4.serverHost).toEqual("")
-})
\ No newline at end of file
diff --git a/utils/accurids/index.js b/utils/accurids/index.js
deleted file mode 100644
index 861b3aae801d229fda659a1686e5fca99a08d9c4..0000000000000000000000000000000000000000
--- a/utils/accurids/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-const axios = require("axios")
-
-function transformToServerHost(endpoint, datasetTag) {
- if (endpoint == "") { return "" }
- indexCutOff = String(endpoint).includes("graphql") ? endpoint.indexOf("/graphql") : endpoint.length
- return String(endpoint).substring(0, indexCutOff) + "/dataset/details/" + datasetTag
-}
-
-class AccuridsPIDGenerator {
- constructor(gqlendpoint, apikey, datasetTag) {
- this.graphql = String(gqlendpoint)
- this.apikey = apikey
- this.datasetTag = String(datasetTag)
- // what does the server host field in the query do?
- // it seems strange that this is needed
- // we set it to the browser standard
- this.serverHost = transformToServerHost(this.graphql, this.datasetTag)
- this.axios = axios.create({
- baseURL: this.graphql,
- timeout: 5000,
- headers: {"Apikey": this.apikey}
- })
- }
- async ping() {
- return this.axios.post("", '{ \
- "query": "" \
- }').then(resp => {
- if (resp.status == 200) {
- return Promise.resolve(true)
- } else {
- return Promise.reject(false)
- }
- }).catch(() => {
- return Promise.reject(false)
- })
- }
- async createPIDS(count) {
- const query = "mutation GenerateReferenceEntities($count: Int!, $datasetTag: String!, $serverHost: String!) {generateReferenceEntities(count: $count datasetTag: $datasetTag serverHost: $serverHost) { uri __typename } }"
- const variables = {
- count,
- datasetTag: this.datasetTag,
- serverHost: this.serverHost
- }
- return this.axios.post("", JSON.stringify({
- operationName: "GenerateReferenceEntities",
- variables,
- query
- })).then(resp => {
- console.log(resp.data)
- const uris = []
- for (const gRE of resp.data.data.generateReferenceEntities) {
- uris.push(gRE.uri)
- }
- return Promise.resolve(uris)
- })
- }
-
-}
-module.exports = AccuridsPIDGenerator
\ No newline at end of file
diff --git a/utils/train-config.js b/utils/train-config.js
index 11ee9aa8f3f47c8c89274b273cde6be888441ed3..e0fa9d6a061c4e4bda622613cae874e2f7dbcc5c 100644
--- a/utils/train-config.js
+++ b/utils/train-config.js
@@ -14,7 +14,6 @@ const getTrainConfigJsonBaseModel = () => {
const getTrainConfigFileName = () => {
const trainConfigFileName = 'train_config.json';
- // const trainConfigFileName = 'initTrain.py';
return trainConfigFileName;
}