fix(day): fix #2347 by adding repeated examiner check to day consistency check for day exam occurrences

towards #2347

.azure-pipelines/templates/jobs/release.yaml

@@ -1,65 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: releaseTag
-    type: string
-  - name: releaseEndpoint
-    type: string
-    default: 'devfra'
-    values:
-      - 'devfra'
-      - 'prodfra'
-
-jobs:
-  - job: Release
-    displayName: Release ${{ parameters.releaseTag }}
-    container:
-      image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
-      endpoint: devfra
-    steps:
-
-      # Download required artifacts from pipeline
-      - task: DownloadPipelineArtifact@2
-        displayName: Download FraDrive binaries
-        inputs:
-          artifactName: Build_backend
-          patterns: 'Build_backend/bin/*'
-          targetPath: '$(Build.Repository.LocalPath)'
-
-      - task: Docker@2
-        displayName: Login to container registry
-        inputs:
-          command: login
-          containerRegistry: '${{ parameters.releaseEndpoint }}'
-      - task: Bash@3
-        displayName: Build FraDrive container
-        inputs:
-          targetType: inline
-          script: |
-            cp docker/fradrive/Dockerfile .
-            docker build \
-            --tag $(buildImageUpstream)/fradrive:$(Build.BuildNumber) \
-            --tag $(buildImageUpstream)/fradrive:${{parameters.releaseTag}} \
-            --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.trusted/ubuntu \
-            --build-arg FROM_TAG=20.04 \
-            --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
-            --build-arg IN_CI=true \
-            --build-arg IN_CONTAINER=true \
-            --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
-            --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
-            --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
-            --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
-            .
-      - task: Docker@2
-        displayName: Push container to registry
-        inputs:
-          command: push
-          repository: 'de.fraport.fradrive.build/fradrive'
-          tags: '$(Build.BuildNumber),${{parameters.releaseTag}}'
-      - task: Docker@2
-        displayName: Logout from container registry
-        inputs:
-          command: logout
-          containerRegistry: '${{ parameters.releaseEndpoint }}'

.azure-pipelines/templates/jobs/setup_dependencies.yaml

@@ -1,61 +0,0 @@
-# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: serviceName
-    type: string
-  - name: dependenciesCaches
-    type: object
-    default: []
-  - name: dependenciesBuildPool
-    type: string
-    default: 'Prod Private Agent Pool'
-    values:
-      - 'Prod Private Agent Pool'
-      - 'Prod Private Agent Pool DS2'
-      - 'Prod Private Agent Pool DS3'
-  - name: dependenciesBuildCores
-    type: number
-    default: 1
-  - name: dependenciesBuildTimeout
-    type: number
-    default: 60
-
-jobs:
-- job: SetupDependencies_${{parameters.serviceName}}
-  displayName: Install ${{parameters.serviceName}} dependencies
-  dependsOn: SetupImage_${{parameters.serviceName}}
-  ${{ if eq(variables.setupImages, true) }}:
-    condition: succeeded()
-  ${{ else }}:
-    condition: always()
-  pool: '${{parameters.dependenciesBuildPool}}'
-  timeoutInMinutes: ${{parameters.dependenciesBuildTimeout}}
-  container:
-    ${{ if variables.setupImages }}:
-      image: $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
-    ${{ else }}:
-      image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
-    endpoint: devfra
-    env:
-      PROJECT_DIR: $(Build.Repository.LocalPath)
-      IN_CONTAINER: true
-      IN_CI: true
-  steps:
-    # Restore previously-built dependencies from caches
-    - ${{ each cache in parameters.dependenciesCaches }}:
-      - template: ./../../steps/cache.yaml
-        parameters:
-          cacheIdent: '${{parameters.serviceName}}-dependencies'
-          cacheKeys: '${{cache.key}}'
-          cachePath: '${{cache.path}}'
-
-    # Compile dependencies
-    - template: ./../../steps/make.yaml
-      parameters:
-        makeJob: dependencies
-        makeService: ${{parameters.serviceName}}
-        makeVars: 'CPU_CORES=${{parameters.dependenciesBuildCores}} STACK_CORES=-j${{parameters.dependenciesBuildCores}}'
-
-    # (Note: a post-job for updating the dependency cache is automatically created, so no further step is due here.)

.azure-pipelines/templates/jobs/setup_image.yaml

@@ -1,72 +0,0 @@
-# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: imageName
-    type: string
-  - name: imageBase
-    type: object
-
-jobs:
-- job: SetupImage_${{parameters.imageName}}
-  displayName: Build ${{parameters.imageName}} image
-  condition: eq(variables.setupImages, true)
-  container:
-    image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
-    endpoint: devfra
-  steps:
-    - task: Docker@2
-      displayName: Login to container registry
-      inputs:
-        command: login
-        containerRegistry: devfra
-    - task: Bash@3
-      displayName: Build ${{parameters.imageName}} image
-      inputs:
-        targetType: inline
-        script: |
-          cp docker/${{parameters.imageName}}/Dockerfile .
-          docker build \
-          --tag $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber) \
-          --build-arg FROM_IMG=${{parameters.imageBase.image}} \
-          --build-arg FROM_TAG=${{parameters.imageBase.tag}} \
-          --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
-          --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
-          --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
-          --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
-          --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
-          --build-arg IN_CI=true \
-          --build-arg IN_CONTAINER=true \
-          .
-    - task: Bash@3
-      displayName: Push ${{parameters.imageName}} image
-      inputs:
-        targetType: inline
-        script: |
-          docker push $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber)
-    - task: Bash@3
-      displayName: Update latest ${{parameters.imageName}} image
-      condition: or(eq(variables.forcePushLatest, true), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-      inputs:
-        targetType: inline
-        script: |
-          docker tag $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.imageName}}:latest
-          docker push $(buildImageUpstream)/${{parameters.imageName}}:latest
-    - task: Bash@3
-      displayName: Save image for publication
-      inputs:
-        targetType: inline
-        script: |
-          docker image save --output=$(Build.ArtifactStagingDirectory)/${{parameters.imageName}}.tar $(buildImageUpstream)/${{parameters.imageName}}:$(Build.BuildNumber)
-    - task: PublishBuildArtifacts@1
-      displayName: Publish image as artifact
-      inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-        ArtifactName: Image_${{parameters.imageName}}
-        publishLocation: 'Container'
-    - task: Docker@2
-      displayName: Logout from container registry
-      inputs:
-        command: logout
-        containerRegistry: devfra

.azure-pipelines/templates/service.yaml

@@ -1,141 +0,0 @@
-# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: serviceName
-    type: string
-    default: serviceName
-  - name: serviceBase
-    type: object
-    default:
-      image: baseImage
-      tag: baseImageTag
-  - name: servicePool
-    type: string
-    default: 'Prod Private Agent Pool'
-  - name: serviceTimeout
-    type: number
-    default: 60
-  # extraBuildOptions: ''
-  - name: serviceDependsOn
-    type: object
-    default: []
-  - name: serviceRequiredArtifacts
-    type: object
-    default: []
-  - name: serviceArtifacts
-    type: string
-    default: ''
-  - name: buildSteps
-    type: object
-
-stages:
-  - stage: ${{ parameters.serviceName }}
-    dependsOn: ${{ parameters.serviceDependsOn }}
-    pool: '${{ parameters.servicePool }}'
-    jobs:
-    - job: ImageBuild_${{parameters.serviceName}}
-      displayName: Build ${{parameters.serviceName}} image
-      condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true), eq(variables.onUpdateBranch, true))
-      container:
-        image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
-        endpoint: devfra
-      steps:
-        - checkout: self
-        - task: Docker@2
-          displayName: Login to container registry
-          inputs:
-            command: login
-            containerRegistry: devFra
-        - script: |
-            ls -a .
-            pwd
-            find .
-        - task: Bash@3
-          displayName: Build ${{parameters.serviceName}} image
-          inputs:
-            targetType: inline
-            script: |
-              cp docker/${{parameters.serviceName}}/Dockerfile .
-              docker build \
-              --tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) \
-              --build-arg FROM_IMG=${{parameters.serviceBase.image}} \
-              --build-arg FROM_TAG=${{parameters.serviceBase.tag}} \
-              --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \
-              --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \
-              --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \
-              --build-arg FRAPORT_NOPROXY=dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de \
-              --build-arg PROJECT_DIR=$(Build.Repository.LocalPath) \
-              --build-arg IN_CI=true \
-              --build-arg IN_CONTAINER=true \
-              .
-        - task: Bash@3
-          displayName: Push ${{ parameters.serviceName }} image
-          inputs:
-            targetType: inline
-            script: |
-              docker push $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber)
-        - task: Bash@3
-          displayName: Update latest ${{parameters.serviceName}} image
-          condition: or(eq(variables.forcePushLatest, true), eq(variables.onMasterBranch, true))
-          inputs:
-            targetType: inline
-            script: |
-              docker tag $(buildImageUpstream)/${{parameters.serviceName}}:$(Build.BuildNumber) $(buildImageUpstream)/${{parameters.serviceName}}:latest
-              docker push $(buildImageUpstream)/${{parameters.serviceName}}:latest
-        - task: Docker@2
-          displayName: Logout from container registry
-          inputs:
-            command: logout
-            containerRegistry: devFra
-
-    - job: Build_${{parameters.serviceName}}
-      displayName: Build ${{parameters.serviceName}}
-      dependsOn:
-        - ImageBuild_${{parameters.serviceName}}
-      condition: in(dependencies.ImageBuild_${{parameters.serviceName}}.result, 'Succeeded', 'Skipped')
-      timeoutInMinutes: ${{ parameters.serviceTimeout }}
-      container:
-        # TODO: use BuildNumber instead of latest in update branches
-        # image: devfra.azurecr.io/de.fraport.fradrive.build/frontend:$(Build.BuildNumber)
-        image: $(buildImageUpstream)/${{parameters.serviceName}}:latest
-        endpoint: devfra
-        env:
-          PROJECT_DIR: $(Build.Repository.LocalPath)
-          IN_CONTAINER: true
-          IN_CI: true
-      steps:
-        - checkout: self
-        - ${{ each dependency in parameters.serviceRequiredArtifacts }}:
-          - task: DownloadPipelineArtifact@2
-            displayName: Download artifacts from ${{ dependency.name }} dependency
-            continueOnError: ${{ dependency.continueOnError }}
-            condition: ${{ dependency.condition }}
-            inputs:
-              artifactName: ${{ dependency.artifact }}
-              source: ${{ dependency.source }}
-              project: 'Fahrerausbildung'
-              pipeline: $(System.DefinitionId)
-              buildVersionToDownload: '${{ dependency.version }}'
-              tags: '${{ dependency.artifact }}'
-              allowPartiallySucceededBuilds: true
-              allowFailedBuilds: true
-              patterns: '${{ dependency.patterns }}'
-              targetPath: '$(Build.Repository.LocalPath)'
-        - ${{ each buildStep in parameters.buildSteps }}:
-          - template: ./service/build-step.yaml
-            parameters:
-              service: ${{ parameters.serviceName }}
-              buildStep: ${{ buildStep }}
-        - task: CopyFiles@2
-          displayName: Copy ${{parameters.serviceName}} artifacts
-          inputs:
-            Contents: ${{ parameters.serviceArtifacts }}
-            TargetFolder: '$(Build.ArtifactStagingDirectory)'
-        - task: PublishBuildArtifacts@1
-          displayName: Publish ${{parameters.serviceName}} artifacts
-          inputs:
-            PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-            ArtifactName: '${{parameters.serviceName}}'
-            publishLocation: 'Container'

.azure-pipelines/templates/steps/artifact-download.yaml

@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: artifactName
-    type: string
-
-steps:
-  - task: DownloadPipelineArtifact@2
-    displayName: Download artifacts from ${{parameters.artifactName}}
-    inputs:
-      source: 'current'
-      artifactName: '${{parameters.artifactName}}'
-      targetPath: '$(Build.Repository.LocalPath)'

