Merge branch 'master' into 'fix/ldap'

Master

See merge request FraDrive/fradrive!7

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [25.21.19](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.21.18...v25.21.19) (2021-12-13)
+
+
+### Bug Fixes
+
+* **build:** package-lock.json changed somehow see issue [#18](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/18) ([3caf0d5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3caf0d55f75d43b7a25a32b0383ab66022cd9fc3))
+* **build:** schools.model examDiscouragedModes default contained whitespace, which is not allowed ([9ee7ec8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9ee7ec8d7ab74832d10b6384490b9d20263f49b9))
+* **docker:** remove missing docker dependency ([1ac35e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1ac35e0bf816ccdccaf984ee5fe28b329c9cb258))
+* **metrics:** allow free access to metrics during development only ([085c841](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/085c841035b3f808ce6d8ae3f6e0e9e6452028df))
+* **models:** correct erroneous default values ([282a7d4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/282a7d44b24b70df0bcfa65a31c2c8c48bdee021))
+* **settings:** memcached host defaults to localhost, because why not? ([3d5e532](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3d5e532e2d963cacdd74c1b3a7237f37d1fd3751))
+* **status:** route status exempt from approot normalisation, might not fix the issue yet ([074a33d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/074a33dc51bd7e9ed72434223ceb06d70f1044c5))
+
 ## [25.21.18](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v25.21.17...v25.21.18) (2021-11-23)
 
 

models/schools.model

@@ -6,7 +6,7 @@ School json
     examMinimumRegisterBeforeStart NominalDiffTime Maybe
     examMinimumRegisterDuration    NominalDiffTime Maybe
     examRequireModeForRegistration Bool default=false
-    examDiscouragedModes ExamModeDNF default='{"dnf-terms": []}'
+    examDiscouragedModes ExamModeDNF default='{"dnf-terms":[]}'
     examCloseMode ExamCloseMode default='separate'
     sheetAuthorshipStatementMode SchoolAuthorshipStatementMode default='optional'
     sheetAuthorshipStatementDefinition AuthorshipStatementDefinitionId Maybe

nix/docker/default.nix

@@ -26,7 +26,7 @@ let
       # pandoc  # just for manual testing within the pod, remove for production, since we use the library instead!
       curl wget netcat # just for manual testing within the pod, remove for production!
       openldap  # just for manual testing within the pod, remove for production!
-      build-essentials
+      iana-etc
     ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
 
     runAsRoot = ''

nix/docker/demo-version.json

@@ -1,3 +1,3 @@
 {
-  "version": "25.21.18"
+  "version": "25.21.19"
 }

nix/docker/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "25.21.18"
+  "version": "25.21.19"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "25.21.18",
+  "version": "25.21.19",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -20000,7 +20000,7 @@
     },
     "tail.datetime": {
       "version": "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git#ef1237569ff22667acb64a9dfd64682ee55817eb",
-      "from": "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git#master"
+      "from": "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git#uni2work"
     },
     "tapable": {
       "version": "1.1.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "25.21.18",
+  "version": "25.21.19",
   "description": "",
   "keywords": [],
   "author": "",

package.yaml

@@ -1,5 +1,5 @@
 name: uniworx
-version: 25.21.18
+version: 25.21.19
 dependencies:
   - base
   - yesod

routes

@@ -39,7 +39,7 @@
 /static StaticR EmbeddedStatic appStatic                      !free
 /auth   AuthR   Auth   getAuth                                !free
 
-/metrics     MetricsR GET
+/metrics     MetricsR GET																			!free -- verify if this can be free
 
 /err                          ErrorR           GET            !free
 

src/Foundation/Yesod/Middleware.hs

@@ -137,6 +137,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar
       case route of
         MetricsR -> mzero
         HealthR -> mzero
+        StatusR -> mzero
         InstanceR -> mzero
         AdminCrontabR -> mzero
         _other -> return ()
@@ -147,7 +148,7 @@ yesodMiddleware = cacheControlMiddleware . storeBearerMiddleware . csrfMiddlewar
       approotHost <- hoistMaybe $ approotScopeHost rApproot app
       let doRedirect = do
             url <- approotRender rApproot route
-            $logDebugS "normalizeApprootMiddleware" url
+            $logDebugS "normalizeApprootMiddleware redirect" url
             redirect url
       if | approotHost /= reqHost
          , rApproot /= ApprootUserGenerated