From 1308afeb00ca94c3b9444ae6ab39f6ab0bdcb380 Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki Date: Wed, 16 Sep 2020 11:21:21 +0000 Subject: [PATCH 1/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab4b1a8..f6dfc49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ pages-testing: stage: deploy script: + - echo $configfiledevbase64 | base64 -d > ./config/config.js - npm install - "pm2 delete --silent project || :" - pm2 start ./app.js --name=project -- GitLab From 76e2c5fe9b3dfa3023eb2798795f1b2c6f57819c Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki Date: Wed, 16 Sep 2020 11:24:52 +0000 Subject: [PATCH 2/3] Update config.js --- config/config.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/config.js b/config/config.js index ae67f31..3788ef7 100644 --- a/config/config.js +++ b/config/config.js @@ -8,27 +8,27 @@ module.exports = { strategy: 'saml', saml: { path: process.env.SAML_PATH || '/saml/SSO', - entryPoint: process.env.SAML_ENTRY_POINT || 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SSOService.php', - issuer: 'sp-project.m4lab.hft-stuttgart.de', - logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php' + entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL', + issuer: 'saml issuer URL', + logoutUrl: 'saml Logout URL' } }, database: { - user: 'DBManager', // DB username - password: 'Stuttgart2019', // DB password + user: 'usernamedb', // DB username + password: 'passworddb', // DB password port: 3306, // MySQL port dbUser: 'userdb', // User DB host_project: 'localhost', // local - dbProject: 'projectDB' // Project DB + dbProject: 'projectdb' // Project DB }, mailer: { - host: 'mail.hft-stuttgart.de', // hostname + host: 'mailhost', // hostname secureConnection: false, // TLS requires secureConnection to be false port: 587, // port for secure SMTP - authUser: 'ad\\support-transfer', - authPass: '6laumri2', + authUser: 'usernamemail', + authPass: 'passwordmail', tlsCiphers: 'SSLv3', - from: 'support-transfer@hft-stuttgart.de', + from: 'email_from', } }, testing: { -- GitLab From d127d5683d6f3a35fbb1fc6b51962170f5d2a07d Mon Sep 17 00:00:00 2001 From: Wolfgang Knopki Date: Wed, 16 Sep 2020 11:25:58 +0000 Subject: [PATCH 3/3] Update config.js --- config/config.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/config/config.js b/config/config.js index 3788ef7..8fa365a 100644 --- a/config/config.js +++ b/config/config.js @@ -40,28 +40,27 @@ module.exports = { strategy: 'saml', saml: { path: process.env.SAML_PATH || '/saml/SSO', - entryPoint: process.env.SAML_ENTRY_POINT || 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SSOService.php', - issuer: 'sp-project-testing.m4lab.hft-stuttgart.de', - logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php' + entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL', + issuer: 'saml issuer URL', + logoutUrl: 'saml Logout URL' } }, database: { - host: 'transfer.hft-stuttgart.de', // DB host - user: 'DBManager', // DB username - password: 'Stuttgart2019', // DB password + user: 'usernamedb', // DB username + password: 'passworddb', // DB password port: 3306, // MySQL port dbUser: 'userdb', // User DB - host_project: 'm4lab.hft-stuttgart.de', // DB host project db - dbProject: 'projectDB' // Project DB + host_project: 'localhost', // local + dbProject: 'projectdb' // Project DB }, mailer: { - host: 'mail.hft-stuttgart.de', // hostname + host: 'mailhost', // hostname secureConnection: false, // TLS requires secureConnection to be false port: 587, // port for secure SMTP - authUser: 'ad\\support-transfer', - authPass: '6laumri2', + authUser: 'usernamemail', + authPass: 'passwordmail', tlsCiphers: 'SSLv3', - from: 'support-transfer@hft-stuttgart.de', + from: 'email_from', } }, production: { -- GitLab