Merge branch 'master' into 'devel'

Master

See merge request !38

.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

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
     },

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

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")