From 35c273958d136f7b4cfd2938fc227b59bfe20a1c Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Thu, 23 Jan 2025 00:07:40 +0200
Subject: [PATCH 01/47] First commit on developing AuthMD, a CodiMD fork.

---
 .github/workflows/push-image.yml |  76 ++++---------------------------
 README.md                        |   2 +
 app.json                         |   4 +-
 lib/models/note.js               |   2 +-
 public/it-logo.png               | Bin 0 -> 16621 bytes
 public/js/extra.js               |   4 +-
 public/views/codimd/header.ejs   |   6 ++-
 public/views/index/body.ejs      |   9 +++-
 public/views/index/head.ejs      |   2 +-
 9 files changed, 29 insertions(+), 76 deletions(-)
 create mode 100644 public/it-logo.png

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 0d46e9e887..0961ba07a1 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,23 +15,15 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
-  REGISTRY_IMAGE: hackmdio/hackmd
+  REGISTRY_IMAGE: lamprosfasoulas/codimd
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
     steps:
       -
         name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+        run: echo "PLATFORM_PAIR=linux-amd64" >> $GITHUB_ENV
       -
         name: Checkout
         uses: actions/checkout@v4
@@ -54,70 +46,18 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push by digest
+        name: Build and push
         id: build
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./deployments/Dockerfile
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          tags: |
+            ${{ env.REGISTRY_IMAGE }}:latest
+            ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
           build-args: |
             RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }}
             BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-35fe7e39' }}
-      -
-        name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-      -
-        name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      -
-        name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: |
-            type=match,pattern=\d.\d.\d
-            type=sha,prefix=
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-      -
-        name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/README.md b/README.md
index 898bd5d9f3..c4e77cf16b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 CodiMD
 ===
 
+# This is a fork of the original CodiMD project. The original project can be found [here](https://github.com/hackmdio/codimd).
+
 [![build status][travis-image]][travis-url]
 [![version][github-version-badge]][github-release-page]
 [![Gitter][gitter-image]][gitter-url]
