poznote: serve from src/public docroot

ct/calibre-web.sh

@@ -32,18 +32,14 @@ function update_script() {
     exit
   fi
 
-  if [[ -f /root/.calibre-web && ! -e /root/.calibreweb ]]; then
-    mv /root/.calibre-web /root/.calibreweb
-  fi
-
-  if check_for_gh_release "calibreweb" "janeczku/calibre-web"; then
+  if check_for_gh_release "Calibre-Web" "janeczku/calibre-web"; then
     msg_info "Stopping Service"
     systemctl stop calibre-web
     msg_ok "Stopped Service"
 
     create_backup /opt/calibre-web/data
 
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "calibreweb" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Calibre-Web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
     setup_uv
 
     msg_info "Installing Dependencies"

ct/poznote.sh

@@ -68,7 +68,7 @@ map \$uri \$poznote_coop {
 
 server {
     listen 8040;
-    root /var/www/html;
+    root /var/www/html/public;
     index index.php index.html;
 
     gzip on;
@@ -144,10 +144,12 @@ server {
     }
 
     location ~ ^/data/users/[0-9]+/backgrounds/ {
+        root /var/www/html;
         try_files \$uri =404;
     }
 
     location ~ ^/data/css/[A-Za-z0-9._-]+\.css$ {
+        root /var/www/html;
         try_files \$uri =404;
     }
 

install/calibre-web-install.sh

@@ -32,7 +32,7 @@ msg_info "Installing Calibre (for eBook conversion)"
 $STD apt install -y calibre
 msg_ok "Installed Calibre"
 
-fetch_and_deploy_gh_release "calibreweb" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
+fetch_and_deploy_gh_release "Calibre-Web" "janeczku/calibre-web" "prebuild" "latest" "/opt/calibre-web" "calibreweb*.tar.gz"
 setup_uv
 
 msg_info "Installing Python Dependencies"

install/poznote-install.sh

@@ -46,7 +46,7 @@ map \$uri \$poznote_coop {
 
 server {
     listen 8040;
-    root /var/www/html;
+    root /var/www/html/public;
     index index.php index.html;
 
     gzip on;
@@ -122,10 +122,12 @@ server {
     }
 
     location ~ ^/data/users/[0-9]+/backgrounds/ {
+        root /var/www/html;
         try_files \$uri =404;
     }
 
     location ~ ^/data/css/[A-Za-z0-9._-]+\.css$ {
+        root /var/www/html;
         try_files \$uri =404;
     }