Merge branch 'main' into BC-5119-prevent-creating-new-nexboards

hpi-schul-cloud · Dec 12, 2023 · d6d63af · d6d63af
2 parents e116251 + 48a1540
commit d6d63af
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 86 deletions.
diff --git a/ansible/roles/schulcloud-client-core/templates/client-configmap-files.yml.j2 b/ansible/roles/schulcloud-client-core/templates/client-configmap-files.yml.j2
@@ -62,53 +62,22 @@ data:
                   defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://cloud-instances.s3.hidrive.strato.com',
             },
             '^/courses': {
-                defaultSrc: 'https://nexboard.nexenio.com https://lti.tools https://codeocean.openhpi.de {{ BETTERMARKS_SCHOOL_URL | default("") }} https://moodle.hpi-schul-cloud.de',
-                fontSrc: 'https://vjs.zencdn.net https://fonts.googleapis.com https://cdn.jsdelivr.net',
+                defaultSrc: 'https://nexboard.nexenio.com https://lti.tools {{ BETTERMARKS_SCHOOL_URL | default("") }}',
+                fontSrc: 'https://vjs.zencdn.net https://cdn.jsdelivr.net',
                 styleSrc: 'https://vjs.zencdn.net',
                 frameSrc: 'https://nexboard.nexenio.com',
             },
             '^/teams': {
                 fontSrc: 'https://vjs.zencdn.net',
                 styleSrc: 'https://vjs.zencdn.net',
             },
-            '^/homework': {
-                fontSrc: 'https://fonts.gstatic.com',
-            },
             '^/files': {
                 fontSrc: 'https://vjs.zencdn.net',
                 styleSrc: 'https://vjs.zencdn.net',
             },
-            /* '^/news': {
-            },
-            '^/calendar': {
-            }, */
-            '^/content': {
-                defaultSrc: 'https://pichasso.xopic.de',
-                fontSrc: 'https://fonts.gstatic.com',
-            },
-            /* '^/(content|(courses/[a-f0-9]{24}/topics/[a-f0-9]{24}))': {
-            }, */
-            '^/administration': {
-                fontSrc: 'https://fonts.gstatic.com',
-            },
-            /* '^/account': {
-            },
-            '^/logout': {
-            },
-            '^/impressum': {
-            },
-            '^/privacypolicy': {
-            }, */
             '^/about': {
                 defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://cloud-instances.s3.hidrive.strato.com https://s3.hidrive.strato.com',
             },
-            '^/community': {
-                defaultSrc: 'https://play.google.com',
-            },
-            /* '^/partner': {
-            },
-            '^/help': {
-            }, */
         },
       },
       /*

diff --git a/config/http-headers.js b/config/http-headers.js
@@ -40,58 +40,27 @@ const config = {
 		*/
 		corsSiteSpecific: {
 			'^/$': {
-				defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://play.google.com https://cloud-instances.s3.hidrive.strato.com',
+				defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://cloud-instances.s3.hidrive.strato.com',
 			},
 			'^/dashboard': {
 				defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://cloud-instances.s3.hidrive.strato.com',
 			},
 			'^/courses': {
-				defaultSrc: 'https://nexboard.nexenio.com https://www.geogebra.org https://lti.tools https://codeocean.openhpi.de https://acc.bettermarks.com https://moodle.schul-cloud.org',
-				fontSrc: 'https://vjs.zencdn.net https://fonts.googleapis.com https://cdn.jsdelivr.net',
+				defaultSrc: 'https://nexboard.nexenio.com https://www.geogebra.org https://lti.tools https://acc.bettermarks.com',
+				fontSrc: 'https://vjs.zencdn.net https://cdn.jsdelivr.net',
 				styleSrc: 'https://vjs.zencdn.net',
 			},
 			'^/teams': {
 				fontSrc: 'https://vjs.zencdn.net',
 				styleSrc: 'https://vjs.zencdn.net',
 			},
-			'^/homework': {
-				fontSrc: 'https://fonts.gstatic.com',
-			},
 			'^/files': {
 				fontSrc: 'https://vjs.zencdn.net',
 				styleSrc: 'https://vjs.zencdn.net',
 			},
-			/* '^/news': {
-			},
-			'^/calendar': {
-			}, */
-			'^/content': {
-				defaultSrc: 'https://pichasso.xopic.de',
-				fontSrc: 'https://fonts.gstatic.com',
-			},
-			/* '^/(content|(courses/[a-f0-9]{24}/topics/[a-f0-9]{24}))': {
-			}, */
-			'^/administration': {
-				fontSrc: 'https://fonts.gstatic.com',
-			},
-			/* '^/account': {
-			},
-			'^/logout': {
-			},
-			'^/impressum': {
-			},
-			'^/privacypolicy': {
-			}, */
 			'^/about': {
 				defaultSrc: 'https://www10-fms.hpi.uni-potsdam.de https://cloud-instances.s3.hidrive.strato.com',
 			},
-			'^/community': {
-				defaultSrc: 'https://play.google.com',
-			},
-			/* '^/partner': {
-			},
-			'^/help': {
-			}, */
 		},
 	},
 	/*

diff --git a/views/lib/extended_footer.hbs b/views/lib/extended_footer.hbs
@@ -25,25 +25,6 @@
 				</ul>
 			</div>
 			<div class="col-md-4">
-				<!--
-				<h2 class="h4">{{$t "lib.extended_footer.link.mobileApp"}}</h2>
-				<div class="row mobile-app">
-					<div class="col-6 android-app">
-						<a href='https://play.google.com/store/apps/details?id=org.schulcloud.android&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'
-							target="_blank" rel="noopener">
-							<img alt="{{$t "lib.extended_footer.img_alt.nowAtGooglePlay"}}"
-								src='https://s3.hidrive.strato.com/cloud-instances/images/google-play-badge.png' />
-						</a>
-					</div>
-					<div class="col-6 ios-app">
-						<a
-							href='https://testflight.apple.com/join/7i2xN7hH' target="_blank" rel="noopener">
-							<img alt='Laden im App Store'
-								src='https://s3.hidrive.strato.com/cloud-instances/images/apple-app-store-badge.svg'/>
-						</a>
-					</div>
-				</div>
-				-->
 				<h2 class="h4 card-title">{{$t "lib.extended_footer.headline.vacancies" }}</h2>
 				<div class="form-group">
 					{{{$t "lib.extended_footer.text.weAreHiring"}}}