diff --git a/app.json b/app.json
index b30d487647..e1317e2044 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,6 @@
 {
-    "name": "CodiMD",
-    "description": "Realtime collaborative markdown notes on all platforms",
+    "name": "AuthMD",
+    "description": "Fork of CodiMD",
     "keywords": [
         "Collaborative",
         "Markdown",
diff --git a/lib/models/note.js b/lib/models/note.js
index 9e0fb6c5ce..8a9837dde7 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -356,7 +356,7 @@ module.exports = function (sequelize, DataTypes) {
     return title || 'Untitled'
   }
   Note.generateWebTitle = function (title) {
-    title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD'
+    title = !title || title === 'Untitled' ? 'AuthMD - Collaborative markdown notes' : title + ' - AuthMD'
     return title
   }
   Note.extractNoteTags = function (meta, $) {
diff --git a/public/it-logo.png b/public/it-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f77efd2a12e46ddec62e315b823ea51c58b5402b
GIT binary patch
literal 16621
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
I*6ic|0$$aIj{pDw

literal 0
HcmV?d00001

diff --git a/public/js/extra.js b/public/js/extra.js
index 6bbe65e4a1..936b26e5c0 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -134,9 +134,9 @@ function getTitle (view) {
 export function renderTitle (view) {
   let title = getTitle(view)
   if (title) {
-    title += ' - CodiMD'
+    title += ' - AuthMD'
   } else {
-    title = 'CodiMD - Collaborative markdown notes'
+    title = 'AuthMD - Collaborative markdown notes'
   }
   return title
 }
diff --git a/public/views/codimd/header.ejs b/public/views/codimd/header.ejs
index 79ea50032e..1cf3451e53 100644
--- a/public/views/codimd/header.ejs
+++ b/public/views/codimd/header.ejs
@@ -16,7 +16,11 @@
             <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
             </ul>
         </div>
-        <a class="navbar-brand pull-left" href="<%- serverURL %>/"><i class="fa fa-file-text"></i> CodiMD</a>
+        <a class="navbar-brand pull-left" href="<%- serverURL %>/" style="display:inline-block;vertical-align: middle;margin-right: 10px;padding: 0px;">
+            <img src="<%- serverURL %>/it-logo.png" alt="IT logo"style="display: inline-block; width: 50px; height: 50px; object-fit: contain;"/>
+            <span style="height: 50px">AuthMD</span>
+        </a>
+
         <div class="nav-mobile pull-right visible-xs">
             <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;">
                 <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple>
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 7927824eb5..62986a6305 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -43,7 +43,11 @@
 
             <div id="home" class="section"<% if(signin) { %> style="display:none;"<% } %>>
                 <div class="inner cover">
-                    <h1 class="cover-heading"><i class="fa fa-file-text"></i> CodiMD</h1>
+                    <h1 class="cover-heading">
+                        <!-- <i class="fa fa-file-text"></i> -->
+                        <img src="<%- serverURL %>/it-logo.png" alt="IT logo"style="width: 125px; height: 125px; object-fit: contain;"/>
+                        Auth IT
+                    </h1>
                     <p class="lead">
                         <%= __('Best way to write and share your knowledge in markdown.') %>
                     </p>
@@ -153,6 +157,9 @@
                         <option value="id">Bahasa Indonesia</option>
                         <option value="sr">српски</option>
                     </select>
+                    <p>
+                        <%- __('Source code for this Fork %s', '<a href="https://github.com/lamprosfasoulas/codimd">Fork Source</a>') %>
+                    </p>
                     <p>
                         <%- __('Powered by %s', '<a href="https://github.com/hackmdio/codimd">CodiMD</a>') %> | <a href="<%- serverURL %>/s/release-notes" target="_blank" rel="noopener"><%= __('Releases') %></a> | <a href="<%- sourceURL %>" target="_blank" rel="noopener"><%= __('Source Code') %></a><% if(privacyStatement) { %> | <a href="<%- serverURL %>/s/privacy" target="_blank" rel="noopener"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- serverURL %>/s/terms-of-use" target="_blank" rel="noopener"><%= __('Terms of Use') %></a><% } %>
                     </p>
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs
index e5524cf039..68b5e6340d 100644
--- a/public/views/index/head.ejs
+++ b/public/views/index/head.ejs
@@ -6,7 +6,7 @@
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta name="keywords" content="Collaborative, Markdown, Notes">
-<title>CodiMD - <%= __('Collaborative markdown notes') %></title>
+<title>AuthMD - <%= __('Collaborative markdown notes') %></title>
 <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
 <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 <% if(useCDN) { %>

From 5dfd3b90bc8f7b6624ff96e64a9f6bd9f1917900 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 00:09:19 +0200
Subject: [PATCH 02/47] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c4e77cf16b..809dac230d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 CodiMD
 ===
 
-# This is a fork of the original CodiMD project. The original project can be found [here](https://github.com/hackmdio/codimd).
+### This is a fork of the original CodiMD project. The original project can be found [here](https://github.com/hackmdio/codimd).
 
 [![build status][travis-image]][travis-url]
 [![version][github-version-badge]][github-release-page]

From fd6f3d64aa479b0868b3cac754752be41eb18960 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 00:19:07 +0200
Subject: [PATCH 03/47] Update push-image.yml

---
 .github/workflows/push-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 0961ba07a1..385e4e4d53 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -61,3 +61,4 @@ jobs:
           build-args: |
             RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }}
             BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-35fe7e39' }}
+          push: true

From 2ca453831bba9aed92ff99c2ae392ba7cde1f35c Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 00:25:15 +0200
Subject: [PATCH 04/47] Update build.yml

---
 .github/workflows/build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88309f61d2..f6c288d25b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,8 +1,6 @@
 name: 'Test and Build'
 
 on:
-  push:
-  pull_request:
   workflow_dispatch:
 
 jobs:

From c73288d57855a01760d8bb3714e7159baad8959f Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Thu, 23 Jan 2025 00:41:37 +0200
Subject: [PATCH 05/47] minor changes

---
 public/views/index/body.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 62986a6305..b5706dbe49 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -46,7 +46,7 @@
                     <h1 class="cover-heading">
                         <!-- <i class="fa fa-file-text"></i> -->
                         <img src="<%- serverURL %>/it-logo.png" alt="IT logo"style="width: 125px; height: 125px; object-fit: contain;"/>
-                        Auth IT
+                        AuthMD
                     </h1>
                     <p class="lead">
                         <%= __('Best way to write and share your knowledge in markdown.') %>

From 50230bb85fadb0c04f1772820c989baaa7cf4607 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Thu, 23 Jan 2025 11:06:35 +0200
Subject: [PATCH 06/47] Added logo to the window title bar

---
 public/views/codimd/head.ejs | 2 +-
 public/views/index/head.ejs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs
index 69dd01f615..6679c26072 100644
--- a/public/views/codimd/head.ejs
+++ b/public/views/codimd/head.ejs
@@ -6,7 +6,7 @@
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="codeium:type" content="codemirror5">
 <title><%= title %></title>
-<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
+<link rel="icon" type="image/png" href="<%- serverURL %>/it-logo.png">
 <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 <% if(useCDN) { %>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" />
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs
index 68b5e6340d..6db0efe163 100644
--- a/public/views/index/head.ejs
+++ b/public/views/index/head.ejs
@@ -7,7 +7,7 @@
 <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta name="keywords" content="Collaborative, Markdown, Notes">
 <title>AuthMD - <%= __('Collaborative markdown notes') %></title>
-<link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
+<link rel="icon" type="image/png" href="<%- serverURL %>/it-logo.png">
 <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 <% if(useCDN) { %>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" />

From 944579190b55ddb78080bbc7fc86df78546cfa7e Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Thu, 23 Jan 2025 19:51:05 +0200
Subject: [PATCH 07/47] Modified workflow for nexus

---
 .github/workflows/push-image.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 385e4e4d53..ee3ef3f5cf 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,7 +15,7 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
-  REGISTRY_IMAGE: lamprosfasoulas/codimd
+  REGISTRY_IMAGE: ${{ secrets.NEXUS_REGISTRY }}/lamprosfasoulas/codimd
 
 jobs:
   build:
@@ -43,8 +43,11 @@ jobs:
         name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          # username: ${{ secrets.DOCKERHUB_USERNAME }}
+          # password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.NEXUS_USERNAME }}
+          password: ${{ secrets.NEXUS_PASSWORD }}
+          registry: ${{ secrets.NEXUS_REGISTRY }}
       -
         name: Build and push
         id: build

From 3ab03e41b018feedaa3bece9464bc4f35ab50794 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 20:01:11 +0200
Subject: [PATCH 08/47] Update push-image.yml

---
 .github/workflows/push-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index ee3ef3f5cf..5637c69141 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,7 +15,7 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
-  REGISTRY_IMAGE: ${{ secrets.NEXUS_REGISTRY }}/lamprosfasoulas/codimd
+  REGISTRY_IMAGE: lamprosfasoulas/codimd
 
 jobs:
   build:
@@ -58,8 +58,8 @@ jobs:
           platforms: linux/amd64
           labels: ${{ steps.meta.outputs.labels }}
           tags: |
-            ${{ env.REGISTRY_IMAGE }}:latest
-            ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+            ${{ secrets.NEXUS_REGISTRY }}/${{ env.REGISTRY_IMAGE }}:latest
+            ${{ secrets.NEXUS_REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
           build-args: |
             RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }}

From deff0e8de7494f79bfad731394ab13ea70af50f6 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 20:03:43 +0200
Subject: [PATCH 09/47] Update push-image.yml

---
 .github/workflows/push-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 5637c69141..230e3bd598 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,7 +15,7 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
-  REGISTRY_IMAGE: lamprosfasoulas/codimd
+  REGISTRY_IMAGE: codimd
 
 jobs:
   build:

From 5890bf6d13d6246ae8a3719a339d273b3f509cfe Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Thu, 23 Jan 2025 20:06:45 +0200
Subject: [PATCH 10/47] Update push-image.yml

---
 .github/workflows/push-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 230e3bd598..7c7b3292c9 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -15,7 +15,7 @@ on:
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
 
 env:
-  REGISTRY_IMAGE: codimd
+  REGISTRY_IMAGE: demo-images/codimd
 
 jobs:
   build:

From 43429fd4084476f70e3e627ef9fb7aa5de4db1e4 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Fri, 24 Jan 2025 14:21:17 +0200
Subject: [PATCH 11/47] edited title bar icons

---
 public/views/html.hbs   | 2 +-
 public/views/pretty.ejs | 2 +-
 public/views/slide.ejs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/html.hbs b/public/views/html.hbs
index f006909493..8c013852f7 100644
--- a/public/views/html.hbs
+++ b/public/views/html.hbs
@@ -12,7 +12,7 @@
     <title>
         {{title}}
     </title>
-    <link rel="icon" type="image/png" href="{{{url}}}/favicon.png">
+    <link rel="icon" type="image/png" href="{{{url}}}/it-logo.png">
     <link rel="apple-touch-icon" href="{{{url}}}/apple-touch-icon.png">
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" />
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 2d63ffac45..80cef29a3e 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -18,7 +18,7 @@
     <meta name="description" content="<%= description %>">
     <% } %>
     <title><%= title %></title>
-    <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
+    <link rel="icon" type="image/png" href="<%- serverURL %>/it-logo.png">
     <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
   <% if(useCDN) { %>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.0/css/bootstrap.min.css" integrity="sha256-H0KfTigpUV+0/5tn2HXC0CPwhhDhWgSawJdnFd0CGCo=" crossorigin="anonymous" />
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index fb997d5dd5..28f73dd7cd 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -12,7 +12,7 @@
         <meta name="description" content="<%= description %>">
         <% } %>
         <title><%= title %></title>
-        <link rel="icon" type="image/png" href="<%- serverURL %>/favicon.png">
+        <link rel="icon" type="image/png" href="<%- serverURL %>/it-logo.png">
         <link rel="apple-touch-icon" href="<%- serverURL %>/apple-touch-icon.png">
 
         <% if(useCDN) { %>

From e2e539876a898bfadce098410934f53e6c696efc Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Sat, 25 Jan 2025 16:26:47 +0200
Subject: [PATCH 12/47] testing actions with api

---
 .github/workflows/test.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000..ed6aa24606
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,16 @@
+
+name: Hello world test action
+
+on:
+  workflow_dispatch:
+
+jobs:
+  say-hello:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Hello world
+        run: echo "Hello world"

From 2e0d9d74efabba5a06f098b31266e975b69cdb44 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 12 Mar 2025 14:48:10 +0200
Subject: [PATCH 13/47] edit me before pushing

---
 bin/manage_users              | 70 +++++++++++++++++++++++++++++++++++
 lib/auth/ldap/index.js        |  2 +-
 lib/imageRouter/filesystem.js | 31 ++++++++++++----
 lib/imageRouter/index.js      |  3 +-
 lib/user/index.js             | 41 +++++++++++++++++++-
 5 files changed, 137 insertions(+), 10 deletions(-)

diff --git a/bin/manage_users b/bin/manage_users
index 113352a3ec..a21d830831 100755
--- a/bin/manage_users
+++ b/bin/manage_users
@@ -9,6 +9,9 @@ logger.transports.forEach((transport) => {
 const models = require('../lib/models/')
 const readline = require('readline-sync')
 const minimist = require('minimist')
+//import filesystem to delete images
+const fs = require('fs')
+const path = require('path')
 
 function showUsage (tips) {
   console.log(`${tips}
@@ -21,6 +24,9 @@ Usage: bin/manage_users [--pass password] (--add | --del) user-email
     --reset\tReset user password with specified user-email
     --pass\tUse password from cmdline rather than prompting
 `)
+  //editme
+  //--del\tDelete user with specified LDAP username
+  //--delOrphan delete orphan notes
   process.exit(1)
 }
 
@@ -56,16 +62,80 @@ async function createUser (argv) {
 async function deleteUser (argv) {
   // Cannot delete non-existing users
   const existingUser = await models.User.findOne({ where: { email: argv['del'] } })
+  //editme
+  // const existingUser = await models.User.findOne({ where: { profileid: "LDAP-"+argv['del'] } })
   if (!existingUser) {
     console.log(`User with e-mail ${argv['del']} does not exist, cannot delete`)
+    //editme
+    // console.log(`User with profileid LDAP-${argv['del']} does not exist, cannot delete`)
     process.exit(1)
   }
+  // editme
+  // Here we delete PERMANENTLY ALL the notes belonging to the Deleted
+  // USER
+  // #############################################
+  // try {
+  //  const deleteNote = await models.Note.destroy({
+  //    where: {
+  //      ownerId: existingUser.id
+  //    }
+  //  });
+  // } catch (error){
+  //  console.log(`Error deleting note:`,error)
+  // }
+  // #############################################
+  // Delete USER uploads
+  // #############################################
+  // const uploadDir = '/home/hackmd/app/public/uploads'
+  // try {
+  //    fs.accessSync(uploadDir, fs.constants.F_OK)
+  // } catch (e) {
+  //    console.log(`Error: `,e)
+  // }
+  // let files
+  // try {
+  //    files = fs.readdirSync(uploadDir)
+  // } catch (e) {
+  //    console.log(`Error reading directory:`,e)
+  // }
+  // const filesToDelete = files.filter(file => {
+  //    return file.includes(`_${existingUser.id}_`,filesToDelete)
+  // })
+  // filesToDelete.forEach(file => {
+  //    const filePath = path.join(uploadDir, file)
+  //    try {
+  //        fs.unlinkSync(filePath)
+  //        console.log(`Deleted file: `, filePath)
+  //    } catch (e) {
+  //        console.log(`Error Deleting file: `,e)
+  //    }
+  // });
+  // #############################################
 
   // Sadly .destroy() does not return any success value with all
   // backends. See sequelize #4124
   await existingUser.destroy()
   console.log(`Deleted user ${argv['del']} ...`)
 }
+// Func to delete orphans
+//
+// const { Op, Sequelize } = require('sequelize')
+// async function deleteOrphan() {
+//    try {
+//        await models.Note.destroy({
+//            where: {
+//                ownerId: {
+//                    [Sequelize.Op.notIn]: Sequelize.literal('(SELECT id FROM "Users")')
+//                }
+//            }
+//        })
+//        console.log(`Deleted orphan notes`)
+//    } catch (e) {
+//        console.log(`Error deleting orphans: `, e)
+//    }
+// }
+//
+
 
 // Using an async function to be able to use await inside
 async function resetUser (argv) {
diff --git a/lib/auth/ldap/index.js b/lib/auth/ldap/index.js
index 348c0d76d8..738e804d54 100644
--- a/lib/auth/ldap/index.js
+++ b/lib/auth/ldap/index.js
@@ -40,7 +40,7 @@ passport.use(new LDAPStrategy({
     username = user[config.ldap.usernameField]
   }
 
-  var profile = {
+  var profile = {//editme
     id: 'LDAP-' + uuid,
     username: username,
     displayName: user.displayName,
diff --git a/lib/imageRouter/filesystem.js b/lib/imageRouter/filesystem.js
index 76dd92dcf6..0211449234 100644
--- a/lib/imageRouter/filesystem.js
+++ b/lib/imageRouter/filesystem.js
@@ -8,33 +8,36 @@ const path = require('path')
 const config = require('../config')
 const logger = require('../logger')
 
+const MAX_IMAGE_SIZE = 5 * 1024 * 1024
 /**
  * generate a random filename for uploaded image
  */
-function randomFilename () {
+function randomFilename (userid) {
   const buf = crypto.randomBytes(16)
-  return `upload_${buf.toString('hex')}`
+  return `upload_${userid}_${buf.toString('hex')}`
 }
 
 /**
  * pick a filename not exist in filesystem
  * maximum attempt 5 times
  */
-function pickFilename (defaultFilename) {
+function pickFilename (defaultFilename,req) {
   let retryCounter = 5
   const extname = path.extname(defaultFilename)
-  let filename = `${randomFilename()}${extname}`
+  const userid = req.user.id
+  let filename = `${randomFilename(userid)}${extname}`
   while (retryCounter-- > 0) {
     if (fs.existsSync(path.join(config.uploadsPath, filename))) {
-      filename = `${randomFilename()}${extname}`
+      filename = `${randomFilename(userid)}${extname}`
       continue
     }
     return filename
   }
   throw new Error('file exists.')
 }
+//editme
 
-exports.uploadImage = function (imagePath, callback) {
+exports.uploadImage = function (req,imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {
     callback(new Error('Image path is missing or wrong'), null)
     return
@@ -45,9 +48,23 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
+  // editme
+  // Check image size
+  let stats
+  try {
+    stats = fs.statSync(imagePath)
+  } catch (e) {
+    return callback(new Error('Failed to read the image file'), null)
+  }
+
+  // If the image is too large, reject the upload
+  if (stats.size > MAX_IMAGE_SIZE) {
+    return callback(new Error('Image size exceeds the 5MB limit'), null)
+  }
+
   let filename = path.basename(imagePath)
   try {
-    filename = pickFilename(path.basename(imagePath))
+    filename = pickFilename(path.basename(imagePath),req)
   } catch (e) {
     return callback(e, null)
   }
diff --git a/lib/imageRouter/index.js b/lib/imageRouter/index.js
index 8450b2d80d..0cdc71431b 100644
--- a/lib/imageRouter/index.js
+++ b/lib/imageRouter/index.js
@@ -49,7 +49,8 @@ imageRouter.post('/uploadimage', function (req, res) {
       }
 
       const uploadProvider = require('./' + config.imageUploadType)
-      uploadProvider.uploadImage(files.image.filepath, function (err, url) {
+      // add req here
+      uploadProvider.uploadImage(req,files.image.filepath, function (err, url) {
         // remove temporary upload file, and ignore any error
         fs.unlink(files.image.filepath, () => {})
         if (err !== null) {
diff --git a/lib/user/index.js b/lib/user/index.js
index 6006450c07..058dd18bb3 100644
--- a/lib/user/index.js
+++ b/lib/user/index.js
@@ -35,7 +35,7 @@ exports.getMe = async (req, res) => {
   })
 }
 
-exports.deleteUser = async (req, res) => {
+exports.deleteUser = async (req, res) => {//editme
   if (!req.isAuthenticated()) {
     return response.errorForbidden(req, res)
   }
@@ -55,6 +55,45 @@ exports.deleteUser = async (req, res) => {
   }
 
   await user.destroy()
+  // #############################################
+  // Delet user notes as well
+  // #############################################
+  // try {
+  //  const deleteNote = await models.Note.destroy({
+  //    where: {
+  //      ownerId: existingUser.id
+  //    }
+  //  });
+  // } catch (error){
+  //  console.log(`Error deleting note:`,error)
+  // }
+  // #############################################
+  // Delete USER uploads
+  // #############################################
+  // const uploadDir = '/home/hackmd/app/public/uploads'
+  // try {
+  //    fs.accessSync(uploadDir, fs.constants.F_OK)
+  // } catch (e) {
+  //    console.log(`Error: `,e)
+  // }
+  // let files
+  // try {
+  //    files = fs.readdirSync(uploadDir)
+  // } catch (e) {
+  //    console.log(`Error reading directory:`,e)
+  // }
+  // const filesToDelete = files.filter(file => {
+  //    return file.includes(`_${existingUser.id}_`,filesToDelete)
+  // })
+  // filesToDelete.forEach(file => {
+  //    const filePath = path.join(uploadDir, file)
+  //    try {
+  //        fs.unlinkSync(filePath)
+  //        console.log(`Deleted file: `, filePath)
+  //    } catch (e) {
+  //        console.log(`Error Deleting file: `,e)
+  //    }
+  // });
   return res.redirect(config.serverURL + '/')
 }
 

From 5261906015718e7ae82374bfadbc151fac7fcd24 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Thu, 13 Mar 2025 19:06:08 +0200
Subject: [PATCH 14/47] almost ready for testing

---
 bin/checkusers.sh             |  20 ++++++
 bin/manage_users              | 121 +++++++++++++++++-----------------
 deployments/Dockerfile        |   2 +
 lib/imageRouter/filesystem.js |   4 +-
 lib/user/index.js             |  68 +++++++++----------
 5 files changed, 117 insertions(+), 98 deletions(-)
 create mode 100755 bin/checkusers.sh

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
new file mode 100755
index 0000000000..bcf87f66f3
--- /dev/null
+++ b/bin/checkusers.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+isActive() {
+  value=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $search)
+  if echo $value | grep -q "ISACTIVE"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+res=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
+while IFS=' ' read -r word; do
+  uid=$(echo $word | cut -d '-' -f2)
+  search=$(echo $CMD_LDAP_SEARCHFILTER | sed "s#{{username}}#${uid}#")
+  if isActive; then
+    echo "The account is active"
+  else
+    echo "The account must be destroyed"
+  fi
+done <<< "$res"
diff --git a/bin/manage_users b/bin/manage_users
index a21d830831..65cda385ac 100755
--- a/bin/manage_users
+++ b/bin/manage_users
@@ -20,13 +20,12 @@ Command-line utility to create users for email-signin.
 Usage: bin/manage_users [--pass password] (--add | --del) user-email
   Options:
     --add\tAdd user with the specified user-email
-    --del\tDelete user with specified user-email
+    --del\tDelete user with specified LDAP username
+    --delOrphan delete orphan notes
     --reset\tReset user password with specified user-email
     --pass\tUse password from cmdline rather than prompting
 `)
-  //editme
-  //--del\tDelete user with specified LDAP username
-  //--delOrphan delete orphan notes
+  // modhere
   process.exit(1)
 }
 
@@ -61,55 +60,52 @@ async function createUser (argv) {
 // Using an async function to be able to use await inside
 async function deleteUser (argv) {
   // Cannot delete non-existing users
-  const existingUser = await models.User.findOne({ where: { email: argv['del'] } })
-  //editme
-  // const existingUser = await models.User.findOne({ where: { profileid: "LDAP-"+argv['del'] } })
+  // modhere
+  const existingUser = await models.User.findOne({ where: { profileid: "LDAP-"+argv['del'] } })
   if (!existingUser) {
-    console.log(`User with e-mail ${argv['del']} does not exist, cannot delete`)
-    //editme
-    // console.log(`User with profileid LDAP-${argv['del']} does not exist, cannot delete`)
+    console.log(`User with profileid LDAP-${argv['del']} does not exist, cannot delete`)
     process.exit(1)
   }
-  // editme
+  // modhere
   // Here we delete PERMANENTLY ALL the notes belonging to the Deleted
   // USER
   // #############################################
-  // try {
-  //  const deleteNote = await models.Note.destroy({
-  //    where: {
-  //      ownerId: existingUser.id
-  //    }
-  //  });
-  // } catch (error){
-  //  console.log(`Error deleting note:`,error)
-  // }
+   try {
+    const deleteNote = await models.Note.destroy({
+      where: {
+        ownerId: existingUser.id
+      }
+    });
+   } catch (error){
+    console.log(`Error deleting note:`,error)
+   }
   // #############################################
   // Delete USER uploads
   // #############################################
-  // const uploadDir = '/home/hackmd/app/public/uploads'
-  // try {
-  //    fs.accessSync(uploadDir, fs.constants.F_OK)
-  // } catch (e) {
-  //    console.log(`Error: `,e)
-  // }
-  // let files
-  // try {
-  //    files = fs.readdirSync(uploadDir)
-  // } catch (e) {
-  //    console.log(`Error reading directory:`,e)
-  // }
-  // const filesToDelete = files.filter(file => {
-  //    return file.includes(`_${existingUser.id}_`,filesToDelete)
-  // })
-  // filesToDelete.forEach(file => {
-  //    const filePath = path.join(uploadDir, file)
-  //    try {
-  //        fs.unlinkSync(filePath)
-  //        console.log(`Deleted file: `, filePath)
-  //    } catch (e) {
-  //        console.log(`Error Deleting file: `,e)
-  //    }
-  // });
+   const uploadDir = '/home/hackmd/app/public/uploads'
+   try {
+      fs.accessSync(uploadDir, fs.constants.F_OK)
+   } catch (e) {
+      console.log(`Error: `,e)
+   }
+   let files
+   try {
+      files = fs.readdirSync(uploadDir)
+   } catch (e) {
+      console.log(`Error reading directory:`,e)
+   }
+   const filesToDelete = files.filter(file => {
+      return file.includes(`_${existingUser.id}_`,filesToDelete)
+   })
+   filesToDelete.forEach(file => {
+      const filePath = path.join(uploadDir, file)
+      try {
+          fs.unlinkSync(filePath)
+          console.log(`Deleted file: `, filePath)
+      } catch (e) {
+          console.log(`Error Deleting file: `,e)
+      }
+   });
   // #############################################
 
   // Sadly .destroy() does not return any success value with all
@@ -119,22 +115,22 @@ async function deleteUser (argv) {
 }
 // Func to delete orphans
 //
-// const { Op, Sequelize } = require('sequelize')
-// async function deleteOrphan() {
-//    try {
-//        await models.Note.destroy({
-//            where: {
-//                ownerId: {
-//                    [Sequelize.Op.notIn]: Sequelize.literal('(SELECT id FROM "Users")')
-//                }
-//            }
-//        })
-//        console.log(`Deleted orphan notes`)
-//    } catch (e) {
-//        console.log(`Error deleting orphans: `, e)
-//    }
-// }
-//
+ const { Op, Sequelize } = require('sequelize')
+ async function deleteOrphan() {
+    try {
+        await models.Note.destroy({
+            where: {
+                ownerId: {
+                    [Sequelize.Op.notIn]: Sequelize.literal('(SELECT id FROM "Users")')
+                }
+            }
+        })
+        console.log(`Deleted orphan notes`)
+    } catch (e) {
+        console.log(`Error deleting orphans: `, e)
+    }
+ }
+
 
 
 // Using an async function to be able to use await inside
@@ -157,8 +153,9 @@ async function resetUser (argv) {
 const options = {
   add: createUser,
   del: deleteUser,
-  reset: resetUser
-}
+  reset: resetUser,
+  delOrphan: deleteOrphan
+}//modhere
 
 // Perform commandline-parsing
 const argv = minimist(process.argv.slice(2))
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 532a099cc9..48230e854d 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -19,6 +19,8 @@ RUN set -xe && \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
 
 FROM $RUNTIME
+USER root
+RUN apt-get update && apt-get install ldap-utils -y
 USER hackmd
 ENV QT_QPA_PLATFORM=offscreen
 WORKDIR /home/hackmd/app
diff --git a/lib/imageRouter/filesystem.js b/lib/imageRouter/filesystem.js
index 0211449234..262f18837f 100644
--- a/lib/imageRouter/filesystem.js
+++ b/lib/imageRouter/filesystem.js
@@ -35,7 +35,7 @@ function pickFilename (defaultFilename,req) {
   }
   throw new Error('file exists.')
 }
-//editme
+//modhere
 
 exports.uploadImage = function (req,imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {
@@ -48,7 +48,7 @@ exports.uploadImage = function (req,imagePath, callback) {
     return
   }
 
-  // editme
+  // modhere
   // Check image size
   let stats
   try {
diff --git a/lib/user/index.js b/lib/user/index.js
index 058dd18bb3..9cc5a2d463 100644
--- a/lib/user/index.js
+++ b/lib/user/index.js
@@ -35,7 +35,7 @@ exports.getMe = async (req, res) => {
   })
 }
 
-exports.deleteUser = async (req, res) => {//editme
+exports.deleteUser = async (req, res) => {//modhere
   if (!req.isAuthenticated()) {
     return response.errorForbidden(req, res)
   }
@@ -58,42 +58,42 @@ exports.deleteUser = async (req, res) => {//editme
   // #############################################
   // Delet user notes as well
   // #############################################
-  // try {
-  //  const deleteNote = await models.Note.destroy({
-  //    where: {
-  //      ownerId: existingUser.id
-  //    }
-  //  });
-  // } catch (error){
-  //  console.log(`Error deleting note:`,error)
-  // }
+   try {
+    const deleteNote = await models.Note.destroy({
+      where: {
+        ownerId: req.user.id
+      }
+    });
+   } catch (error){
+    console.log(`Error deleting note:`,error)
+   }
   // #############################################
   // Delete USER uploads
   // #############################################
-  // const uploadDir = '/home/hackmd/app/public/uploads'
-  // try {
-  //    fs.accessSync(uploadDir, fs.constants.F_OK)
-  // } catch (e) {
-  //    console.log(`Error: `,e)
-  // }
-  // let files
-  // try {
-  //    files = fs.readdirSync(uploadDir)
-  // } catch (e) {
-  //    console.log(`Error reading directory:`,e)
-  // }
-  // const filesToDelete = files.filter(file => {
-  //    return file.includes(`_${existingUser.id}_`,filesToDelete)
-  // })
-  // filesToDelete.forEach(file => {
-  //    const filePath = path.join(uploadDir, file)
-  //    try {
-  //        fs.unlinkSync(filePath)
-  //        console.log(`Deleted file: `, filePath)
-  //    } catch (e) {
-  //        console.log(`Error Deleting file: `,e)
-  //    }
-  // });
+   const uploadDir = '/home/hackmd/app/public/uploads'
+   try {
+      fs.accessSync(uploadDir, fs.constants.F_OK)
+   } catch (e) {
+      console.log(`Error: `,e)
+   }
+   let files
+   try {
+      files = fs.readdirSync(uploadDir)
+   } catch (e) {
+      console.log(`Error reading directory:`,e)
+   }
+   const filesToDelete = files.filter(file => {
+      return file.includes(`_${req.user.id}_`,filesToDelete)
+   })
+   filesToDelete.forEach(file => {
+      const filePath = path.join(uploadDir, file)
+      try {
+          fs.unlinkSync(filePath)
+          console.log(`Deleted file: `, filePath)
+      } catch (e) {
+          console.log(`Error Deleting file: `,e)
+      }
+   });
   return res.redirect(config.serverURL + '/')
 }
 

From 71b21176e6c5bdc456a7ec3b1e8d41e056feaaa3 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 12:11:27 +0200
Subject: [PATCH 15/47] first test

---
 bin/checkusers.sh      | 5 +++--
 bin/manage_users       | 3 +++
 deployments/Cronjob    | 2 ++
 deployments/Dockerfile | 7 ++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 deployments/Cronjob

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index bcf87f66f3..0a71e387a7 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 isActive() {
-  value=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $search)
-  if echo $value | grep -q "ISACTIVE"; then
+  if ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $search | grep -q -e "^uid:"; then
     return 0
   else
     return 1
@@ -16,5 +15,7 @@ while IFS=' ' read -r word; do
     echo "The account is active"
   else
     echo "The account must be destroyed"
+    /home/hackmd/app/bin/manage_users --del $uid
+    /home/hackmd/app/bin/manage_users --delOrphan $uid
   fi
 done <<< "$res"
diff --git a/bin/manage_users b/bin/manage_users
index 65cda385ac..a7be8e9cb6 100755
--- a/bin/manage_users
+++ b/bin/manage_users
@@ -66,10 +66,12 @@ async function deleteUser (argv) {
     console.log(`User with profileid LDAP-${argv['del']} does not exist, cannot delete`)
     process.exit(1)
   }
+    console.log(`Deleting user LDAP-${argv['del']}`)
   // modhere
   // Here we delete PERMANENTLY ALL the notes belonging to the Deleted
   // USER
   // #############################################
+    console.log(`Deleting user LDAP-${argv['del']} notes`)
    try {
     const deleteNote = await models.Note.destroy({
       where: {
@@ -82,6 +84,7 @@ async function deleteUser (argv) {
   // #############################################
   // Delete USER uploads
   // #############################################
+    console.log(`Deleting user LDAP-${argv['del']} uploads`)
    const uploadDir = '/home/hackmd/app/public/uploads'
    try {
       fs.accessSync(uploadDir, fs.constants.F_OK)
diff --git a/deployments/Cronjob b/deployments/Cronjob
new file mode 100644
index 0000000000..e92ef39c51
--- /dev/null
+++ b/deployments/Cronjob
@@ -0,0 +1,2 @@
+* * * * * /home/hackmd/app/bin/checkusers.sh >> /var/log/cron.log 2>&1
+
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 48230e854d..1260b0b45b 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -20,7 +20,12 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER root
-RUN apt-get update && apt-get install ldap-utils -y
+RUN apt-get update && apt-get install ldap-utils cron -y
+COPY .deployments/Cronjon /etc/cron.d/checkusers
+RUN chmod +x /etc/cron.d/checkusers
+RUN touch /var/log/cron.log
+RUN crontab /etc/cron.d/checkusers
+RUN cron
 USER hackmd
 ENV QT_QPA_PLATFORM=offscreen
 WORKDIR /home/hackmd/app

From ea4cff580c860f91b70b5195a5cb1918754c1d8d Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 12:32:01 +0200
Subject: [PATCH 16/47] minor edit to dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 1260b0b45b..d64bfef2c6 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -21,7 +21,7 @@ RUN set -xe && \
 FROM $RUNTIME
 USER root
 RUN apt-get update && apt-get install ldap-utils cron -y
-COPY .deployments/Cronjon /etc/cron.d/checkusers
+COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
 RUN crontab /etc/cron.d/checkusers

From 3fec064df05ff1e9d58f3afdfab42d88544651db Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:37:16 +0200
Subject: [PATCH 17/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index d64bfef2c6..b63f5f38f9 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -7,6 +7,7 @@ COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen
 
 RUN set -xe && \
+    apt-get update && apt-get install ldap-utils cron -y && \
     git reset --hard && \
     git clean -fx && \
     npm install && \
@@ -20,7 +21,6 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER root
-RUN apt-get update && apt-get install ldap-utils cron -y
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From e1b38e6de0f63910851a2ec7e78686c9406e7eba Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:39:22 +0200
Subject: [PATCH 18/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index b63f5f38f9..eef2ec2735 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -1,7 +1,7 @@
 ARG RUNTIME
 ARG BUILDPACK
 
-FROM $BUILDPACK as BUILD
+FROM $BUILDPACK AS BUILD
 
 COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen

From 444d840fcc374a506df3bb996717cb9cc9064997 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:45:04 +0200
Subject: [PATCH 19/47] Update Dockerfile -- hopes and prayers

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index eef2ec2735..d86ee57947 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -7,7 +7,6 @@ COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen
 
 RUN set -xe && \
-    apt-get update && apt-get install ldap-utils cron -y && \
     git reset --hard && \
     git clean -fx && \
     npm install && \
@@ -21,6 +20,7 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER root
+RUN apt-get update && apt-get install -y --no-install-recommends ldap-utils cron
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From c9c9ea4375ffa74a96a2eaa80c1919fd93ffde7c Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:52:12 +0200
Subject: [PATCH 20/47] Update Dockerfile --  root

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index d86ee57947..7f4bfae9a2 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -19,7 +19,7 @@ RUN set -xe && \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
 
 FROM $RUNTIME
-USER root
+USER 0
 RUN apt-get update && apt-get install -y --no-install-recommends ldap-utils cron
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers

From 69b0ebe0561bdf1155f9dd75e0727f889e66b6e3 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:55:49 +0200
Subject: [PATCH 21/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 7f4bfae9a2..78a4ad3030 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -20,7 +20,7 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER 0
-RUN apt-get update && apt-get install -y --no-install-recommends ldap-utils cron
+RUN /bin/bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From d5a1be1a3f7ffb0b471f5d1746830357652b1384 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:03:07 +0200
Subject: [PATCH 22/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 78a4ad3030..7cf318ce47 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -20,7 +20,7 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER 0
-RUN /bin/bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
+RUN bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From 1e873792e4a32514c009c9f5bc508639e03ecd08 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:12:42 +0200
Subject: [PATCH 23/47] Update Dockerfile

---
 deployments/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 7cf318ce47..d8472ab9d9 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -6,6 +6,9 @@ FROM $BUILDPACK AS BUILD
 COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen
 
+USER root
+RUN bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
+USER hackmd
 RUN set -xe && \
     git reset --hard && \
     git clean -fx && \
@@ -19,8 +22,7 @@ RUN set -xe && \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
 
 FROM $RUNTIME
-USER 0
-RUN bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
+USER root
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From ba80b405b2d0d6290ab03b65f0671751b012f855 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:15:21 +0200
Subject: [PATCH 24/47] Update Dockerfile

---
 deployments/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index d8472ab9d9..20c1f76616 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -6,8 +6,8 @@ FROM $BUILDPACK AS BUILD
 COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen
 
-USER root
-RUN bash -c "apt-get update && apt-get install -y --no-install-recommends ldap-utils cron"
+USER 0
+RUN apt-get update && apt-get install -y --no-install-recommends ldap-utils cron
 USER hackmd
 RUN set -xe && \
     git reset --hard && \

From 8136543568a3e5bd02f6244fbae5fcb2b5cbda0b Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:25:07 +0200
Subject: [PATCH 25/47] Update Dockerfile --  test new image

---
 deployments/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 20c1f76616..cff2810575 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -6,8 +6,6 @@ FROM $BUILDPACK AS BUILD
 COPY --chown=hackmd:hackmd . .
 ENV QT_QPA_PLATFORM=offscreen
 
-USER 0
-RUN apt-get update && apt-get install -y --no-install-recommends ldap-utils cron
 USER hackmd
 RUN set -xe && \
     git reset --hard && \
@@ -20,6 +18,10 @@ RUN set -xe && \
         test docs contribute \
         package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
+FROM node:16.20.2
+RUN apt-get update && \
+    apt-get install -y cron ldap-utils
+CMD ["cron"]
 
 FROM $RUNTIME
 USER root

From fb969e02885ed3aa97435b118df60d384691a091 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:57:23 +0200
Subject: [PATCH 26/47] Update Docker file test test

---
 deployments/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index cff2810575..6bffc6b5f6 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -18,14 +18,18 @@ RUN set -xe && \
         test docs contribute \
         package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
-FROM node:16.20.2
+        
+FROM node:16.20.2 AS cron
+USER 0
 RUN apt-get update && \
     apt-get install -y cron ldap-utils
-CMD ["cron"]
+
 
 FROM $RUNTIME
 USER root
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
+COPY --from=cron /usr/sbin/cron /usr/sbin/cron
+COPY --from=cron /usr/bin/ldapsearch /usr/bin/ldapsearch
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
 RUN crontab /etc/cron.d/checkusers

From 34820fb1c07fbd21ec4f5ced14feb3391b95e3f5 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:00:55 +0200
Subject: [PATCH 27/47] Update Dockerfile -- typo

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 6bffc6b5f6..ec38b2ed6d 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update && \
 
 FROM $RUNTIME
 USER root
-COPY --from=BUILD /home/hackmd/app/deployments/Cronjon /etc/cron.d/checkusers
+COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 COPY --from=cron /usr/sbin/cron /usr/sbin/cron
 COPY --from=cron /usr/bin/ldapsearch /usr/bin/ldapsearch
 RUN chmod +x /etc/cron.d/checkusers

From 4b4424d55db12034f8749758266f566ae411639d Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:15:14 +0200
Subject: [PATCH 28/47] Update Dockerfile

---
 deployments/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index ec38b2ed6d..c0a7360298 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -29,6 +29,7 @@ FROM $RUNTIME
 USER root
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 COPY --from=cron /usr/sbin/cron /usr/sbin/cron
+COPY --from=cron /usr/bin/crontab /usr/bin/crontab
 COPY --from=cron /usr/bin/ldapsearch /usr/bin/ldapsearch
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log

From 2d6caab4c05f7406422cae58bde4d6aaf1997602 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:28:26 +0200
Subject: [PATCH 29/47] Update Dockerfile

---
 deployments/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index c0a7360298..ece4001c19 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -27,6 +27,7 @@ RUN apt-get update && \
 
 FROM $RUNTIME
 USER root
+RUN apt-get update && apt-get install -y --no-install-recommends vim 
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 COPY --from=cron /usr/sbin/cron /usr/sbin/cron
 COPY --from=cron /usr/bin/crontab /usr/bin/crontab

From 5700bb046f87bc4fed6d4f1063e57d09277b964f Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:33:00 +0200
Subject: [PATCH 30/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index ece4001c19..342d8a3f22 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update && \
 
 FROM $RUNTIME
 USER root
-RUN apt-get update && apt-get install -y --no-install-recommends vim 
+RUN apt update && apt install -y vim 
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 COPY --from=cron /usr/sbin/cron /usr/sbin/cron
 COPY --from=cron /usr/bin/crontab /usr/bin/crontab

From b65985a4bd1a40c973b6e548fa4946415d4a4531 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:37:11 +0200
Subject: [PATCH 31/47] Update Dockerfile

---
 deployments/Dockerfile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 342d8a3f22..6824ece02c 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -19,19 +19,11 @@ RUN set -xe && \
         package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
         
-FROM node:16.20.2 AS cron
-USER 0
-RUN apt-get update && \
-    apt-get install -y cron ldap-utils
-
-
 FROM $RUNTIME
 USER root
-RUN apt update && apt install -y vim 
+RUN apt update & apt install -y cron ldap-utils
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
-COPY --from=cron /usr/sbin/cron /usr/sbin/cron
-COPY --from=cron /usr/bin/crontab /usr/bin/crontab
-COPY --from=cron /usr/bin/ldapsearch /usr/bin/ldapsearch
+
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
 RUN crontab /etc/cron.d/checkusers

From 504e6c34483bb2a6fb08163f2132cca09a7e72f9 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Wed, 19 Mar 2025 14:47:31 +0200
Subject: [PATCH 32/47] Update Dockerfile -- final?

---
 deployments/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 6824ece02c..b7c7d9f8cb 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -21,9 +21,14 @@ RUN set -xe && \
         
 FROM $RUNTIME
 USER root
-RUN apt update & apt install -y cron ldap-utils
+RUN rm -f /etc/apt/sources.list.d/*.list && \
+    echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list && \
+    echo "deb http://deb.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \
+    echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends cron ldap-utils && \
+    rm -rf /var/lib/apt/lists/*
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
-
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
 RUN crontab /etc/cron.d/checkusers

From 3da22191d1b18b157c53489231430b44856efeeb Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 21:23:21 +0200
Subject: [PATCH 33/47] using bash script for deleting

---
 bin/checkusers.sh      | 44 +++++++++++++++++++++++++++++++++---------
 deployments/Cronjob    |  2 +-
 deployments/Dockerfile |  3 ++-
 lib/user/index.js      | 24 +++++++++++------------
 4 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index 0a71e387a7..90df30f7c7 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -1,21 +1,47 @@
-#!/usr/bin/env bash
+#!/bin/bash
+# The script uses Cronjob to run once a day to check for expired users
+# It is vital to have RUN env > /etc/environment in Dockerfile so that
+# cronjob can have access to env variables from docker
 isActive() {
-  if ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $search | grep -q -e "^uid:"; then
+  if ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query | grep -q -e "^uid:"; then
     return 0
   else
     return 1
   fi
 }
+deleteUser(){
+  # Deleting users from postgres database
+  local profileid="$1"
+  psql $CMD_DB_URL <<-SQL
+  DELETE FROM "Users" WHERE profileid = '${profileid}';
+  SQL
+}
+deleteNotes(){
+  # Deleting all user's notes from postgres database
+  local id="$1"
+  psql $CMD_DB_URL <<-SQL
+  DELETE FROM "Notes" where "ownerId" = '${id}';
+  SQL
+}
+deleteFiles(){
+  # Deleting all user's uploads from location /home/hackmd/app/public/uploads
+  local id="$1"
+  # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
+  find /home/hackmd/app/public/uploads -type f -name "upload_${id}_*" -delete; 2>&1
+}
 
-res=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
+allusers=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
 while IFS=' ' read -r word; do
+  # Extracting the username (removing LDAP- prefix)
   uid=$(echo $word | cut -d '-' -f2)
-  search=$(echo $CMD_LDAP_SEARCHFILTER | sed "s#{{username}}#${uid}#")
+  # Creating the ldap search query
+  query=$(echo $CMD_LDAP_SEARCHFILTER | sed "s#{{username}}#${uid}#")
+  # Check if the user exists in the ldap as active user
   if isActive; then
-    echo "The account is active"
+    echo "The account $uid  is active"
   else
-    echo "The account must be destroyed"
-    /home/hackmd/app/bin/manage_users --del $uid
-    /home/hackmd/app/bin/manage_users --delOrphan $uid
+    echo "The account $uid must be destroyed"
+    echo "Beggining destruction..."
+
   fi
-done <<< "$res"
+done <<< "$allusers"
diff --git a/deployments/Cronjob b/deployments/Cronjob
index e92ef39c51..33f70cc85d 100644
--- a/deployments/Cronjob
+++ b/deployments/Cronjob
@@ -1,2 +1,2 @@
-* * * * * /home/hackmd/app/bin/checkusers.sh >> /var/log/cron.log 2>&1
+0 23 * * * /home/hackmd/app/bin/checkusers.sh >> /var/log/cron.log 2>&1
 
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index b7c7d9f8cb..15ecf34c63 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -18,7 +18,7 @@ RUN set -xe && \
         test docs contribute \
         package-lock.json webpack.prod.js webpack.htmlexport.js webpack.dev.js webpack.common.js \
         config.json.example README.md CONTRIBUTING.md AUTHORS node_modules
-        
+
 FROM $RUNTIME
 USER root
 RUN rm -f /etc/apt/sources.list.d/*.list && \
@@ -31,6 +31,7 @@ RUN rm -f /etc/apt/sources.list.d/*.list && \
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
+RUN env > /etc/environment
 RUN crontab /etc/cron.d/checkusers
 RUN cron
 USER hackmd
diff --git a/lib/user/index.js b/lib/user/index.js
index 9cc5a2d463..b882a6a33a 100644
--- a/lib/user/index.js
+++ b/lib/user/index.js
@@ -79,21 +79,21 @@ exports.deleteUser = async (req, res) => {//modhere
    let files
    try {
       files = fs.readdirSync(uploadDir)
+      const filesToDelete = files.filter(file => {
+          return file.includes(`_${req.user.id}_`,filesToDelete)
+      })
+      filesToDelete.forEach(file => {
+          const filePath = path.join(uploadDir, file)
+          try {
+              fs.unlinkSync(filePath)
+              console.log(`Deleted file: `, filePath)
+          } catch (e) {
+              console.log(`Error Deleting file: `,e)
+          }
+      });
    } catch (e) {
       console.log(`Error reading directory:`,e)
    }
-   const filesToDelete = files.filter(file => {
-      return file.includes(`_${req.user.id}_`,filesToDelete)
-   })
-   filesToDelete.forEach(file => {
-      const filePath = path.join(uploadDir, file)
-      try {
-          fs.unlinkSync(filePath)
-          console.log(`Deleted file: `, filePath)
-      } catch (e) {
-          console.log(`Error Deleting file: `,e)
-      }
-   });
   return res.redirect(config.serverURL + '/')
 }
 

From d0cb587c1c797dad9072387cf740af3e20df6bfd Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 22:00:11 +0200
Subject: [PATCH 34/47] moved user to pass env

---
 deployments/Dockerfile           | 5 +++--
 deployments/docker-entrypoint.sh | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 15ecf34c63..008349c33d 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -31,13 +31,14 @@ RUN rm -f /etc/apt/sources.list.d/*.list && \
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
-RUN env > /etc/environment
+#RUN env > /etc/environment
 RUN crontab /etc/cron.d/checkusers
-RUN cron
+#RUN cron
 USER hackmd
 ENV QT_QPA_PLATFORM=offscreen
 WORKDIR /home/hackmd/app
 COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
 RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
 EXPOSE 3000
+USER root
 ENTRYPOINT ["/home/hackmd/app/docker-entrypoint.sh"]
diff --git a/deployments/docker-entrypoint.sh b/deployments/docker-entrypoint.sh
index 0016eaf843..a554e4aa38 100755
--- a/deployments/docker-entrypoint.sh
+++ b/deployments/docker-entrypoint.sh
@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
+env > /etc/environment
+
+cron
+
+su - hackmd
+
 set -euo pipefail
 
 if [[ "$#" -gt 0 ]]; then

From b673d286bf3b8e6cc6b6ef1dd3dc93b5b94bf02e Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 22:37:37 +0200
Subject: [PATCH 35/47] probably the final version

---
 bin/checkusers.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index 90df30f7c7..e20f9a2078 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -12,16 +12,16 @@ isActive() {
 deleteUser(){
   # Deleting users from postgres database
   local profileid="$1"
-  psql $CMD_DB_URL <<-SQL
-  DELETE FROM "Users" WHERE profileid = '${profileid}';
-  SQL
+psql $CMD_DB_URL <<-SQL
+DELETE FROM "Users" WHERE profileid = '${profileid}';
+SQL
 }
 deleteNotes(){
   # Deleting all user's notes from postgres database
   local id="$1"
-  psql $CMD_DB_URL <<-SQL
-  DELETE FROM "Notes" where "ownerId" = '${id}';
-  SQL
+psql $CMD_DB_URL <<-SQL
+DELETE FROM "Notes" where "ownerId" = '${id}';
+SQL
 }
 deleteFiles(){
   # Deleting all user's uploads from location /home/hackmd/app/public/uploads
@@ -31,17 +31,24 @@ deleteFiles(){
 }
 
 allusers=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
-while IFS=' ' read -r word; do
+while IFS=' ' read -r username; do
   # Extracting the username (removing LDAP- prefix)
-  uid=$(echo $word | cut -d '-' -f2)
+  uid=$(echo $username | cut -d '-' -f2)
   # Creating the ldap search query
   query=$(echo $CMD_LDAP_SEARCHFILTER | sed "s#{{username}}#${uid}#")
+id=$(psql $CMD_DB_URL -t -A <<-SQL
+SELECT id FROM "Users" WHERE profileid = '${username}';
+SQL
+)
   # Check if the user exists in the ldap as active user
   if isActive; then
     echo "The account $uid  is active"
   else
     echo "The account $uid must be destroyed"
     echo "Beggining destruction..."
+    deleteUser $username
+    deleteNotes $id
+    deleteFiles $id
 
   fi
 done <<< "$allusers"

From f02ba95b3fcd035ec143e6ad55bafd38ca717a16 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 19 Mar 2025 23:00:09 +0200
Subject: [PATCH 36/47] version 1.1.0 -- added date for script

---
 bin/checkusers.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index e20f9a2078..87c5770ba1 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -29,8 +29,13 @@ deleteFiles(){
   # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
   find /home/hackmd/app/public/uploads -type f -name "upload_${id}_*" -delete; 2>&1
 }
-
+# Write down the date-time
+date
 allusers=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
+if [ -z "$allusers" ]; then
+    echo "Ha Ha nothing to delete"
+    exit
+fi
 while IFS=' ' read -r username; do
   # Extracting the username (removing LDAP- prefix)
   uid=$(echo $username | cut -d '-' -f2)

From 6b1b6abd3d6065c71575d24d9466c0d37e170b7f Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 2 Apr 2025 10:45:08 +0300
Subject: [PATCH 37/47] checkusers.sh error fix

---
 bin/checkusers.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index 87c5770ba1..d79fbc3485 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -3,7 +3,13 @@
 # It is vital to have RUN env > /etc/environment in Dockerfile so that
 # cronjob can have access to env variables from docker
 isActive() {
-  if ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query | grep -q -e "^uid:"; then
+  if ldapres=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query 2>/dev/null); then
+    echo "Ldap is UP. Continue..."
+  else
+    echo "Ldap is DOWN. Exiting..."
+    exit 1
+  fi
+  if echo "$ldapres" | grep -q -e "^uid:"; then
     return 0
   else
     return 1

From e3f26d2248be7bdca9393a7c30eb36263206ec18 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Sun, 6 Apr 2025 18:31:03 +0300
Subject: [PATCH 38/47] fixed export pdf problems and container user

---
 bin/checkusers.sh                | 5 ++---
 deployments/Dockerfile           | 2 +-
 deployments/docker-entrypoint.sh | 8 ++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index d79fbc3485..9ac77c1645 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -2,10 +2,9 @@
 # The script uses Cronjob to run once a day to check for expired users
 # It is vital to have RUN env > /etc/environment in Dockerfile so that
 # cronjob can have access to env variables from docker
+. /home/hackmd/cron.env
 isActive() {
-  if ldapres=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query 2>/dev/null); then
-    echo "Ldap is UP. Continue..."
-  else
+  if ! ldapres=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query 2>/dev/null); then
     echo "Ldap is DOWN. Exiting..."
     exit 1
   fi
diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 008349c33d..e2ea8d017c 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -31,6 +31,7 @@ RUN rm -f /etc/apt/sources.list.d/*.list && \
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers
 RUN chmod +x /etc/cron.d/checkusers
 RUN touch /var/log/cron.log
+RUN chmod u+s /usr/sbin/cron
 #RUN env > /etc/environment
 RUN crontab /etc/cron.d/checkusers
 #RUN cron
@@ -40,5 +41,4 @@ WORKDIR /home/hackmd/app
 COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
 RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
 EXPOSE 3000
-USER root
 ENTRYPOINT ["/home/hackmd/app/docker-entrypoint.sh"]
diff --git a/deployments/docker-entrypoint.sh b/deployments/docker-entrypoint.sh
index a554e4aa38..86549c72f6 100755
--- a/deployments/docker-entrypoint.sh
+++ b/deployments/docker-entrypoint.sh
@@ -1,18 +1,14 @@
 #!/usr/bin/env bash
 
-env > /etc/environment
-
 cron
-
-su - hackmd
-
 set -euo pipefail
 
 if [[ "$#" -gt 0 ]]; then
     exec "$@"
     exit $?
 fi
-
+# We pass the values to file so that cron script can use them
+env | sed "s/=\(.*\)/='\1'/" > /home/hackmd/cron.env
 # check database and redis is ready
 pcheck -env CMD_DB_URL
 

From 237967c17f9724cce9562ff190a3adcd49c60ee0 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Sun, 6 Apr 2025 20:29:54 +0300
Subject: [PATCH 39/47] Update Dockerfile -- port

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index e2ea8d017c..61dc3d01c2 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -40,5 +40,5 @@ ENV QT_QPA_PLATFORM=offscreen
 WORKDIR /home/hackmd/app
 COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
 RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
-EXPOSE 3000
+EXPOSE 443
 ENTRYPOINT ["/home/hackmd/app/docker-entrypoint.sh"]

From 907fdcd25373d3dbddafbf4823284bead102da95 Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Sun, 6 Apr 2025 20:55:30 +0300
Subject: [PATCH 40/47] Update Dockerfile

---
 deployments/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 61dc3d01c2..088c435e21 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -40,5 +40,5 @@ ENV QT_QPA_PLATFORM=offscreen
 WORKDIR /home/hackmd/app
 COPY --chown=1500:1500 --from=BUILD /home/hackmd/app .
 RUN npm install --production && npm cache clean --force && rm -rf /tmp/{core-js-banners,phantomjs}
-EXPOSE 443
+EXPOSE 80
 ENTRYPOINT ["/home/hackmd/app/docker-entrypoint.sh"]

From 91a862291751954998707e05f96cc6a2c390eb4f Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Sun, 6 Apr 2025 21:22:38 +0300
Subject: [PATCH 41/47] fixed pandoc export docx with filesystem images

---
 lib/imageRouter/filesystem.js | 4 ++--
 lib/note/noteActions.js       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/imageRouter/filesystem.js b/lib/imageRouter/filesystem.js
index 262f18837f..8653bfceb5 100644
--- a/lib/imageRouter/filesystem.js
+++ b/lib/imageRouter/filesystem.js
@@ -77,9 +77,9 @@ exports.uploadImage = function (req,imagePath, callback) {
 
   let url
   try {
-    url = (new URL(filename, config.serverURL + '/uploads/')).href
+    url = (new URL(filename, 'http://' + config.domain + '/uploads/')).href
   } catch (e) {
-    url = config.serverURL + '/uploads/' + filename
+    url = 'http://' + config.domain + '/uploads/' + filename
   }
 
   callback(null, url)
diff --git a/lib/note/noteActions.js b/lib/note/noteActions.js
index 964f4505d6..184a107fbd 100644
--- a/lib/note/noteActions.js
+++ b/lib/note/noteActions.js
@@ -145,7 +145,7 @@ async function actionPandoc (req, res, note) {
   try {
     // TODO: timeout rejection
     await pandoc.convertToFile(content, 'markdown', exportType, path, [
-      '--metadata', `title=${title}`, '--sandbox'
+      '--metadata', `title=${title}` //, '--sandbox'
     ])
 
     var stream = fs.createReadStream(path)

From 9e117c066bf01428d739549483dd26172977f54f Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Wed, 9 Apr 2025 13:01:10 +0300
Subject: [PATCH 42/47] Modified checkusers.sh to move expired users' data to
 trash

---
 bin/checkusers.sh | 49 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index 9ac77c1645..655c2d0416 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -3,6 +3,8 @@
 # It is vital to have RUN env > /etc/environment in Dockerfile so that
 # cronjob can have access to env variables from docker
 . /home/hackmd/cron.env
+UPLOADS_DIR="/home/hackmd/app/public/uploads"
+TRASH_DIR="/home/hackmd/trash"
 isActive() {
   if ! ldapres=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query 2>/dev/null); then
     echo "Ldap is DOWN. Exiting..."
@@ -22,20 +24,48 @@ DELETE FROM "Users" WHERE profileid = '${profileid}';
 SQL
 }
 deleteNotes(){
-  # Deleting all user's notes from postgres database
-  local id="$1"
+  # Deleting all user's notes from postgres database and moving them to
+  # trash can
+shortids=$(psql $CMD_DB_URL -At<<-SQL
+SELECT shortid FROM "Notes" where "ownerId" = '${id}';
+SQL
+)
+while IFS=' ' read shortid; do
+title=$(psql $CMD_DB_URL -At<<-SQL
+SELECT content FROM "Notes" where shortid = '${shortid}';
+SQL
+)
+  safe_title=$(echo "$title" | tr -cd '[:alnum:]._-')
+  filename="${USER_TRASH_DIR}/${safe_title}.md"
+
+content=$(psql $CMD_DB_URL -At<<-SQL
+SELECT content FROM "Notes" WHERE shortid = '${shortid}';
+SQL
+)
+
+echo "$content" > "$filename"
+done<<<"$shortids"
+
 psql $CMD_DB_URL <<-SQL
 DELETE FROM "Notes" where "ownerId" = '${id}';
 SQL
 }
 deleteFiles(){
   # Deleting all user's uploads from location /home/hackmd/app/public/uploads
-  local id="$1"
   # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
-  find /home/hackmd/app/public/uploads -type f -name "upload_${id}_*" -delete; 2>&1
+  find $UPLOADS_DIR -type f -name "upload_${id}_*" -exec mv {} "$USER_TRASH_DIR" \; 2>&1
+}
+actuallyDeleteFiles(){
+  # Deleting all user's uploads from location /home/hackmd/app/public/uploads
+  # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
+
+  echo "Removing old trash files"
+  find $TRASH_DIR -mindepth 1 -maxdepth 1 -type d -mtime +90 -exec rm -rf {} \; 2>&1
 }
 # Write down the date-time
 date
+# Removing old trash files
+actuallyDeleteFiles
 allusers=$(psql $CMD_DB_URL -t -c 'SELECT profileid FROM "Users";')
 if [ -z "$allusers" ]; then
     echo "Ha Ha nothing to delete"
@@ -55,10 +85,15 @@ SQL
     echo "The account $uid  is active"
   else
     echo "The account $uid must be destroyed"
-    echo "Beggining destruction..."
+    # This will be the user specific trash can
+    USER_TRASH_DIR=${TRASH_DIR}/${uid}
+    echo "Moving to Trash ${USER_TRASH_DIR}..."
+    mkdir -p $USER_TRASH_DIR
+    # These functions move uploads and notes to trash can
+    # and delete them permanently after 90 days
     deleteUser $username
-    deleteNotes $id
-    deleteFiles $id
+    deleteNotes
+    deleteFiles
 
   fi
 done <<< "$allusers"

From 4eae82512d9e8aa9acb498ffacfed4f4e4f06012 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Tue, 29 Apr 2025 13:15:15 +0300
Subject: [PATCH 43/47] new workflow

---
 .github/workflows/push-k8s-image.yml | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/push-k8s-image.yml

diff --git a/.github/workflows/push-k8s-image.yml b/.github/workflows/push-k8s-image.yml
new file mode 100644
index 0000000000..40d0c597f4
--- /dev/null
+++ b/.github/workflows/push-k8s-image.yml
@@ -0,0 +1,58 @@
+name: Build and Push k8s Image
+
+on:
+  workflow_dispatch:
+    inputs:
+      runtime:
+        description: 'Runtime image'
+        required: true
+        default: 'hackmdio/runtime:16.20.2-35fe7e39'
+      buildpack:
+        description: 'Buildpack image'
+        required: true
+        default: 'hackmdio/buildpack:16.20.2-35fe7e39'
+  push:
+    tags:
+      - '*'
+    branches:
+      - k8s
+
+env:
+  REGISTRY_IMAGE: demo-images/codimd
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.NEXUS_USERNAME }}
+          password: ${{ secrets.NEXUS_PASSWORD }}
+          registry: ${{ secrets.NEXUS_REGISTRY }}
+
+      - name: Determine tag
+        id: tag
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            echo "IMAGETAG=k8s-${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          else
+            echo "IMAGETAG=k8s-latest" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: deployments/Dockerfile
+          push: true
+          tags: ${{ secrets.NEXUS_REGISTRY }}/${{ env.REGISTRY_IMAGE }}:${{ steps.tag.outputs.IMAGETAG }}
+          build-args: |
+            RUNTIME=${{ github.event.inputs.runtime || 'hackmdio/runtime:16.20.2-35fe7e39' }}
+            BUILDPACK=${{ github.event.inputs.buildpack || 'hackmdio/buildpack:16.20.2-35fe7e39' }}

From 521aafff9b79b0bbf8a4189221c57c6d687b9cdc Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Tue, 6 May 2025 10:19:35 +0300
Subject: [PATCH 44/47] mermaid update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index da2a000d28..18ca365458 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,7 @@
     "markdownlint-rule-helpers": "^0.13.0",
     "markmap-lib": "^0.9.3",
     "mathjax": "~2.7.5",
-    "mermaid": "~8.10.2",
+    "mermaid": "^10.4.0",
     "mini-css-extract-plugin": "~0.4.1",
     "mocha": "~5.2.0",
     "mock-require": "~3.0.3",

From a93efc9ba87e5b7a737f3e27e5ed48957f057d6a Mon Sep 17 00:00:00 2001
From: lampros <76473514+lamprosfasoulas@users.noreply.github.com>
Date: Tue, 6 May 2025 12:03:21 +0300
Subject: [PATCH 45/47] Update push-k8s-image.yml

---
 .github/workflows/push-k8s-image.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push-k8s-image.yml b/.github/workflows/push-k8s-image.yml
index 40d0c597f4..6706096da2 100644
--- a/.github/workflows/push-k8s-image.yml
+++ b/.github/workflows/push-k8s-image.yml
@@ -11,21 +11,21 @@ on:
         description: 'Buildpack image'
         required: true
         default: 'hackmdio/buildpack:16.20.2-35fe7e39'
-  push:
-    tags:
-      - '*'
-    branches:
-      - k8s
+  release:
+    types: [published]
 
 env:
   REGISTRY_IMAGE: demo-images/codimd
 jobs:
   build-and-push:
+    if: startsWith(github.event.release.tag_name, 'k8s-v')
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout source
         uses: actions/checkout@v3
+        with:
+          ref: k8s
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

From b2d6ea7bf4372caed8a9a585216b35415ab2d222 Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Fri, 6 Feb 2026 16:05:54 +0200
Subject: [PATCH 46/47] fix error where during user deletion script tries to
 creat filename with note's content, changed to shortid

---
 bin/checkusers.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/checkusers.sh b/bin/checkusers.sh
index 655c2d0416..b159c3050d 100755
--- a/bin/checkusers.sh
+++ b/bin/checkusers.sh
@@ -5,6 +5,7 @@
 . /home/hackmd/cron.env
 UPLOADS_DIR="/home/hackmd/app/public/uploads"
 TRASH_DIR="/home/hackmd/trash"
+
 isActive() {
   if ! ldapres=$(ldapsearch -x -H $CMD_LDAP_URL -D "$CMD_LDAP_BINDDN" -w $CMD_LDAP_BINDCREDENTIALS -b $CMD_LDAP_SEARCHBASE $query 2>/dev/null); then
     echo "Ldap is DOWN. Exiting..."
@@ -16,6 +17,7 @@ isActive() {
     return 1
   fi
 }
+
 deleteUser(){
   # Deleting users from postgres database
   local profileid="$1"
@@ -23,6 +25,7 @@ psql $CMD_DB_URL <<-SQL
 DELETE FROM "Users" WHERE profileid = '${profileid}';
 SQL
 }
+
 deleteNotes(){
   # Deleting all user's notes from postgres database and moving them to
   # trash can
@@ -32,11 +35,11 @@ SQL
 )
 while IFS=' ' read shortid; do
 title=$(psql $CMD_DB_URL -At<<-SQL
-SELECT content FROM "Notes" where shortid = '${shortid}';
+SELECT title FROM "Notes" where shortid = '${shortid}';
 SQL
 )
-  safe_title=$(echo "$title" | tr -cd '[:alnum:]._-')
-  filename="${USER_TRASH_DIR}/${safe_title}.md"
+safe_title=$(echo "$title" | tr -cd '[:alnum:]._-')
+filename="${USER_TRASH_DIR}/${safe_title}.md"
 
 content=$(psql $CMD_DB_URL -At<<-SQL
 SELECT content FROM "Notes" WHERE shortid = '${shortid}';
@@ -50,11 +53,13 @@ psql $CMD_DB_URL <<-SQL
 DELETE FROM "Notes" where "ownerId" = '${id}';
 SQL
 }
+
 deleteFiles(){
   # Deleting all user's uploads from location /home/hackmd/app/public/uploads
   # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
   find $UPLOADS_DIR -type f -name "upload_${id}_*" -exec mv {} "$USER_TRASH_DIR" \; 2>&1
 }
+
 actuallyDeleteFiles(){
   # Deleting all user's uploads from location /home/hackmd/app/public/uploads
   # The files are saved as upload_{user.id}_{random letters}.{jpg,png,...}
@@ -62,6 +67,7 @@ actuallyDeleteFiles(){
   echo "Removing old trash files"
   find $TRASH_DIR -mindepth 1 -maxdepth 1 -type d -mtime +90 -exec rm -rf {} \; 2>&1
 }
+
 # Write down the date-time
 date
 # Removing old trash files

From e4e0da39acd9131cb5a599419666da92fae88cef Mon Sep 17 00:00:00 2001
From: Lampros Fasoulas <lamprosfasoulas@gmail.com>
Date: Mon, 9 Feb 2026 14:01:23 +0200
Subject: [PATCH 47/47] update dockerfile

---
 deployments/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployments/Dockerfile b/deployments/Dockerfile
index 088c435e21..173fea74f6 100644
--- a/deployments/Dockerfile
+++ b/deployments/Dockerfile
@@ -21,11 +21,11 @@ RUN set -xe && \
 
 FROM $RUNTIME
 USER root
-RUN rm -f /etc/apt/sources.list.d/*.list && \
-    echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list && \
-    echo "deb http://deb.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \
-    echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \
-    apt-get update && \
+# RUN rm -f /etc/apt/sources.list.d/*.list && \
+#     echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list && \
+#     echo "deb http://deb.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \
+#     echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \
+RUN apt-get update && \
     apt-get install -y --no-install-recommends cron ldap-utils && \
     rm -rf /var/lib/apt/lists/*
 COPY --from=BUILD /home/hackmd/app/deployments/Cronjob /etc/cron.d/checkusers