Commit 22112df1 authored by Wolfgang Knopki's avatar Wolfgang Knopki
Browse files

Merge branch 'MLAB-240' into 'testing'

Mlab 240

See merge request !9
parents bdfa83e2 d127d568
Pipeline #970 failed with stage
in 1 second
pages-testing: pages-testing:
stage: deploy stage: deploy
script: script:
- echo $configfiledevbase64 | base64 -d > ./config/config.js
- npm install - npm install
- "pm2 delete --silent project || :" - "pm2 delete --silent project || :"
- pm2 start ./app.js --name=project - pm2 start ./app.js --name=project
......
...@@ -8,27 +8,27 @@ module.exports = { ...@@ -8,27 +8,27 @@ module.exports = {
strategy: 'saml', strategy: 'saml',
saml: { saml: {
path: process.env.SAML_PATH || '/saml/SSO', path: process.env.SAML_PATH || '/saml/SSO',
entryPoint: process.env.SAML_ENTRY_POINT || 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SSOService.php', entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL',
issuer: 'sp-project.m4lab.hft-stuttgart.de', issuer: 'saml issuer URL',
logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php' logoutUrl: 'saml Logout URL'
} }
}, },
database: { database: {
user: 'DBManager', // DB username user: 'usernamedb', // DB username
password: 'Stuttgart2019', // DB password password: 'passworddb', // DB password
port: 3306, // MySQL port port: 3306, // MySQL port
dbUser: 'userdb', // User DB dbUser: 'userdb', // User DB
host_project: 'localhost', // local host_project: 'localhost', // local
dbProject: 'projectDB' // Project DB dbProject: 'projectdb' // Project DB
}, },
mailer: { mailer: {
host: 'mail.hft-stuttgart.de', // hostname host: 'mailhost', // hostname
secureConnection: false, // TLS requires secureConnection to be false secureConnection: false, // TLS requires secureConnection to be false
port: 587, // port for secure SMTP port: 587, // port for secure SMTP
authUser: 'ad\\support-transfer', authUser: 'usernamemail',
authPass: '6laumri2', authPass: 'passwordmail',
tlsCiphers: 'SSLv3', tlsCiphers: 'SSLv3',
from: 'support-transfer@hft-stuttgart.de', from: 'email_from',
} }
}, },
testing: { testing: {
...@@ -40,28 +40,27 @@ module.exports = { ...@@ -40,28 +40,27 @@ module.exports = {
strategy: 'saml', strategy: 'saml',
saml: { saml: {
path: process.env.SAML_PATH || '/saml/SSO', path: process.env.SAML_PATH || '/saml/SSO',
entryPoint: process.env.SAML_ENTRY_POINT || 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SSOService.php', entryPoint: process.env.SAML_ENTRY_POINT || 'saml entry URL',
issuer: 'sp-project-testing.m4lab.hft-stuttgart.de', issuer: 'saml issuer URL',
logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php' logoutUrl: 'saml Logout URL'
} }
}, },
database: { database: {
host: 'transfer.hft-stuttgart.de', // DB host user: 'usernamedb', // DB username
user: 'DBManager', // DB username password: 'passworddb', // DB password
password: 'Stuttgart2019', // DB password
port: 3306, // MySQL port port: 3306, // MySQL port
dbUser: 'userdb', // User DB dbUser: 'userdb', // User DB
host_project: 'm4lab.hft-stuttgart.de', // DB host project db host_project: 'localhost', // local
dbProject: 'projectDB' // Project DB dbProject: 'projectdb' // Project DB
}, },
mailer: { mailer: {
host: 'mail.hft-stuttgart.de', // hostname host: 'mailhost', // hostname
secureConnection: false, // TLS requires secureConnection to be false secureConnection: false, // TLS requires secureConnection to be false
port: 587, // port for secure SMTP port: 587, // port for secure SMTP
authUser: 'ad\\support-transfer', authUser: 'usernamemail',
authPass: '6laumri2', authPass: 'passwordmail',
tlsCiphers: 'SSLv3', tlsCiphers: 'SSLv3',
from: 'support-transfer@hft-stuttgart.de', from: 'email_from',
} }
}, },
production: { production: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment