From 38af91cff78a1a33674eb8b9fa8b8b57ae4e51ae Mon Sep 17 00:00:00 2001
From: Varun Srivastava <92srva1mst@hft-stuttgart.de>
Date: Fri, 15 May 2020 16:33:07 +0200
Subject: [PATCH 1/5] corrected typo error
---
views/DE/project/project.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/views/DE/project/project.html b/views/DE/project/project.html
index 7b53823a..73cd0ee5 100644
--- a/views/DE/project/project.html
+++ b/views/DE/project/project.html
@@ -25,7 +25,7 @@
src="/img/Icon_Haken.png" height="150" />
<br />
<h2 class="text-center heading"><small><strong>Open-Source-/ Open-Data-Projekte</strong></small><br></h2>
- <p class="text-left">ÜFür die Veröffentlichung von Open-Source-Projekten steht Ihnen eine von der HFT
+ <p class="text-left">Für die Veröffentlichung von Open-Source-Projekten steht Ihnen eine von der HFT
Stuttgart selbstverwaltete Gitlab-Instanz bereit.
<br /> <br />
Eine Übersicht der aktuellen Open-Source-/Open-Data-Projekte erreichen Sie über diesen <a
--
GitLab
From df55a9cc065bd5abf86fce3f80e79f810b90ef36 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Mon, 18 May 2020 07:33:31 +0000
Subject: [PATCH 2/5] Update .gitlab-ci.yml, added section for master
---
.gitlab-ci.yml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 273c37c2..64817da6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,4 +9,16 @@ pages-devel:
- testing
only:
- testing
- - test_logoutbutton
\ No newline at end of file
+ - test_logoutbutton
+
+pages-devel:
+ stage: deploy
+ script:
+ - npm install
+ - "pm2 delete --silent account || :"
+ - pm2 start ./app.js --name=account
+ - pm2 save
+ tags:
+ - production
+ only:
+ - master
\ No newline at end of file
--
GitLab
From fc41f1cd6ccd8ad5455772825cedc36aa7f4486b Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Mon, 18 May 2020 07:35:06 +0000
Subject: [PATCH 3/5] Update config.js, db links und idp links updated
---
config/config.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/config.js b/config/config.js
index b4c47761..1d20eccc 100644
--- a/config/config.js
+++ b/config/config.js
@@ -8,11 +8,11 @@ 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',
+ entryPoint: process.env.SAML_ENTRY_POINT || 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SSOService.php',
//issuer: 'sp-account.m4lab.hft-stuttgart.de', //local metadata
- issuer: 'sp-account-testing.m4lab.hft-stuttgart.de', //testing metadata
- //issuer: 'sp-account-prod.m4lab.hft-stuttgart.de', //production metadata
- logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php'
+ //issuer: 'sp-account-testing.m4lab.hft-stuttgart.de', //testing metadata
+ issuer: 'sp-account-prod.m4lab.hft-stuttgart.de', //production metadata
+ logoutUrl: 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php'
}
},
database: {
@@ -21,7 +21,7 @@ module.exports = {
password: 'Stuttgart2019', // DB password
port: 3306, // MySQL port
dbUser: 'userdb', // User DB
- host_project: 'm4lab.hft-stuttgart.de', // DB host project db
+ host_project: 'transfer.hft-stuttgart.de', // DB host project db
//host_project: 'localhost', // local
dbProject: 'projectDB' // Project DB
},
--
GitLab
From c76b2c97bef873ba16ab5974595d4163c3738c54 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Mon, 18 May 2020 13:59:17 +0200
Subject: [PATCH 4/5] changed image of projecttraeger in M4_Lab dependent
sidebar
---
views/DE/project/projectOverview.pug | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/views/DE/project/projectOverview.pug b/views/DE/project/projectOverview.pug
index 3b0b68f1..e015d1e6 100644
--- a/views/DE/project/projectOverview.pug
+++ b/views/DE/project/projectOverview.pug
@@ -144,9 +144,6 @@ html(lang="de")
if project.pname == 'M4LAB'
div(class="Downloads" style="height:200px;")
h5 Downloads
- p
- i(class="fas fa-file-download")
- a(href="./images/M4_LAB_Projekt/transferstrategie.pdf" download target="_blank") Transferstrategie der HfT Stuttgart
div(class="Projektlogos")
img(src="./images/M4_LAB_Projekt/WRS_Logo.jpg" width="32%")
@@ -154,8 +151,7 @@ html(lang="de")
img(src="./images/M4_LAB_Projekt/GWK_Logo.jpg" width="32%")
br
br
- img(src="./images/M4_LAB_Projekt/bbf_logo.png" width="32%")
- img(src="./images/M4_LAB_Projekt/ihs_logo.jpg" width="32%")
+ img(src="./images/M4_LAB_Projekt/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" width="100%")
//jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
--
GitLab
From 6da9a2ad24f4d76577b06a53134f79c698f0dac3 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Mon, 18 May 2020 12:02:55 +0000
Subject: [PATCH 5/5] Update config.js, adapted paths
---
config/config.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/config/config.js b/config/config.js
index b4c47761..be66b51e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -8,11 +8,10 @@ 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',
+ entryPoint: process.env.SAML_ENTRY_POINT || 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SSOService.php',
//issuer: 'sp-account.m4lab.hft-stuttgart.de', //local metadata
- issuer: 'sp-account-testing.m4lab.hft-stuttgart.de', //testing metadata
- //issuer: 'sp-account-prod.m4lab.hft-stuttgart.de', //production metadata
- logoutUrl: 'https://m4lab.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php'
+ issuer: 'sp-account-prod.m4lab.hft-stuttgart.de', //production metadata
+ logoutUrl: 'https://transfer.hft-stuttgart.de/idp/saml2/idp/SingleLogoutService.php'
}
},
database: {
@@ -21,7 +20,7 @@ module.exports = {
password: 'Stuttgart2019', // DB password
port: 3306, // MySQL port
dbUser: 'userdb', // User DB
- host_project: 'm4lab.hft-stuttgart.de', // DB host project db
+ host_project: 'transfer.hft-stuttgart.de', // DB host project db
//host_project: 'localhost', // local
dbProject: 'projectDB' // Project DB
},
--
GitLab