.azure-pipelines/templates/steps/cache.yaml

@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: cacheIdent
-    type: string
-  - name: cacheKeys
-    type: string
-  - name: cachePath
-    type: string
-
-steps:
-  - task: Cache@2
-    displayName: Restore ${{parameters.cacheIdent}} cache
-    inputs:
-      key: '"${{parameters.cacheIdent}}" | ${{parameters.cacheKeys}}'
-      path: '${{parameters.cachePath}}'

.azure-pipelines/templates/steps/make.yaml

@@ -1,35 +0,0 @@
-# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-parameters:
-  - name: makeJob
-    type: string
-    values:
-      - dependencies
-      - compile
-      - lint
-      - test
-  - name: makeService
-    type: string
-    values:
-      - frontend
-      - backend
-  - name: makeVars
-    type: string
-    default: ''
-
-steps:
-  - task: Bash@3
-    name: ${{parameters.makeJob}}_${{parameters.makeService}}
-    displayName: make ${{parameters.makeJob}}-${{parameters.makeService}}
-    env:
-      HTTPS_PROXY: http://proxy.frankfurt-airport.de:8080
-      HTTP_PROXY: http://proxy.frankfurt-airport.de:8080
-      NO_PROXY: 'localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io'
-      FRAPORT_NOPROXY: 'dev.azure.com,*.dev.azure.com,*.fraport.de,*.frankfurt-airport.de'
-      PROJECT_DIR: $(Build.Repository.LocalPath)
-    inputs:
-      targetType: inline
-      script: |
-        make -- --${{parameters.makeJob}}-${{parameters.makeService}} IN_CONTAINER=true IN_CI=true PROJECT_DIR=${PROJECT_DIR} ${{parameters.makeVars}}

.babelrc.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022 Felix Hamann <felix.hamann@campus.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+
+SPDX-License-Identifier: AGPL-3.0-or-later

.eslintrc.json.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+
+SPDX-License-Identifier: AGPL-3.0-or-later

.gitignore

@@ -2,12 +2,9 @@
 dist*
 develop
 node_modules/
-.npm/
-.node_repl_history
-**/assets/icons
-**/assets/favicons
+assets/icons
+assets/favicons
 bin/
-assets/fonts/
 *.hi
 *.o
 *.sqlite3
@@ -42,19 +39,19 @@ src/Handler/Assist.bak
 src/Handler/Course.SnapCustom.hs
 *.orig
 /instance
-backend/instance
 .stack-work-*
-.stack-work.lock
 .directory
 tags
 test.log
 *.dump-splices
+/.stack-work.lock
+/.npmrc
+/.npm/
 /config/manifest.json
 tunnel.log
-static
-well-known
-.well-known-cache
-manifest.json
+/static
+/well-known
+/.well-known-cache
 /.nix-well-known
 /**/tmp-*
 /testdata/bigAlloc_*.csv
@@ -68,4 +65,4 @@ manifest.json
 **/result-*
 .develop.cmd
 /.vscode
-backend/.ghc/ghci_history
+.ghc/ghci_history

.gitlab-ci/version.pl

