From c5e39d6ecf1979afbac67a12a90757ab6c8bf82a Mon Sep 17 00:00:00 2001
From: Dym Sohin <re@dym.sh>
Date: Tue, 23 Apr 2024 14:30:47 +0200
Subject: [PATCH] forgejo indexing fix

---
 _install.sh          |  1 +
 _installs/forgejo.sh |  7 +++---
 _installs/penpot.sh  | 10 +++++++-
 nginx/dym.sh.conf    | 55 --------------------------------------------
 4 files changed, 13 insertions(+), 60 deletions(-)
 delete mode 100644 nginx/dym.sh.conf

diff --git a/_install.sh b/_install.sh
index a60571e..038ce50 100755
--- a/_install.sh
+++ b/_install.sh
@@ -29,6 +29,7 @@ apt-get install -y \
   rdfind \
   sshfs \
   ufw \
+  unzip \
   wget \
   zsh
 
diff --git a/_installs/forgejo.sh b/_installs/forgejo.sh
index b5f2821..bd142a1 100755
--- a/_installs/forgejo.sh
+++ b/_installs/forgejo.sh
@@ -3,15 +3,13 @@
 apt-get install -y \
   git git-lfs
 
-VER='1.20.4-1'
+VER='1.21.5-0'
 
 wget  "https://codeberg.org/forgejo/forgejo/releases/download/v$VER/forgejo-$VER-linux-amd64.xz"
 xz -d  "forgejo-$VER-linux-amd64.xz"
 
 gpg --keyserver keys.openpgp.org \
     --recv EB114F5E6C0DC2BCDD183550A4B61A2DC5923710
-wget  "https://codeberg.org/forgejo/forgejo/releases/download/v$VER/forgejo-$VER-linux-amd64.asc"
-gpg --verify  "forgejo-$VER-linux-amd64.asc forgejo-$VER-linux-amd64"
 
 chmod +x  "forgejo-$VER-linux-amd64"
 mv  "forgejo-$VER-linux-amd64" \
@@ -51,9 +49,10 @@ chown root:git -R /etc/forgejo \
 chown root:git /usr/local/bin/custom/conf/app.ini \
   && chmod 770 /usr/local/bin/custom/conf/app.ini
 
+chown -R git:git  /usr/local/bin/data/indexers/issues.bleve
 
 # test with `su - git -c 'forgejo'`
-
+# deploy with `nohup forgejo >/dev/null 2>&1 &`
 
 wget -O \
   /etc/systemd/system/forgejo.service \
diff --git a/_installs/penpot.sh b/_installs/penpot.sh
index c347c0f..cd39b8e 100755
--- a/_installs/penpot.sh
+++ b/_installs/penpot.sh
@@ -5,7 +5,15 @@ cd /Forks/penpot/
 
 wget https://raw.githubusercontent.com/penpot/penpot/main/docker/images/docker-compose.yaml
 
-docker-compose \
+docker compose \
+	-p penpot \
+	-f docker-compose.yaml \
+	up -d
+
+
+# upd after editing yaml
+docker compose down
+docker compose \
 	-p penpot \
 	-f docker-compose.yaml \
 	up -d
diff --git a/nginx/dym.sh.conf b/nginx/dym.sh.conf
deleted file mode 100644
index df00d13..0000000
--- a/nginx/dym.sh.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-server {
-  server_name  dym.sh;
-  listen       80;
-  listen       [::]:80;
-
-  location ~ /\.well-known/acme-challenge {
-    root       /var/lib/letsencrypt/;
-  }
-  location / {
-    add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always;
-    return     301 https://$server_name$request_uri;
-  }
-}
-
-server {
-  server_name dym.sh;
-  listen                    443 ssl http2;
-  listen                    [::]:443 ssl http2;
-
-  ssl_trusted_certificate   /etc/letsencrypt/live/dym.sh/chain.pem;
-  ssl_certificate           /etc/letsencrypt/live/dym.sh/fullchain.pem;
-  ssl_certificate_key       /etc/letsencrypt/live/dym.sh/privkey.pem;
-
-
-  location ~* ^\/(rss\/|feed\.xml|feed\.rss)$ {
-    add_header Strict-Transport-Security "max-age=15768000; includeSubDomains" always;
-    return     301 https://$server_name/rss;
-  }
-
-  location ~* \/\.?rss$ {
-    types { } default_type "application/rss+xml; charset=utf-8";
-    root       /var/www/dym.sh/;
-  }
-
-  location / {
-    root       /var/www/dym.sh/;
-    try_files
-      $uri
-      $uri/
-      @gts;
-  }
-
-  client_max_body_size 2000M;
-  proxy_pass_request_headers on;
-
-  location @gts {
-    proxy_pass http://127.0.0.1:10099;
-    proxy_set_header Host $host;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Proto $scheme;
-  }
-
-}