@@ -55,12 +55,12 @@ my %parKinds = (
   },
   autokind=>{
     arity=>1,
-    def=>'release/prod=v,release/*=t,*=t',
+    def=>'main=v,master=v,test=t,*=t',
     help=>'determine the tag kind from branch name instead of fixed value; use the first fitting glob',
   },
   change=>{
     arity=>1,
-    def=>'chore=patch,feat=minor,feature=minor,fix=patch,BREAK=major,perf=patch,refactor=patch,test=patch,style=patch,revert=patch,docs=patch,build=patch,ci=patch',
+    def=>'chore=patch,feat=minor,feature=minor,fix=patch,BREAK=major,perf=patch,refactor=patch,test=patch,style=patch,revert=null,docs=patch,build=null,ci=null',
     help=>'how to react on which commit type; can be partially given. Actions are: "null", "major", "minor", "patch" or state "invalid" for removing this type',
   },
   changelog=>{
@@ -143,7 +143,6 @@ if($par{autokind}) {
   my @rules = split /,/, $par{autokind};
   RULES: {
     for my $r(@rules) {
-      warn "$0: Processing autokind rule '$r'\n" if $par{v};
       if($r!~m#(.*)=(.*)#) {
         die "$0: Bad rule in autokind: $r\n";
       }
@@ -159,15 +158,14 @@ if($par{autokind}) {
 $branchNameEscaped =~ s/[^0-9a-zA-Z]+/-/g;
 
 if($par{'v'}) {
-  warn "VERBOSE: Parameters\n";
+  print "VERBOSE: Parameters\n";
   for my $k(sort keys %par) {
-    warn "  $k: $par{$k}\n"
+    print "  $k: $par{$k}\n"
   }
 }
 
 my %typeReact = ();
 for my $as(split /,/, $par{change}) {
-  warn "$0: processing change parameter '$as'\n" if $par{v};
   if($as=~m#(.*)=(.*)#) {
     $typeReact{$1} = $2;
   } else {
@@ -246,21 +244,16 @@ sub parseVersion {
     warn "$0: unexpected old version number: $v\n" if $par{v};
     return undef
   }
-  $cap{pre} = 'v' if '' eq $cap{pre};
-  my %ret = (
-    prefix=>$cap{pre},
-    major=>$cap{ma},
-    minor=>$cap{mi},
-    patch=>$cap{p},
-    subpatch=>$cap{sp},
-    branchname=>$cap{brn},
-    branchversion=>$cap{brv},
-  );
-  if($par{v}) {
-    my $parsed = join '; ', map { "$_=>".($ret{$_}//'') } sort keys %ret;
-    warn "Version '$v' was parsed to '$parsed'\n"
+  $pre = 'v' if '' eq $pre;
+  return {
+    prefix=>$pre,
+    major=>$ma,
+    minor=>$mi,
+    patch=>$p,
+    subpatch=>$sp,
+    branchname=>$brn,
+    branchversion=>$brv,
   }
-  return \%ret
 }
 
 #@oldVersions = sort {
@@ -300,7 +293,7 @@ sub vsCompare {
       ($v->{minor} // 0) <=> ($w->{minor} // 0) ||
       ($v->{patch} // 0) <=> ($w->{patch} // 0) ||
       ($v->{branchname} // '') cmp ($w->{branchname} // '') ||
-      ($v->{branchversion} // 0) <=> ($w->{branchversion} // 0) ||
+      ($v->{branchversion} // '') <=> ($w->{branchversion} // '') ||
       ($v->{subpatch} // '') cmp ($w->{subpatch} // '')
     )
   } elsif($v->{prefix}=~m/^v?$/ and !$w->{prefix}=~m/^v?$/) {
@@ -376,7 +369,6 @@ if('-' eq $par{vcslog}) {
 }
 my @versions = ();
 for my $v(@versionsOrig) {
-  warn "$0: Processing orig version (part 1): '$v'\n" if $par{v};
   if($v=~m#^(.*?\S)\s*::::\s*(.*?)\s*::::\s*(.*)#) {
     push @versions, {
       hash => $1,
@@ -394,7 +386,6 @@ my $tag = undef;
 my @versionPast = ();
 
 VERSION: for my $v(@versions) {
-  warn "$0: Processing version (part 2): $v\n" if $par{v};
   #if($v->{meta}=~m#tag\s*:\s*\Q$par{kind}\E(.*)\)#) {
   #  $tag=$1;
   #  last VERSION
@@ -424,7 +415,6 @@ VERSION: for my $v(@versions) {
 #$tag = parseVersion($tag);
 
 for my $r(reverse @change) {
-  warn "$0: Processing change: $r\n" if $par{v};
   if('major' eq $r->{react}) {
     $tag->{major}++;
     $tag->{minor}=0;
@@ -474,7 +464,6 @@ my $highStart = $mainVersion ? $sortAll[0] : $sortSee[0];
 my $highSee = $sortSee[0];
 my %reactCollect = ();
 SEARCHVERSION: for my $v(@versions) {
-  warn "$0: search for version: '$v'\n" if $par{v};
   next unless $v->{version};
   next unless $v->{react};
   $reactCollect{$v->{react}} = 1;
@@ -486,12 +475,10 @@ SEARCHVERSION: for my $v(@versions) {
 sub justVersionInc {
   my ($v, $react) = @_;
   my $vv = parseVersion($v);
-  $vv->{patch}++; # if $react->{patch}; # in principal a good idea to increase only when a patch action happend, but we need a new version, even if nothing happend, so we always increase patch; if there are other changes as well, it is overwritten anyways
+  $vv->{patch}++ if $react->{patch};
   do {$vv->{minor}++; $vv->{patch}=0} if $react->{minor};
   do {$vv->{major}++; $vv->{minor}=0; $vv->{patch}=0} if $react->{major};
-  my $ret = vsJustVersion($vv);
-  warn "$0: version inc from '$v' to $ret\n" if $par{v};
-  return $ret
+  return vsJustVersion($vv);
 }
 
 my $newVersion = undef;
@@ -514,7 +501,6 @@ for(@allVersions) {
   $allVersions{$_} = 1
 }
 while(exists $allVersions{$newVersion}) {
-  warn "$0: Version conflict, so we try another version, '$newVersion' exists already\n" if $par{v};
   if($mainVersion) {
     die "$0: probably internal error (collision in main version)\n"
   }
@@ -544,7 +530,6 @@ if($par{changelog}) {
   my %seen = ();
   my @sects = ([]);
   for(@changelog) {
-    warn "$0: Changelog processing: '$_'\n" if $par{v};
     push @sects, [] if m/^## /;
     push @{$sects[-1]}, $_;
     if(m#/commit/([a-f0-9]+)\s*\)\s*\)\s*$#) {
@@ -558,7 +543,6 @@ if($par{changelog}) {
     shift @sects;
   }
   for my $s(@sects) {
-    warn "$0: Changelog processing, section search: '$s'\n" if $par{v};
     my $hh = $s->[0];
     chomp $hh;
     my $cnt = @$s;
@@ -583,7 +567,6 @@ if($par{changelog}) {
     'feature' => 'Features',
   );
   SELECTCHANGELOG: for my $v(@versions) {
-    warn "$0: Changelog processing, version selection: '$v'\n" if $par{v};
     last SELECTCHANGELOG if $seen{$v->{hash}};
     next unless $v->{subject}=~m#^\s*([a-z]+)\s*(!?)\s*((?:\(.*?\))?)\s*:\s*(.*?)\s*$#i;
     my ($kind, $break, $context, $msg) = ($1, $2, $3, $4);

.versionrc.js

@@ -7,33 +7,33 @@ const standardVersionUpdaterYaml = require.resolve('standard-version-updater-yam
 module.exports = {
   scripts: {
     // postbump: './sync-versions.hs && git add -- package.yaml', // moved to bumpFiles
-    postchangelog: 'sed \'s/^### \\[/## [/g\' -i CHANGELOG.md',
+    postchangelog: 'sed \'s/^### \\[/## [/g\' -i CHANGELOG.md'
   },
   packageFiles: ['package.json', 'package.yaml'],
   bumpFiles: [
     {
       filename: 'package.json',
-      type: 'json',
+      type: 'json'
     },
     {
       filename: 'package-lock.json',
-      type: 'json',
+      type: 'json'
     },
     {
       filename: 'package.yaml',
-      updater: standardVersionUpdaterYaml,
+      updater: standardVersionUpdaterYaml
     },
     {
       filename: 'nix/docker/version.json',
-      type: 'json',
+      type: 'json'
     },
     {
       filename: 'nix/docker/demo-version.json',
-      type: 'json',
-    },
+      type: 'json'
+    }
   ],
   commitUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/{{hash}}',
   compareUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/{{previousTag}}...{{currentTag}}',
   issueUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/{{id}}',
-  userUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/{{user}}',
+  userUrlFormat: 'https://gitlab2.rz.ifi.lmu.de/{{user}}'
 };

CHANGELOG.md

@@ -2,16 +2,6 @@
 
 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.
 
-## [27.4.59-0.0.20+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.19+145-build-system-rewrite...27.4.59-0.0.20+145-build-system-rewrite) (2025-03-19)
-
-## [27.4.59-0.0.19+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/27.4.59-0.0.18+145-build-system-rewrite...27.4.59-0.0.19+145-build-system-rewrite) (2025-03-17)
-
-## [27.4.59-0.0.18+145-build-system-rewrite](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.17...27.4.59-0.0.18+145-build-system-rewrite) (2025-03-17)
-
-### Bug Fixes
-
-* **static:** fix addStaticContent by using memcached again to supply static files ([570cfc2](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/570cfc238bdccd3438124f96290b9272c8e82f0f))
-
 ## [v27.4.59-test-g0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.17...v27.4.59-test-g0.0.17) (2025-02-18)
 
 ## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17)
@@ -26,48 +16,6 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14)
 
-## [v27.4.59-test-e0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.13...v27.4.59-test-e0.0.14) (2025-02-13)
-
-## [v27.4.59-test-e0.0.13](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.12...v27.4.59-test-e0.0.13) (2025-02-12)
-
-## [v27.4.59-test-e0.0.12](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-d0.0.12...v27.4.59-test-e0.0.12) (2025-02-12)
-
-## [v27.4.59-test-d0.0.12](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-d0.0.11...v27.4.59-test-d0.0.12) (2025-02-11)
-
-## [v27.4.59-test-d0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-c0.0.11...v27.4.59-test-d0.0.11) (2025-02-11)
-
-## [v27.4.59-test-c0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-b0.0.11...v27.4.59-test-c0.0.11) (2025-02-11)
-
-## [v27.4.59-test-b0.0.11](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-c0.0.10...v27.4.59-test-b0.0.11) (2025-02-11)
-
-## [v27.4.59-test-c0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-b0.0.10...v27.4.59-test-c0.0.10) (2025-02-11)
-
-## [v27.4.59-test-b0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.10...v27.4.59-test-b0.0.10) (2025-02-11)
-
-## [v27.4.59-test-a0.0.10](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.9...v27.4.59-test-a0.0.10) (2025-02-11)
-
-## [v27.4.59-test-a0.0.9](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.8...v27.4.59-test-a0.0.9) (2025-02-10)
-
-## [v27.4.59-test-a0.0.8](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.7...v27.4.59-test-a0.0.8) (2025-02-10)
-
-## [v27.4.59-test-a0.0.7](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.6...v27.4.59-test-a0.0.7) (2025-02-10)
-
-## [v27.4.59-test-a0.0.6](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.5...v27.4.59-test-a0.0.6) (2025-02-08)
-
-## [v27.4.59-test-a0.0.5](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.4...v27.4.59-test-a0.0.5) (2025-02-07)
-
-## [v27.4.59-test-a0.0.4](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.3...v27.4.59-test-a0.0.4) (2025-02-07)
-
-## [v27.4.59-test-a0.0.3](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.2...v27.4.59-test-a0.0.3) (2025-02-06)
-
-## [v27.4.59-test-a0.0.2](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.1...v27.4.59-test-a0.0.2) (2025-02-05)
-
-## [v27.4.59-test-a0.0.1](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-a0.0.0...v27.4.59-test-a0.0.1) (2025-02-05)
-
-### Bug Fixes
-
-* **ghci:** ghci works now as expected ([c3117db](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/c3117dbdcd1de9ef9f0751afa45018e2ebce2c42))
-
 ## [v27.4.59-test-a0.0.0](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59...v27.4.59-test-a0.0.0) (2024-10-25)
 
 ### Features
@@ -75,6 +23,97 @@ All notable changes to this project will be documented in this file. See [standa
 * **util script:** Util script for renaming of files added. ([caf8fec](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/caf8fec5acb94df16293bf9aa0cdab766f8829e8))
 * **frontend:** load icons from svg files ([22781e1](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/22781e1565e890cf6c5b40973146b0334cb667aa))
 
+### Bug Fixes
+
+* **stack.yaml:** move to uniworx.de gitlab ([55484e6](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/55484e631b786ea3710d322282019baf5292c243))
+* **utils/renamer:** Mehr outputs nur im verbose-Fall. ([ac30cb9](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/ac30cb9e6712d0ee3f204da4863d1e2509af8a76))
+* **utils:** Verboseparameter -v hinzugefuegt; rekursives makedir; genauere Meldungen. ([1806d9f](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/1806d9f01fc4a0746d2f9df42ef1ee6827c7fa09))
+* **Dockerfile:** change rights of source dir to env user ([e7a8183](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/e7a8183656ae419cfee2942543045c6fa6a9caa3))
+* **Makefile:** add missing dependency on well-known for backend-builds ([a09dc59](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/a09dc59f260843f8815c382576bb5254d21104bf))
+* **frontend:** fixed icon colour in table headers ([4c4571d](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/4c4571d2d0879e89f2572eba6015d34a7f4794c8))
+* **doc:** minor haddock problems ([d4f8a6c](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/d4f8a6c77b2a4a4540935f7f0beca0d0605508c8))
+## [27.4.76](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.75...v27.4.76) (2024-08-08)
+
+
+### Bug Fixes
+
+* **ap:** disambiguate action message ([8b0466e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8b0466e74e36e1d0d07518fd317d46b00ab53eff))
+* **avs:** fix [#173](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/173) by not using firm superior email as display email ([43f5c5f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/43f5c5f4854d1ab2af27b479e72a58e2818a5696))
+* **avs:** towards [#117](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/117) update if current value is Nothing even if oldval == newval ([d1fa01f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d1fa01fcc5125c4adee8849f9c944884926f78ad))
+* **avs:** using firm superior as UserEmail is a no-go due to uniqueness constraints ([507a7e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/507a7e02fc68476d01031dc9f9ee1a669a453ed1))
+* **build:** linter likes it ([f929e03](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f929e03129378e08c8a08ed4bd6f8e8716401813))
+* **course:**  fix [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150) course edit for associated qualifications requires school admin or lecturer rights ([5b6e4e6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5b6e4e60e7d2957fbce93ee2e2d6d3464b4e3db7))
+* **course:** fix [#148](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/148) course qualification ordering ([cfd2534](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/cfd25348ad3b63ac6bc5031467a3c4ead2e07eed)), closes [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150)
+* **course:** fix [#149](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/149) course cloning proposes associated qualifications ([e141976](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e1419766f3a06f702abad0ea42f6552305504ba0))
+* **course:** fix [#150](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/150) no longer allow duplicated associated qualifications and orders due to editing existing ([ec02767](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ec027675525b30198378745ed281f60a42471807))
+* **course:** WIP course cloning should propose same associated qualifications, towards [#149](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/149) ([bc47387](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bc47387c91dda60a2f12e52dba28ea7b079316f0))
+* **lms:** max e-learning tries default removed and info added to lms overview ([11fdcf0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/11fdcf0d445b8cfe97c3a3c26513a9229937c536))
+* **user:** format userDisplayNames having umlaut substitutes with respect to userSurname correctly ([e35a5e9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e35a5e99a6cea0976fd1c28f919e7d0ac0338503))
+
+## [27.4.75](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.74...v27.4.75) (2024-07-12)
+
+
+### Bug Fixes
+
+* **build:** make linter happy again ([c17c18f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c17c18f9247ef322bc051602a3cb4a52cd50affa))
+* **build:** minor ([ab28c8c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ab28c8c2437680023d80e6ab43113d4328b3a151))
+* **firm:** fix [#157](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/157) by removing redundant duplicated code in firm user and supervision handling ([28e2739](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/28e2739e515700d15c75647c0efe2fe9a9cf15b1))
+* **job:** change some queueJob' to queueJob instead ([fa0541a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fa0541aa4eaf10f98535a0959593b148b8346109))
+* **lms:** allow 2nd reminders to be independent of renewal period ([d853e85](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d853e8559b753865ee818bf24764f5c8d2e2303f))
+* **lms:** move lms reuse info from QualificationR to LmsR ([468af9d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/468af9de9da44a8ad685ca4bb6890a3e630b58be))
+* **lms:** send second reminder indepentently from renewal period ([a97c3a5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a97c3a5c9d3cb9dddf90f561712f0845400893bd))
+* **nix:** workaround parsing port numbers failed in nix-shell ([b5215cc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b5215cc7e8df3a7ad636271c8e6950979b2b8e42))
+* **users:** nameHtml no longer complains about differing case for surname and displayname ([a1668f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a1668f891a36b887439afb098f016ef22535af42))
+* **users:** remove users with company post address from list of unreachable users ([c813c66](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c813c665ed306135b7813d91d23310341c689f41))
+
+## [27.4.74](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.73...v27.4.74) (2024-07-04)
+
+
+### Bug Fixes
+
+* **lms:** fix [#161](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/161) lms for multiple joint qualifications ([f869a82](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f869a829d2c1a726930864b3af62d1f0fbebe955))
+
+## [27.4.73](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.72...v27.4.73) (2024-07-03)
+
+
+### Bug Fixes
+
+* **letter:** rephrase some minor letter parts ([0ac75e0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0ac75e0d5948cb90855d0e36ca8e99c22a0f6fcb))
+
+## [27.4.72](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.71...v27.4.72) (2024-07-02)
+
+
+### Bug Fixes
+
+* **avs:** do not associate users by AvsInfoPersonEmail ([9e2f221](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9e2f2214ce5c7ee1e8d80e6fa75298b7a70d9043))
+* **avs:** fix superfluous quotes for matriculation numbers on newly created users ([ff9014c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ff9014ce05d197c1dc0fce0774a640789cb38b26))
+* **avs:** towards [#169](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/169) - superiors are elevated to max priority for that company ([5bf8539](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5bf85394d4db6de8f10b4e318d667130d37601ac))
+* **firm:** supervisor secondary did not work as intended ([d4f3ce7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4f3ce7bf3d208b16f95ab81971b47dfa752939a))
+
+## [27.4.71](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.70...v27.4.71) (2024-06-27)
+
+
+### Bug Fixes
+
+* **avs:** company superior emails become company wide supervisors ([37efc89](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/37efc89e0723452e6d271ba5b43d6bd026642190))
+* **avs:** match mobile number better between LDAP and AVS ([f108c6c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f108c6cfec2d94d866e7c1605b0abe5471fd0f2b))
+* **avs:** new AVS from existing LDAP user no longer misses fields ([2559346](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2559346d963ede802321dfc8cbd2088d9a5de685))
+* **avs:** priority for picking primary email demote superior ([e4fa1dd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e4fa1ddd6873910bef82d569fe16aca936efc567))
+* **build:** add missing license file ([8721bdb](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/8721bdb3f349658baab144d64c19942bfd7fa49a))
+* **build:** hlint wants a newtype instead ([18cdc52](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/18cdc52df094b9dbccd4f015561367cea59e33fe))
+* **doc:**  fix erroneous unintentional haddock annotations ([3dfc7f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3dfc7f8c8b12dd6ef87848a75f1669d700fffe4c))
+* **i18n:** add missing translation for new primary company ([c212f2e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c212f2e8d735616e59c9b8111a34118e3a48fd47))
+* **i18n:** add missing translation for new primary company ([2cc529b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2cc529be39655c317ca028f8f09fa80826ec668d))
+* **ldap:** match mobile number better between LDAP and AVS ([47e5628](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/47e56280fce4ad37e6bc3b9f1c61cb7867069cc5))
+* **letter:** adjust spacing, pin location and interpolation ([d4a0e1f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4a0e1f201151f76e8e9afd67b456cc878d2afde))
+* **letter:** convenience links working again ([5f1af13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5f1af130edae7ada2f0c7f7829890bbe0d4f395a))
+* **letter:** expiry and valid dates were wrong ([f8c3663](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f8c36636ff1f2591507e993af32ed01af94cf1fc))
+* **letter:** switch markdown for renewal letter too ([c38e87e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c38e87e1e0e9285a10c00521b7440cd8246af88a))
+* **print:** fix [#167](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/167) by sotring affected user in PrintJob ([73aecc2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/73aecc2df833bdeed93a113b6c756e36b50491b7))
+
+## [27.4.70](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.69...v27.4.70) (2024-06-21)
+
+
 ### Bug Fixes
 
 * **stack.yaml:** move to uniworx.de gitlab ([55484e6](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/55484e631b786ea3710d322282019baf5292c243))

Makefile

@@ -1,57 +1,87 @@
+
 export SHELL=bash
 
-export CLEAN_DEPENDENCIES ?= false
-export CLEAN_IMAGES ?= false
+# MAKE=make -f Makefile-loggingsymbols
+# MAKE=make -d
 
-export ENTRYPOINT ?= bash
+# System information
+export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
+
+export CONTAINER_COMMAND ?= podman
+export CONTAINER_BGRUN ?= $(CONTAINER_COMMAND) run -dit --network=host --replace
+export CONTAINER_FGRUN ?= $(CONTAINER_COMMAND) run -it --network=host --replace
+
+export IMAGE_REGISTRY = docker.io
+export MEMCACHED_IMAGE = $(IMAGE_REGISTRY)/memcached:latest
+export MINIO_IMAGE = $(IMAGE_REGISTRY)/minio/minio:latest
+export MAILDEV_IMAGE = $(IMAGE_REGISTRY)/maildev/maildev:latest # TODO: needs different port than 1025 to avoid conflicts
+
+export IN_CONTAINER ?= false
+export IN_CI ?= false
+export CONTAINER_FILE
+export CONTAINER_IDENT
+export CF_PREFIX
+export DEVELOP
+export MOUNT_DIR=/mnt/fradrive
+export CONTAINER_ATTACHED
+export CONTAINER_INIT
+export CONTAINER_CLEANUP
+
+export SERVICE
+export SERVICE_VARIANT ?= $(SERVICE)
+export JOB
+export CONTAINER_CMD
+export SET_CONTAINER_CMD
+export ENTRYPOINT
+export EXEC_OPTS
+
+export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
+export BASE_PORTS
+export UNIWORXDB_OPTS ?= -cf
+export PROD ?= false
 export SRC
 
+ifneq ($(PROD),true)
+  export --DEVELOPMENT=--flag uniworx:dev
+endif
+
+export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
+
+export CURR_DEV = $(shell cat develop/.current 2>/dev/null)
+export SET_DEVELOP = $(eval DEVELOP=develop/$$(CURR_DEV))
+export NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
+
+
 .PHONY: help
 # HELP: print out this help message
 help:
-	docker compose run help
+	@if [ -z "$$(which perl 2>/dev/null)" ] ; then \
+	  $(CONTAINER_FGRUN) .:/mnt 'debian:12.5' '/mnt/utils/makehelp.pl' '/mnt/Makefile' ; \
+	else \
+	  utils/makehelp.pl Makefile ; \
+	fi
 
 .PHONY: clean
-# HELP: clean compilation caches
+# HELP: stop all running containers and remove all compilation results in the directory (but leave images including dependencies unharmed)
 clean:
-	$(MAKE) clean-frontend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES) 
-	$(MAKE) clean-backend CLEAN_DEPENDENCIES=$(CLEAN_DEPENDENCIES) CLEAN_IMAGES=$(CLEAN_IMAGES)
+	rm -rf develop
+	-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json
+	-rm -rf .stack-work .stack-work.lock
+	-rm -rf bin .Dockerfile develop
+	-$(CONTAINER_COMMAND) container prune --force
+.PHONY: clean-images
+# HELP: stop all running containers and clean all images from local repositories
+clean-images:
+	rm -rf develop
+	sleep 5
+	-$(CONTAINER_COMMAND) system prune --all --force --volumes
+	-$(CONTAINER_COMMAND) image prune --all --force
+	-$(CONTAINER_COMMAND) volume prune --force
 .PHONY: clean-all
-# HELP: clean everything, including dependency and image caches
-clean-all: CLEAN_DEPENDENCIES = true
-clean-all: CLEAN_IMAGES = true
-clean-all: clean ;
+# HELP: like clean but with full container, image, and volume prune
+clean-all: clean-images
+	-rm -rf .stack
 
-.PHONY: clean-%
-# HELP(clean-$SERVICE): invalidate caches for a given service. Supported services: frontend, backend.
-clean-%:
-	$(MAKE) stop-$*
-	@$(MAKE) -- --clean-$*
-	@echo "Cleaned $* build files and binaries."
-ifeq ("$(CLEAN_DEPENDENCIES)", "true")
-	@$(MAKE) -- --clean-$*-deps
-	@echo "Cleaned $* dependencies."
-endif
-ifeq ("$(CLEAN_IMAGES)", "true")
-	$(MAKE) kill-$*
-	docker compose rm --force --volumes
-	docker compose down --rmi 'all' --volumes
-	@echo "Cleaned $* image."
-endif
---clean-frontend:
-	-rm -rf assets/icons assets/favicons
-	-rm -rf static well-known
---clean-frontend-deps:
-	-rm -rf frontend/node_modules
-	-rm -rf frontend/.npm
---clean-backend:
-	-rm -rf backend/.stack-work
-	-rm -rf bin/
---clean-backend-deps:
-	-rf -rf backend/.stack
-
-
-# TODO: only release when build and tests are passing!!!
 .PHONY: release
 # HELP: create, commit and push a new release
 release:
@@ -63,61 +93,328 @@ release:
 	git push origin $${VERSION}
 
 .PHONY: compile
-# HELP: perform full compilation (frontend and backend)
-compile: compile-frontend compile-backend ;
-.PHONY: compile-%
-# HELP(compile-$SERVICE): compile a given service once
-compile-%:
-	docker compose run --remove-orphans --build --no-deps $* make compile
+compile:
+	$(MAKE) compile-frontend
+	$(MAKE) compile-backend
 
 .PHONY: start
-# HELP: start complete development environment with a fresh test database
-start: start-postgres start-maildev start-memcached start-minio start-backend
-	docker compose exec backend make start
+start:
+	$(MAKE) start-postgres
+	$(MAKE) start-memcached
+	$(MAKE) start-minio
+	$(MAKE) compile-frontend
+	$(MAKE) compile-uniworxdb
+	$(MAKE) start-backend
+
+.PHONY: %-backend
+%-backend: SERVICE=backend
+%-backend: SERVICE_VARIANT=backend
+%-backend: CONTAINER_CMD=localhost/fradrive/backend
+%-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
+
+.PHONY: %-uniworxdb
+%-uniworxdb: SERVICE=backend
+%-uniworxdb: SERVICE_VARIANT=uniworxdb
+%-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend
+
+.PHONY: %-ghci
+%-ghci: SERVICE=backend
+%-ghci: SERVICE_VARIANT=ghci
+%-ghci: CONTAINER_CMD=localhost/fradrive/backend
+
+.PHONY: %-hoogle
+%-hoogle: SERVICE=backend
+%-hoogle: SERVICE_VARIANT=hoogle
+%-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
+%-hoogle: CONTAINER_CMD=localhost/fradrive/backend
+--start-hoogle:
+	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
+	stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
+
+.PHONY: %-frontend
+%-frontend: SERVICE=frontend
+%-frontend: SERVICE_VARIANT=frontend
+%-frontend: CONTAINER_CMD=localhost/fradrive/frontend
+
+.PHONY: %-postgres
+%-postgres: SERVICE=postgres
+%-postgres: SERVICE_VARIANT=postgres
+%-postgres: BASE_PORTS = "PGPORT=5432"
+%-postgres: CONTAINER_CMD=localhost/fradrive/postgres
+
+.PHONY: %-memcached
+%-memcached: SERVICE=memcached
+%-memcached: SERVICE_VARIANT=memcached
+%-memcached: SET_CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
+%-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
+
+.PHONY: %-minio
+%-minio: SERVICE=minio
+%-minio: SERVICE_VARIANT=minio
+%-minio: SET_CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
+%-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
+
 .PHONY: start-%
-# HELP(start-$SERVICE): start a given service
-start-%:
-	docker compose up -d --build $*
+start-%: JOB=start
+start-%: CF_PREFIX = start-
+start-%: CONTAINER_ATTACHED = false
+start-%: --act ;
+
+.PHONY: compile-%
+compile-%: JOB=compile
+compile-%: CF_PREFIX = compile-
+compile-%: CONTAINER_ATTACHED = true
+compile-%: --act ;
+
+.PHONY: dependencies-%
+dependencies-%: JOB=dependencies
+dependencies-%: CF_PREFIX = dependencies-
+dependencies-%: CONTAINER_ATTACHED = true
+dependencies-%: --act ;
+
+.PHONY: test-%
+test-%: JOB=test
+test-%: CF_PREFIX = test-
+test-%: CONTAINER_ATTACHED = true
+test-%: --act ;
+
+.PHONY: lint-%
+lint-%: JOB=lint
+lint-%: CF_PREFIX = lint-
+lint-%: CONTAINER_ATTACHED = true
+lint-%: --act ;
 
 .PHONY: shell-%
-# HELP(shell-$SERVICE): launch a (bash) shell inside a given service
-shell-%:
-	docker compose run --build --no-deps --entrypoint="$(ENTRYPOINT)" $*
+# HELP(shell-$SERVICE): launch (bash) shell inside a new $SERVICE container
+shell-%: JOB=shell
+shell-%: CF_PREFIX=shell-
+shell-%: CONTAINER_ATTACHED=true
+shell-%: --act ;
 .PHONY: ghci
-# HELP: launch ghci instance. Use in combination with SRC to specify the modules to be loaded by ghci: make ghci SRC=src/SomeModule.hs
-ghci: ENTRYPOINT=stack ghci $(SRC)
-ghci: shell-backend ;
+# HELP(ghci): launch new backend instance and enter interactive ghci shell
+ghci: shell-ghci;
 
-.PHONY: stop
-# HELP: stop all services
-stop:
-	docker compose down
-.PHONY: stop-%
-# HELP(stop-$SERVICE): stop a given service
-stop-%:
-	docker compose down $*
-.PHONY: kill-%
-# HELP(kill-$SERVICE): kill a given service the hard way. Use this if the servive does not respond to stop.
-kill-%:
-	docker compose kill $*
+--act: --develop_containerized;
+
+--develop_%: PORTS = $(foreach PORT,$(BASE_PORTS),$(shell utils/next_free_port.pl $(PORT)))
+--develop_%: --ensure-develop
+	DEVELOP=develop/`cat develop/.current` ; \
+	CONTAINER_IDENT=$(CF_PREFIX)$(SERVICE_VARIANT) ; \
+	CONTAINER_FILE=$${DEVELOP}/$${CONTAINER_IDENT} ; \
+	if [[ -e $${CONTAINER_FILE} ]]; then \
+	  >&2 echo "Another $* service is already running! Use \"make new-develop\" to start a new develop instance despite currently running services." ; \
+	  exit 1 ; \
+	fi ; \
+	echo "$(PORTS)" | sed 's/ /\n/g' > $${CONTAINER_FILE} ; \
+	$(MAKE) -- --$* CONTAINER_FILE=$${CONTAINER_FILE} CONTAINER_IDENT=$${CONTAINER_IDENT} JOB=$(JOB)
+
+.PHONY: rebuild-%
+# HELP(rebuild-{backend,frontend,database,memcached,minio}): force-rebuild a given container image
+rebuild-%:
+	$(MAKE) -- --image-build SERVICE=$* NO_CACHE=--no-cache
+--image-build:
+ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)"
+	rm -f .Dockerfile
+	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
+	MOUNT_DIR=/mnt/fradrive; \
+	PROJECT_DIR=/mnt/fradrive; \
+	if [ "$(IN_CI)" == "true" ] ; then \
+	  PROJECT_DIR=/fradrive; \
+	fi; \
+	if [ "$(IN_CONTAINER)" == "false" ] ; then \
+	  $(CONTAINER_COMMAND) build $(NO_CACHE) \
+	    -v $(PWD):$${MOUNT_DIR} \
+		--build-arg MOUNT_DIR=$(MOUNT_DIR) \
+		--build-arg PROJECT_DIR=$${PROJECT_DIR} \
+	    --env IN_CONTAINER=true \
+		--env JOB=$(JOB) \
+		--tag fradrive/$(SERVICE) \
+		--file $(PWD)/.Dockerfile ; \
+	fi
+else
+	:
+endif
+
+--containerized: --image-build
+	DEVELOP=`cat develop/.current` ; \
+	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
+	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
+	if ! [ -z "$(SET_CONTAINER_CMD)" ] ; \
+	  then \
+	    CONTAINER_CMD="$(SET_CONTAINER_CMD)" ; \
+	  else \
+	    CONTAINER_CMD=$(CONTAINER_CMD) ; \
+	fi ; \
+	CONTAINER_ID=`$(CONTAINER_BGRUN) \
+	  -v $(PWD):$(MOUNT_DIR) \
+	  --env IN_CONTAINER=true \
+	  --env FRADRIVE_MAKE_TARGET="--$(JOB)-$(SERVICE_VARIANT)" \
+	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
+	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
+	  --env JOB=$(JOB) \
+	  --env SRC=$(SRC) \
+	  --name $${CONTAINER_NAME} \
+	  $${CONTAINER_CMD} \
+	` ; \
+	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
+	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
+	  $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \
+	fi
+
+# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
+
+# HELP(start-backend): start development instance
+--start-backend:
+	export YESOD_IP_FROM_HEADER=true; \
+	export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
+	export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
+	export HOST=127.0.0.1 ; \
+	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
+	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
+	export LOG_ALL=$${LOG_ALL:-false} ; \
+	export LOGLEVEL=$${LOGLEVEL:-info} ; \
+	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
+	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
+	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
+	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
+	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
+	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
+	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
+	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
+	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
+	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
+# HELP(compile-backend): compile backend binaries
+--compile-backend:
+	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
+# HELP(dependencies-backend): (re-)build backend dependencies
+--dependencies-backend: uniworx.cabal
+	stack build $(STACK_CORES) --fast --only-dependencies
+# HELP(lint-backend): lint backend
+--lint-backend:
+	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
+# HELP(test-backend): test backend
+--test-backend:
+	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
+uniworx.cabal:
+	stack exec -- hpack --force
+
+# HELP(compile-frontend): compile frontend assets
+--compile-frontend: node_modules assets esbuild.config.mjs
+	npm run build
+--start-frontend: --compile-frontend;
+--dependencies-frontend: node_modules assets static well-known;
+node_modules: package.json package-lock.json
+	npm install --cache .npm --prefer-offline
+package-lock.json: package.json
+	npm install --cache .npm --prefer-offline
+assets: assets/favicons assets/icons;
+assets/favicons:
+	./utils/faviconize.pl assets/favicon.svg long assets/favicons
+assets/icons: node_modules assets/icons-src/fontawesome.json
+	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid assets/icons-src/fontawesome.json assets/icons/fradrive
+	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular assets/icons-src/fontawesome.json assets/icons/fradrive
+	-cp assets/icons-src/*.svg assets/icons/fradrive
+static: node_modules assets esbuild.config.mjs
+	npm run build
+well-known: static;
+
+# HELP(compile-uniworxdb): clear and fill database. requires running postgres instance (use "make start-postgres" to start one)
+# TODO (db-m-$MIGRATION-backend): apply migration (see src/Model/Migration/Definition.hs for list of available migrations)
+--compile-uniworxdb: --compile-backend
+	SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} ; \
+	AVSPASS=${AVSPASS:-nopasswordset} ; \
+	./bin/uniworxdb $(UNIWORXDB_OPTS)
+
+--shell-ghci:
+	stack ghci -- $(SRC)
+# --main-is uniworx:exe:uniworx
+
+# HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service
+--shell-%:
+	/bin/bash
+
+# HELP(start-minio): start minio service
 
 .PHONY: status
-# HELP: print an overview of currently running services and their health
+# HELP: print develop status: running containers, used ports
 status:
-	docker compose ps
-.PHONY: top
-# HELP: print an overview of the ressource usage of the currently running services
-top:
-	docker compose stats
-.PHONY: list-projects
-# HELP: list all currently running projects on this machine
-list-projects:
-	docker compose ls
+	@./utils/develop-status.pl -a
 
 .PHONY: log-%
-# HELP(log-$SERVICE): follow the output of a given service. Service must be running.
+# HELP(log-$(JOB)-$(SERVICE)): inspect output of a given service. The service must be currently running When a service supports multiple running instances in one develop (i.e. backend), you need to specify the exact instance by its associated file (e.g. backend-1, backend-2, etc.), please check the contents of the develop/ directory for a list of running instances.
 log-%:
-	docker compose logs --follow --timestamps $*
+	DEVELOP=develop/`cat develop/.current` ; \
+	SEARCH_FILE="$${DEVELOP}/$*" ; \
+	if [[ ! -e "$${SEARCH_FILE}" ]] ; then \
+	  SEARCH_FILE="$${DEVELOP}/.exited.$*" ; \
+	fi ; \
+	if [[ -e "$${SEARCH_FILE}" ]] ; then \
+	  $(CONTAINER_COMMAND) logs --follow `cat "$${SEARCH_FILE}" | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'` ; \
+	else \
+	  >&2 echo "Cannot show log: No develop file found for '$*'" ; \
+	  exit 1 ; \
+	fi
+
+.PHONY: enter
+# HELP: launch (bash) shell inside a currently running container. Use ./enter shell wrapper for more convenient usage, possibly with tab-completion in the future
+enter: --ensure-develop
+	$(MAKE) -- --enter
+
+.PHONY: psql
+# HELP: enter psql (postgresql) cli inside a currently running database container
+psql: ENTRYPOINT=/usr/bin/psql -d uniworx
+psql: EXEC_OPTS=--user postgres
+psql: --ensure-develop
+	$(MAKE) -- --enter CONTAINER_FILE=develop/`cat develop/.current`/start-postgres
+
+--enter:
+	CONTAINER_ID=`cat $(CONTAINER_FILE) | grep 'CONTAINER_ID=' | sed 's/CONTAINER_ID=//'` ; \
+	$(CONTAINER_COMMAND) exec -it $(EXEC_OPTS) $${CONTAINER_ID} $(if $(ENTRYPOINT),$(ENTRYPOINT),/bin/bash)
+
+.PHONY: stop
+# HELP: stop all currently running develop instances
+stop:
+	rm -rf develop
+.PHONY: stop-%
+# HELP(stop-SERVICE): stop all currently running develop instances of a given service (i.e. backend,frontend,uniworxdb,hoogle,postgres,...)
+# HELP(stop-JOB): stop all currently running develop instances of a given job (i.e. compile,start,test,lint)
+stop-compile: CF_PREFIX=compile-
+stop-start: CF_PREFIX=start-
+stop-test: CF_PREFIX=test-
+stop-lint: CF_PREFIX=lint-
+stop-%: --stop;
+--stop:
+	$(SET_DEVELOP)
+ifdef CF_PREFIX
+	rm -rf $(DEVELOP)/$(CF_PREFIX)*
+endif
+ifdef SERVICE_VARIANT
+	rm -rf $(DEVELOP)/*-$(SERVICE_VARIANT)
+endif
+
+.PHONY: new-develop
+# HELP: instantiate new development bundle, i.e. create new directory under develop/
+new-develop:
+	$(NEW_DEVELOP)
+	mkdir -p $(DEVELOP)
+	$(MAKE) develop/.current
+.PHONY: switch-develop
+# HELP: switch current develop instance to DEVELOP=...
+switch-develop:
+	if ! [ -e develop/$(DEVELOP) ]; then \
+	  echo "Specified develop $(DEVELOP) does not exist! Not switching." ; \
+	  exit 1 ; \
+	fi ; \
+	echo "$(DEVELOP)" > develop/.current
+--ensure-develop:
+	if ! [[ -e develop ]]; then \
+	  $(MAKE) new-develop; \
+	fi
+	$(MAKE) develop/.current
+	$(SET_DEVELOP)
+.PHONY: develop/.current
+develop/.current:
+	ls -1 develop | tail -n1 > develop/.current
 
 .PHONY: --%
 .SUFFIXES: # Delete all default suffixes

azure-pipelines.yaml

@@ -1,197 +1,67 @@
-# SPDX-FileCopyrightText: 2024-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>
+# SPDX-FileCopyrightText: 2024 Sarah Vaupel <sarah.vaupel@uniworx.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-trigger:
-  branches:
-    include:
-      - '*'
-  tags:
-    include:
-      - '*'
-  #paths:
-  #  exclude:
-  #    - CHANGELOG.md
-
-parameters:
-  - name: services
-    type: object
-    default:
-      - name: frontend
-        imageBase:
-          image: devfra.azurecr.io/de.fraport.build/npm
-          tag: node-20
-        # extraBuildOptions: |
-        #   --build-arg NPM_CUSTOM_REGISTRY=https://pkgs.dev.azure.com/fraport/_packaging/packages/npm/registry/
-        dependsOn: []
-        dependenciesCaches:
-          - key: package.json | package-lock.json
-            path: node_modules/
-          - key: package.json | package-lock.json
-            path: .npm/
-          - key: package.json | esbuild.config.mjs | utils/renamer.pl | utils/faviconize.pl | frontend/src/icons.scss
-            path: assets/icons/
-          - key: package.json | esbuild.config.mjs | utils/renamer.pl | utils/faviconize.pl | frontend/src/icons.scss
-            path: assets/favicons/
-        buildPool: 'Prod Private Agent Pool'
-        buildCores: 1
-        buildTimeout: 60
-        buildArtifacts: |
-          assets/icons/fradrive/*.svg
-          assets/favicons/*.png
-          assets/favicons/include.html
-          frontend/src/env.sass
-          config/manifest.json
-          static/**/*
-          well-known/**/*
-      - name: backend
-        imageBase:
-          image: devfra.azurecr.io/de.fraport.build/haskell
-          tag: 8.10.4
-        dependsOn:
-          - Build_frontend
-        dependenciesCaches:
-          - key: stack.yaml | stack.yaml.lock
-            path: .stack/
-        buildPool: 'Prod Private Agent Pool DS3'
-        buildCores: 3
-        buildTimeout: 1440
-        buildArtifacts: |
-          bin/*
-
-variables:
-  buildImageUpstream: devfra.azurecr.io/de.fraport.fradrive.build
-  setupImages: $[ or( eq(variables.forcePushLatest, true), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/update'), startsWith(variables['Build.SourceBranch'], 'refs/tags/') ) ]
-
 pool: 'Prod Private Agent Pool'
 
-stages:
-
-- stage: Setup
-  jobs:
-    - ${{ each service in parameters.services }}:
-      - template: .azure-pipelines/templates/jobs/setup_image.yaml
-        parameters:
-          imageName: ${{service.name}}
-          imageBase: ${{service.imageBase}}
-      - template: .azure-pipelines/templates/jobs/setup_dependencies.yaml
-        parameters:
-          serviceName: ${{service.name}}
-          dependenciesCaches: ${{service.dependenciesCaches}}
-          dependenciesBuildPool: ${{service.buildPool}}
-          dependenciesBuildCores: ${{service.buildCores}}
-          dependenciesBuildTimeout: ${{service.buildTimeout}}
-
-- stage: Build
-  dependsOn: Setup
-  jobs:
-    - ${{ each service in parameters.services }}:
-      - job: Build_${{service.name}}
-        displayName: Compile ${{service.name}}
-        dependsOn: ${{service.dependsOn}}
-        pool: '${{service.buildPool}}'
-        timeoutInMinutes: ${{service.buildTimeout}}
-        container:
-          ${{ if eq(variables.setupImages, true) }}:
-            image: $(buildImageUpstream)/${{service.name}}:$(Build.BuildNumber)
-          ${{ else }}:
-            image: $(buildImageUpstream)/${{service.name}}:latest
-          endpoint: devfra
-          env:
-            PROJECT_DIR: $(Build.Repository.LocalPath)
-            IN_CONTAINER: true
-            IN_CI: true
-        steps:
-          - ${{ each dependencyCache in service.dependenciesCaches }}:
-            - template: .azure-pipelines/templates/steps/cache.yaml
-              parameters:
-                cacheIdent: '${{service.name}}-dependencies'
-                cacheKeys: '${{dependencyCache.key}}'
-                cachePath: '${{dependencyCache.path}}'
-          - ${{ each dependency in service.dependsOn }}:
-            - template: .azure-pipelines/templates/steps/artifact-download.yaml
-              parameters:
-                artifactName: '${{dependency}}'
-          - template: .azure-pipelines/templates/steps/make.yaml
-            parameters:
-              makeJob: compile
-              makeService: ${{service.name}}
-              makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
-          - task: CopyFiles@2
-            displayName: Prepare ${{service.name}} build artifacts for upload
-            inputs:
-              Contents: '${{service.buildArtifacts}}'
-              TargetFolder: '$(Build.ArtifactStagingDirectory)'
-          - task: PublishBuildArtifacts@1
-            displayName: Publish ${{service.name}} build artifacts
-            inputs:
-              PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-              ArtifactName: 'Build_${{service.name}}'
-              publishLocation: 'Container'
-
-# - stage: Test
-#   dependsOn: Build
-#   condition: eq(variables.skipTests, false)
-#   jobs:
-#     - ${{ each service in parameters.services }}:
-#       - job: Test_${{service.name}}
-#         displayName: Run ${{service.name}} tests
-#         pool: '${{service.buildPool}}'
-#         timeoutInMinutes: ${{service.buildTimeout}}
-#         container:
-#           # TODO: do not use latest on update branches
-#           image: $(buildImageUpstream)/${{service.name}}:latest
-#           endpoint: devfra
-#           env:
-#             PROJECT_DIR: $(Build.Repository.LocalPath)
-#             IN_CONTAINER: true
-#             IN_CI: true
-#         steps:
-#           - ${{ each dependencyCache in service.dependenciesCaches }}:
-#             - template: .azure-pipelines/templates/steps/cache.yaml
-#               parameters:
-#                 cacheIdent: '${{service.name}}-dependencies'
-#                 cacheKeys: '${{dependencyCache.key}}'
-#                 cachePath: '${{dependencyCache.path}}'
-#           - ${{ each dependency in service.dependsOn }}:
-#             - template: .azure-pipelines/templates/steps/artifact-download.yaml
-#               parameters:
-#                 artifactName: '${{dependency}}'
-#           - task: Docker@2
-#             displayName: Login to container registry
-#             inputs:
-#               command: login
-#               containerRegistry: devfra
-#           - task: Bash@3
-#             displayName: Start database container for testing
-#             inputs:
-#               targetType: inline
-#               script: |
-#                 docker run -d devfra.azurecr.io/de.fraport.trusted/postgres:16.1-bookworm
-#           - template: .azure-pipelines/templates/steps/make.yaml
-#             parameters:
-#               makeJob: lint
-#               makeService: ${{service.name}}
-#               makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
-#           - template: .azure-pipelines/templates/steps/make.yaml
-#             parameters:
-#               makeJob: test
-#               makeService: ${{service.name}}
-#               makeVars: 'CPU_CORES=${{service.buildCores}} STACK_CORES=-j${{service.buildCores}}'
-#           - task: Docker@2
-#             displayName: Logout from container registry
-#             inputs:
-#               command: logout
-#               containerRegistry: devfra
-#       - job: TestReport_${{service.name}}
-#         displayName: Upload test reports for ${{service.name}}
-#         steps:
-#           - script: echo "Work in progress" # TODO
-
-- stage: Release
-  dependsOn: Build # TODO Test
-  condition: or(eq(variables.forceRelease, true), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
-  jobs:
-    - template: .azure-pipelines/templates/jobs/release.yaml
-      parameters:
-        releaseTag: ${{split(variables['Build.SourceBranch'], '/')[2]}}
+jobs:
+# - job: HelloWorld
+#   container:
+#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
+#     endpoint: devfra
+#   steps:
+#   - script: echo Hello, world!
+#     displayName: 'Run a one-line script'
+#   - script: |
+#       echo Add other tasks to build, test, and deploy your project.
+#       echo See https://aka.ms/yaml
+#     displayName: 'Run a multi-line script'
+- job: DockerTaskTest
+  container:
+    image: devfra.azurecr.io/de.fraport.build/tools:1.1.0
+    endpoint: devfra
+  steps:
+    - task: Docker@2
+      name: dockerLoginDevFra
+      displayName: Docker Login to devfra
+      inputs:
+        command: login
+        containerRegistry: devFra
+    - task: Docker@2
+      name: dockerBuild
+      displayName: Backend image build test
+      inputs:
+        command: build
+        Dockerfile: docker/backend/Dockerfile
+        buildContext: .
+        tags: |
+          $(Build.BuildNumber)
+          backend
+        arguments: |
+          --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080
+          --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080
+          --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io'
+          --build-arg PROJECT_DIR=/fradrive
+          --build-arg MOUNT_DIR=/mnt/fradrive
+# - job: BuildKitTest
+#   container:
+#     image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1'
+#     endpoint: devfra
+#   steps:
+#     - script: buildctl build \
+#         --frontend=dockerfile.v0 \
+#         --local context=. \
+#         --local dockerfile=docker/backend/Dockerfile
+#       displayName: BuildKit test
+# - job: CustomBuildahTest
+#   container:
+#     image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04'
+#     endpoint: devfra
+#   steps:
+#     - script: |
+#         id
+#         docker build --help
+#         sudo apt-get -y update
+#         sudo apt-get -y install buildah
+#         buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile
+#       displayName: Build buildah image

backend/Dockerfile

@@ -1,40 +0,0 @@
-ARG FROM_IMG=docker.io/library/debian
-ARG FROM_TAG=12.5
-
-FROM ${FROM_IMG}:${FROM_TAG}
-
-ENV LANG=de_DE.UTF-8
-
-# basic dependencies
-RUN apt-get -y update && apt-get -y install git
-RUN apt-get -y update && apt-get -y install haskell-stack
-RUN apt-get -y update && apt-get -y install llvm
-RUN apt-get -y update && apt-get install -y --no-install-recommends locales locales-all
-
-# compile-time dependencies
-RUN apt-get -y update && apt-get install -y libpq-dev libsodium-dev
-RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config
-RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
-
-# run-time dependencies for uniworx binary
-RUN apt-get -y update && apt-get -y install fonts-roboto
-# RUN apt-get -y update && apt-get -y install pdftk
-# RUN apt-get -y update && apt-get -y install \
-# texlive texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english
-RUN apt-get -y update && apt-get -y install texlive
-# RUN ls /usr/local/texlive
-# RUN chown -hR root /usr/local/texlive/2018
-# RUN tlmgr init-usertree
-# RUN tlmgr option repository ftp://tug.org/historic/systems/texlive/2018/tlnet-final
-# RUN tlmgr update --self --all
-
-ARG PROJECT_DIR=/fradrive
-ENV PROJECT_DIR=${PROJECT_DIR}
-# RUN mkdir -p "${PROJECT_DIR}"; chmod -R 777 "${PROJECT_DIR}"
-WORKDIR ${PROJECT_DIR}
-ENV HOME=${PROJECT_DIR}
-ENV STACK_ROOT="${PROJECT_DIR}/.stack"
-
-ENV STACK_SRC=""
-ENV STACK_ENTRY="ghci ${STACK_SRC}"
-ENTRYPOINT stack ${STACK_ENTRY}

backend/Makefile

@@ -1,51 +0,0 @@
-export CPU_CORES = $(shell cat /proc/cpuinfo | grep '^processor' | wc -l)
-export STACK_CORES = $(shell echo $(($(CPU_CORES)/2)))
-
-ifeq ($(PROD),true)
-export --DEVELOPMENT=--flag uniworx:-dev
-else
-export --DEVELOPMENT=--flag uniworx:dev
-endif
-
-.PHONY: dependencies
-dependencies:
-	stack install hpack; stack install yesod-bin; \
-	stack build -j2 --only-dependencies
-
-.PHONY: compile
-compile: dependencies
-	stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
-
-.PHONY: lint
-lint:
-	stack build $(STACK_CORES) --test --fast --flag uniworx:library-only $(--DEVELOPMENT) uniworx:test:hlint
-
-.PHONY: test
-test:
-	stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
-
-# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
-.PHONY: start
-start: dependencies
-	export YESOD_IP_FROM_HEADER=true; \
-	export DEV_PORT_HTTP=3000; \
-	export DEV_PORT_HTTPS=3443; \
-	export HOST=127.0.0.1 ; \
-	export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
-	export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
-	export LOG_ALL=$${LOG_ALL:-false} ; \
-	export LOGLEVEL=$${LOGLEVEL:-info} ; \
-	export DUMMY_LOGIN=$${DUMMY_LOGIN:-true} ; \
-	export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} ; \
-	export SERVER_SESSION_COOKIES_SECURE=$${SERVER_SESSION_COOKIES_SECURE:-false} ; \
-	export COOKIES_SECURE=$${COOKIES_SECURE:-false} ; \
-	export ALLOW_DEPRECATED=$${ALLOW_DEPRECATED:-true} ; \
-	export ENCRYPT_ERRORS=$${ENCRYPT_ERRORS:-false} ; \
-	export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
-	export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
-	export AVSPASS=$${AVSPASS:-nopasswordset} ; \
-	stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
-
-.PHONY: clean
-clean:
-	rm -rf .stack-work .stack uniworx.cabal .ghc

backend/src/Foundation/Yesod/StaticContent.hs

@@ -1,53 +0,0 @@
--- SPDX-FileCopyrightText: 2022-2025 Sarah Vaupel <sarah.vaupel@uniworx.systems>, Gregor Kleen <gregor.kleen@ifi.lmu.de>, Sarah Vaupel <sarah.vaupel@ifi.lmu.de>
---
--- SPDX-License-Identifier: AGPL-3.0-or-later
-
-module Foundation.Yesod.StaticContent
-  ( addStaticContent
-  ) where
-
-import Import.NoFoundation hiding (addStaticContent)
-
-import Foundation.Type
-
-import qualified Database.Memcached.Binary.IO as Memcached
-
-import qualified Data.ByteString.Lazy as Lazy
-import qualified Data.ByteString.Base64.URL as Base64 (encodeUnpadded)
-import Data.ByteArray (convert)
-import Crypto.Hash (SHAKE256)
-import Crypto.Hash.Conduit (sinkHash)
-import Data.Bits (Bits(zeroBits))
-
-import qualified Data.Conduit.Combinators as C
-
-
-addStaticContent :: Text
-                 -> Text
-                 -> Lazy.ByteString
-                 -> HandlerFor UniWorX (Maybe (Either Text (Route UniWorX, [(Text, Text)])))
-addStaticContent ext _mime content = do
-  UniWorX{appWidgetMemcached, appSettings'} <- getYesod
-  for ((,) <$> appWidgetMemcached <*> appWidgetMemcachedConf appSettings') $ \(mConn, WidgetMemcachedConf{ widgetMemcachedConf = MemcachedConf { memcachedExpiry }, widgetMemcachedBaseUrl }) -> do
-    let expiry = maybe 0 ceiling memcachedExpiry
-        touch = liftIO $ Memcached.touch expiry (encodeUtf8 $ pack fileName) mConn
-        addItem = liftIO $ Memcached.add zeroBits expiry (encodeUtf8 $ pack fileName) content mConn
-        absoluteLink = unpack widgetMemcachedBaseUrl </> fileName
-    catchIf Memcached.isKeyNotFound touch . const $
-      handleIf Memcached.isKeyExists (const $ return ()) addItem
-    return . Left $ pack absoluteLink
-  where
-    -- Generate a unique filename based on the content itself, this is used
-    -- for deduplication so a collision resistant hash function is required
-    --
-    -- SHA-3 (SHAKE256) seemed to be a future-proof choice
-    --
-    -- Length of hash is 144 bits ~~instead of MD5's 128, so as to avoid
-    -- padding after base64-conversion~~ for backwards compatibility
-    fileName = (<.> unpack ext)
-             . unpack
-             . decodeUtf8
-             . Base64.encodeUnpadded
-             . (convert :: Digest (SHAKE256 144) -> ByteString)
-             . runConduitPure
-             $ C.sourceLazy content .| sinkHash

cbt.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# SPDX-FileCopyrightText: 2022 Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+cbt_tunnels --username $CBT_USERNAME --authkey $CBT_AUTHKEY

commitlint.config.js

@@ -2,4 +2,4 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-module.exports = {extends: ['@commitlint/config-conventional']};
+module.exports = {extends: ['@commitlint/config-conventional']}

compose.yaml

@@ -1,86 +1,35 @@
 services:
-  help:
-    image: docker.io/library/perl:stable
-    pull_policy: if_not_present
-    volumes:
-      - ./utils/makehelp.pl:/mnt/utils/makehelp.pl:ro
-      - ./Makefile:/tmp/Makefile:ro
-    command: /mnt/utils/makehelp.pl /tmp/Makefile
-
   frontend:
+    # image: registry.uniworx.de/fradrive/fradrive/frontend # TODO: reference to current branch required; how to do that here?
+    # pull_policy: if_not_present
     build:
-      context: ./frontend
-      dockerfile: ./Dockerfile
+      dockerfile: ./docker/frontend/Dockerfile
+      context: .
     environment:
       - PROJECT_DIR=/fradrive
     volumes:
-      - type: bind
-        source: ./frontend
-        target: /fradrive
-      - ./assets:/fradrive/assets:rw
-      - ./static:/fradrive/static:rw
-      - ./well-known:/fradrive/well-known:rw
-
+      - &fradrive-mnt .:/tmp/fradrive
   backend:
     # image: registry.uniworx.de/fradrive/fradrive/backend
     # pull_policy: if_not_present
     build:
-      context: ./backend
-      dockerfile: ./Dockerfile
-    environment:
-      PATH: /fradrive/bin:$PATH
+      dockerfile: ./docker/backend/Dockerfile
+      context: ./
     volumes:
-      - ./backend:/fradrive
-      - ./bin:/fradrive/bin
-      - ./assets:/fradrive/assets:ro
-      - ./static:/fradrive/static:ro
-      - ./well-known:/fradrive/well-known:ro
+      - *fradrive-mnt
     depends_on:
       - frontend
-      - postgres
-      - memcached
-      - minio
-      - maildev
-    ports:
-      - "3000:3000" # dev http
-      - "3443:3443" # dev https
-      - "8081:8081" # hoogle
-    # links:
-    #   - postgres
-    #   - memcached
-    #   - minio
-    #   - maildev
     stdin_open: true
-    network_mode: host
-
-  postgres:
-    image: docker.io/library/postgres:12
-    pull_policy: if_not_present
+  database:
+    # image: registry.uniworx.de/fradrive/fradrive/database
+    # pull_policy: if_not_present
+    build: ./docker/database
     ports:
-      - "5432:5432"
-    environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
-    volumes:
-      - ./docker/postgres/pg_hba.conf:/tmp/pg_hba.conf:ro
-      - ./docker/postgres/postgresql.conf:/tmp/postgresql.conf:ro
-      - ./docker/postgres/pgconfig.sh:/docker-entrypoint-initdb.d/_pgconfig.sh:ro
-      - ./docker/postgres/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
+      - "9876:5432"
+    # privileged: true
 
-  memcached:
-    image: docker.io/library/memcached:latest
-    pull_policy: if_not_present
-    ports:
-      - "11211:11211"
-
-  minio:
-    image: docker.io/minio/minio:latest
-    pull_policy: if_not_present
-    command: server `mktemp`
-    ports:
-      - "9000:9000"
-
-  maildev:
-    image: docker.io/maildev/maildev:latest
-    pull_policy: if_not_present
-    ports:
-      - "1025-1026:1025"
+#     driver: local
+#     driver_opts:
+#       type: none
+#       o: bind
+#       device: ./

config/develop-settings.yml

@@ -8,7 +8,7 @@
 # See https://github.com/yesodweb/yesod/wiki/Configuration#parsing-numeric-values-as-strings
 
 
-# DEVELOPMENT ONLY, NOT TO BE USED IN PRODUCTION
+#DEVELOPMENT ONLY, NOT TO BE USED IN PRODUCTION
 
 avs-licence-synch:
   times:          [12]
@@ -17,16 +17,14 @@ avs-licence-synch:
   max-changes:    999
 
 mail-reroute-to: 
-  name: "FRADrive-QA-Umleitungen"
-  email: "FRADrive-TEST-Umleitungen@fraport.de"
+  name: FRADrive-QA-Umleitungen
+  email: FRADrive-TEST-Umleitungen@fraport.de
 
 # Enqueue at specified hour, a few minutes later
 job-lms-qualifications-enqueue-hour: 16
 job-lms-qualifications-dequeue-hour: 4
 
-# Using these setting kills the job-workers somehow
-# job-workers: 5
-# job-flush-interval: 600
-# job-stale-threshold: 3600
-# job-move-threshold: 60
-
+job-mode:
+  tag: offload
+job-workers: 1
+job-flush-interval: 600

config/test-settings.yml

@@ -16,4 +16,5 @@ log-settings:
 auth-dummy-login: true
 server-session-acid-fallback: true
 
-job-workers: 20
+job-cron-interval: null
+job-workers: 1

docker/backend/Dockerfile

@@ -0,0 +1,41 @@
+FROM docker.io/fpco/stack-build:lts-18.0
+
+# add public key for nvidia cuda repositories
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC
+
+ENV LANG=en_US.UTF-8
+
+# compile-time dependencies
+# RUN apt-get -y update && apt-get -y install llvm
+# RUN apt-get -y update && apt-get -y install g++ libghc-zlib-dev libpq-dev libsodium-dev pkg-config
+# RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata
+# RUN apt-get -y update && apt-get -y install locales locales-all
+
+# run-time dependencies for uniworx binary
+# RUN apt-get -y update && apt-get -y install fonts-roboto
+# RUN apt-get -y update && apt-get -y install pdftk
+# RUN apt-get -y update && apt-get -y install texlive-base luatex
+
+# locally these two should be identical, so that compilation results are written out into the file dir.
+# in CI-pipelines these two should be different, so that the container caches the compilation results.
+ARG MOUNT_DIR=/mnt/fradrive
+ARG PROJECT_DIR=/fradrive
+
+RUN mkdir -p "${PROJECT_DIR}"
+RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r "${MOUNT_DIR}"/* "${PROJECT_DIR}" ; fi
+
+RUN mkdir -p "${PROJECT_DIR}/.stack"
+ENV STACK_ROOT="${PROJECT_DIR}/.stack"
+
+WORKDIR ${PROJECT_DIR}
+ENV HOME=${PROJECT_DIR}
+RUN make -- --dependencies-backend STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true JOB=${JOB}
+
+RUN stack install yesod-bin
+RUN stack install hpack
+
+ENV FRADRIVE_MAKE_TARGET=--start-backend
+ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" SRC="${SRC}"
+
+EXPOSE 3000/tcp
+EXPOSE 3443/tcp

docker/fradrive/Dockerfile

@@ -1,25 +1,22 @@
-ARG FROM_IMG=docker.io/library/debian
-ARG FROM_TAG=12.5
+FROM debian:12.5
 
-FROM ${FROM_IMG}:${FROM_TAG}
+RUN apt-get -y update
 
-# Setup locales
-# RUN apt-get update && apt-get -y install locales locales-all
-# RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
-#     locale-gen
-# ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
+# setup locales
+RUN apt-get -y install locales locales-all
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+    locale-gen
+ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
 # FraDrive runtime dependencies
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
 RUN apt-get update && apt-get -y install libpq-dev
 RUN apt-get update && apt-get -y install libsodium-dev
-RUN apt-get update && apt-get -y install fonts-roboto
 # TODO: minimize texlive dependencies, switch to basic schemes where possible
 RUN apt-get update && apt-get -y install \
-    texlive-full \
+    texlive-latex-base \
     texlive-luatex \
-    texlive-plain-generic \
     texlive-fonts-recommended \
     texlive-fonts-extra \
     texlive-lang-english \
@@ -33,7 +30,7 @@ RUN useradd -r -g uniworx -d /var/lib/uniworx -M uniworx --uid 999
 RUN mkdir -p /var/lib/uniworx && chown -R uniworx:uniworx /var/lib/uniworx
 RUN mkdir -p /var/log/uniworx && chown -R uniworx:uniworx /var/log/uniworx
 
-# Install FraDrive binaries
+# TODO: is this still needed?
 # RUN install -d -g uniworx -o uniworx -m 0750 /var/lib/uniworx
 # RUN install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
 COPY ./bin/uniworx /usr/bin/uniworx
@@ -44,6 +41,6 @@ COPY ./docker/fradrive/fradrive-entrypoint.sh /entrypoint.sh
 RUN chmod 777 /entrypoint.sh
 
 USER uniworx
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT fradrive-entrypoint.sh
 EXPOSE 8080/tcp
 VOLUME /var/lib/uniworx /var/log

docker/frontend/Dockerfile

@@ -0,0 +1,32 @@
+FROM debian:12.5
+
+# Basic dependencies
+RUN apt-get -y update && apt-get -y install curl npm
+
+# Build and watch dependencies
+RUN apt-get -y update && apt-get -y install exiftool
+RUN apt-get -y update && apt-get -y install imagemagick
+
+# Test dependencies
+RUN apt-get -y update && apt-get -y install chromium
+ENV CHROME_BIN=chromium
+
+# TODO: use dotenv for npm version?
+RUN npm install -g n
+RUN n 20.17.0
+
+# locally these two should be identical, so that compilation results are written out into the file dir.
+# in CI-pipelines these two should be different, so that the container caches the compilation results.
+ARG MOUNT_DIR=/mnt/fradrive
+ARG PROJECT_DIR=/fradrive
+RUN mkdir -p ${PROJECT_DIR}
+RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r ${MOUNT_DIR}/* ${PROJECT_DIR} ; fi
+WORKDIR ${PROJECT_DIR}
+ENV HOME=${PROJECT_DIR}
+
+#RUN make node_modules IN_CONTAINER=true
+#RUN make well-known IN_CONTAINER=true
+RUN make -- static
+
+ENV FRADRIVE_MAKE_TARGET=start-frontend
+ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} IN_CONTAINER=true CHROME_BIN=${CHROME_BIN}

docker/podman/Dockerfile

@@ -0,0 +1,33 @@
+# Debian-based podman daemon image for building docker images 
+# inside docker containers (e.g. gitlab runners).
+# 
+# Yoinked with love from:
+# https://www.redhat.com/sysadmin/podman-inside-container
+
+FROM debian:12.5
+
+RUN apt-get -y update
+
+RUN apt-get -y install make podman podman-compose fuse-overlayfs
+
+RUN useradd podman; \
+echo podman:10000:5000 > /etc/subuid; \
+echo podman:10000:5000 > /etc/subgid;
+
+VOLUME /var/lib/containers
+VOLUME /home/podman/.local/share/containers
+
+ADD https://raw.githubusercontent.com/containers/image_build/main/podman/containers.conf /etc/containers/containers.conf
+ADD https://raw.githubusercontent.com/containers/image_build/main/podman/podman-containers.conf /home/podman/.config/containers/containers.conf
+
+RUN chown podman:podman -R /home/podman
+
+# chmod containers.conf and adjust storage.conf to enable Fuse storage.
+# RUN chmod 644 /etc/containers/containers.conf; sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' -e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' /etc/containers/containers.conf
+# RUN echo -e '[storage]\ndriver="zfs"\nmount_program="zfs"\nadditionalimage=/var/lib/shared\nmountopt="nodev,fsync=0"' >> /etc/containers/containers.conf
+RUN chmod 644 /etc/containers/containers.conf
+RUN echo '[storage]\ndriver="overlay"\n[storage.options.overlay]\nforce_mask="private"\nmount_program="/usr/bin/fuse-overlayfs"\nmountopt="nodev"' >> /etc/containers/containers.conf
+RUN mkdir -p /root/.config/containers/ && echo '[storage]\ndriver="overlay"\n[storage.options.overlay]\nforce_mask="private"\nmount_program="/usr/bin/fuse-overlayfs"\nmountopt="nodev"' > /root/.config/containers/storage.conf
+RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers /var/lib/shared/vfs-images /var/lib/shared/vfs-layers; touch /var/lib/shared/overlay-images/images.lock; touch /var/lib/shared/overlay-layers/layers.lock; touch /var/lib/shared/vfs-images/images.lock; touch /var/lib/shared/vfs-layers/layers.lock
+
+ENV _CONTAINERS_USERNS_CONFIGURED=""

docker/postgres/Dockerfile

@@ -0,0 +1,9 @@
+FROM docker.io/postgres:12
+
+# Allow for connecting to database without password authentication
+ENV POSTGRES_HOST_AUTH_METHOD=trust
+
+COPY --chown=postgres:postgres docker/postgres/pg_hba.conf /tmp/pg_hba.conf
+COPY --chown=postgres:postgres docker/postgres/postgresql.conf /tmp/postgresql.conf
+COPY docker/postgres/pgconfig.sh /docker-entrypoint-initdb.d/_pgconfig.sh
+COPY --chown=postgres:postgres docker/postgres/schema.sql /docker-entrypoint-initdb.d/schema.sql

docker/postgres/initdb.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Init and start the postgres daemon
+initdb --no-locale
+pg_ctl start -w -o "-c listen_addresses='*' -c unix_socket_permissions=0700 -c max_connections=9990 -c shared_preload_libraries=pg_stat_statements -c session_preload_libraries=auto_explain -c auto_explain.log_min_duration=100ms"
+POSTGRID=`cat /var/lib/postgresql/data/postmaster.pid | perl -le '<>=~m#(\d+)# and print $1'`
+
+# Create uniworx and uniworx_test database
+psql -f /schema.sql postgres
+
+# Wait for postgres daemon to terminate
+while [ -e /proc/$POSTGRID ]; do
+    sleep 0.5;
+done

docker/postgres/pg_hba.conf

@@ -0,0 +1,3 @@
+local all all trust
+host all all 0.0.0.0/0 trust
+host all all ::1/128 trust

docker/postgres/pgconfig.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cat /tmp/pg_hba.conf > /var/lib/postgresql/data/pg_hba.conf
+cat /tmp/postgresql.conf > /var/lib/postgresql/data/postgresql.conf
+
+echo "Custom pg_hba.conf and postgresql.conf successfully deployed."

docker/postgres/postgresql.conf

@@ -0,0 +1,6 @@
+listen_addresses='*'
+unix_socket_permissions=0700
+max_connections=9990
+shared_preload_libraries=pg_stat_statements
+session_preload_libraries=auto_explain
+auto_explain.log_min_duration=100ms

docker/postgres/schema.sql

@@ -0,0 +1,5 @@
+CREATE USER uniworx WITH SUPERUSER PASSWORD 'uniworx';
+CREATE DATABASE uniworx_test;
+GRANT ALL ON DATABASE uniworx_test TO uniworx;
+CREATE DATABASE uniworx;
+GRANT ALL ON DATABASE uniworx TO uniworx;

esbuild.config.mjs

@@ -7,8 +7,8 @@ import svgPlugin from 'esbuild-plugin-svg-bundle';
 import { copy } from 'esbuild-plugin-copy';
 // import manifestPlugin from 'esbuild-plugin-manifest';
 import manifestPlugin from 'esbuild-plugin-assets-manifest';
-// import copyWithHashPlugin from '@enonic/esbuild-plugin-copy-with-hash';
-// import inlineImportPlugin from 'esbuild-plugin-inline-import';
+import copyWithHashPlugin from '@enonic/esbuild-plugin-copy-with-hash';
+import inlineImportPlugin from 'esbuild-plugin-inline-import';
 import { nodeModulesPolyfillPlugin } from 'esbuild-plugins-node-modules-polyfill';
 
 const staticDir = './static';
@@ -20,8 +20,8 @@ await esbuild.build({
   minify: true,
   sourcemap: true,
   entryPoints: {
-    main: './src/main.js',
-    polyfill: './src/polyfill.js',
+    main: './frontend/src/main.js',
+    polyfill: './frontend/src/polyfill.js',
   },
   outdir: staticDir,
   plugins: [
@@ -48,20 +48,19 @@ await esbuild.build({
     copy({
       resolveFrom: 'cwd',
       assets: {
-        from: [ './robots.txt' ],
+        from: [ './config/robots.txt' ],
         to: wellKnownDirs,
       },
     }),
     // ...['de-de-formal','en-eu'].map((lang) => manifestPlugin({
     manifestPlugin({
       filename: 'manifest.json',
-      path: '.',
+      path: 'config',
       // metadata: { timestamp: new Date(), module: 'myapp', type: 'esm', },
       processOutput(assets) {
         const orderAssets = {
           main: assets['main'],
-          polyfill: assets['polyfill'],
-          icons: { "svg": assets['']['svg'][0] },
+          ...assets
         };
         return JSON.stringify(orderAssets, null, '  ');
       },

eslint.config.js

@@ -5,7 +5,7 @@ import babelParser from "@babel/eslint-parser";
 export default [
     js.configs.recommended,
     {
-        files: ["frontend/src/**/*.js"],
+        files: ["**/*.js"],
         plugins: {},
         languageOptions: {
             ecmaVersion: 2018,

frontend/Dockerfile

@@ -1,29 +0,0 @@
-ARG FROM_IMG=docker.io/library/node
-ARG FROM_TAG=20
-
-FROM ${FROM_IMG}:${FROM_TAG}
-
-ENV LANG=de_DE.UTF-8
-ENV LANGUAGE=de_DE.UTF-8
-
-# build and watch dependencies
-RUN apt-get -y update && apt-get -y install exiftool
-RUN apt-get -y update && apt-get -y install imagemagick
-
-# test dependencies
-# RUN apt-get -y update && apt-get -y install chromium
-# ENV CHROME_BIN=chromium
-
-# configure npm to use given proxy if specified
-RUN if [ ! -z "${HTTP_PROXY}" ]; then npm config set proxy ${HTTP_PROXY}; fi
-RUN if [ ! -z "${FRAPORT_NOPROXY}" ]; then npm config set noproxy "${FRAPORT_NOPROXY}"; fi
-ENV NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"
-
-ENV PROJECT_DIR=/fradrive
-RUN mkdir -p ${PROJECT_DIR}
-WORKDIR ${PROJECT_DIR}
-ENV HOME=${PROJECT_DIR}
-
-RUN if [ ! -z "${NPM_CUSTOM_REGISTRY}" ]; then \
-printf 'registry=${NPM_CUSTOM_REGISTRY}' > .npmrc \
-; fi

frontend/Makefile

@@ -1,23 +0,0 @@
-.PHONY: all
-all: dependencies compile ;
-.PHONY: dependencies
-dependencies: node_modules assets ;
-.PHONY: compile
-compile: static well-known ;
-
-node_modules: package.json package-lock.json
-	npm install --cache .npm --prefer-offline
-package-lock.json: package.json
-	npm install --cache .npm --prefer-offline
-static: node_modules assets esbuild.config.mjs jsconfig.json postcss.config.js
-	echo "$${PROJECT_DIR}"
-	npm run build
-well-known: static ;
-
-assets: assets/favicons assets/icons;
-assets/favicons:
-	./utils/faviconize.pl assets/favicon.svg long assets/favicons
-assets/icons: node_modules assets/icons-src/fontawesome.json
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid assets/icons-src/fontawesome.json assets/icons/fradrive
-	./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular assets/icons-src/fontawesome.json assets/icons/fradrive
-	-cp assets/icons-src/*.svg assets/icons/fradrive

frontend/src/icons.scss

@@ -1,9 +1,8 @@
-// SPDX-FileCopyrightText: 2024-2025 David Mosbach <david.mosbach@uniworx.de>, Sarah Vaupel <sarah.vaupel@uniworx.de>
+// SPDX-FileCopyrightText: 2024 David Mosbach <david.mosbach@uniworx.de>, Sarah Vaupel <sarah.vaupel@uniworx.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
 
-// @import 'env';
 
 $ico-width: 15px;
 
@@ -110,7 +109,7 @@ $icons: new,
 
 @each $name in $icons {
   .ico-#{$name} {
-    background-image: url('/fradrive/assets/icons/fradrive/#{$name}.svg');
+    background-image: url('/mnt/fradrive/assets/icons/fradrive/#{$name}.svg');
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;

frontend/src/lib/storage-manager/storage-manager.js

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2025 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>,Johannes Eder <ederj@cip.ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+// SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>,Johannes Eder <ederj@cip.ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -499,14 +499,14 @@ function encrypt(plaintext, key) {
   if (!key) throw new Error('Cannot encrypt plaintext without a valid key!');
 
   // TODO use const if possible
-  // let plaintextB = Buffer.from(plaintext);
-  // let cipherB    = Buffer.alloc(plaintextB.length + sodium.crypto_secretbox_MACBYTES);
-  // let nonceB     = Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
-  // let keyB       = Buffer.from(key);
+  let plaintextB = Buffer.from(plaintext);
+  let cipherB    = Buffer.alloc(plaintextB.length + sodium.crypto_secretbox_MACBYTES);
+  let nonceB     = undefined; // Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
+  let keyB       = Buffer.from(key);
 
   // sodium.crypto_secretbox_easy(cipherB, plaintextB, nonceB, keyB);
 
-  const result = null; // cipherB;
+  const result = cipherB;
   console.log('encrypt result', result);
   return result;
 }
@@ -519,10 +519,10 @@ function decrypt(ciphertext, key) {
   if (!key) throw new Error('Cannot decrypt ciphertext without a valid key!');
   
   // TODO use const if possible
-  // let cipherB    = Buffer.from(ciphertext);
-  let plaintextB = null; // Buffer.alloc(cipherB.length - sodium.crypto_secretbox_MACBYTES);
-  // let nonceB     = undefined; Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
-  // let keyB       = Buffer.from(key);
+  let cipherB    = Buffer.from(ciphertext);
+  let plaintextB = undefined; Buffer.alloc(cipherB.length - sodium.crypto_secretbox_MACBYTES);
+  let nonceB     = undefined; Buffer.alloc(sodium.crypto_secretbox_NONCEBYTES);
+  let keyB       = Buffer.from(key);
 
   // sodium.crypto_secretbox_open_easy(plaintextB, cipherB, nonceB, keyB);
 

frontend/src/utils/inputs/inputs.sass

@@ -163,7 +163,6 @@ input[type*='time'],
 // TEXTAREAS
 textarea
   width: 100%
-  height: 170px
   max-width: 600px
   line-height: 1.5
   color: #363636
@@ -176,6 +175,8 @@ textarea
   border-radius: 2px
   box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05)
   vertical-align: top
+  &:not(.uwx-short)
+    height: 172px
 
 // SHARED STATE RELATED STYLES
 
@@ -211,10 +212,11 @@ option
   border-radius: 2px
   outline: 0
   color: #363636
-  min-width: 250px
   width: auto
   background-color: #f3f3f3
   box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05)
+  &:not(.uwx-narrow)
+    min-width: 250px
 
 @media (max-width: 425px)
   select, option

karma.conf.cjs

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
- 
+/* eslint-disable */
 module.exports = function(config) {
   config.set({
     //root path location to resolve paths defined in files and exclude