From 10b7363b06ba2fd7e14ee256f5e340860102bbd5 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 14 Dec 2022 18:56:48 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20docs=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=81=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BC=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/beta/beta.liberama            | 26 +++++++++++++++-----------
 docs/beta/beta.omnireader          | 26 +++++++++++++++-----------
 docs/beta/beta.omnireader_http     | 26 +++++++++++++++-----------
 docs/liberama.top/liberama         | 26 +++++++++++++++-----------
 docs/omnireader.ru/README.md       | 12 ++++++------
 docs/omnireader.ru/omnireader      | 26 +++++++++++++++-----------
 docs/omnireader.ru/omnireader_http | 26 +++++++++++++++-----------
 7 files changed, 96 insertions(+), 72 deletions(-)

diff --git a/docs/beta/beta.liberama b/docs/beta/beta.liberama
index 9268bb9f..8ec5a830 100644
--- a/docs/beta/beta.liberama
+++ b/docs/beta/beta.liberama
@@ -87,18 +87,22 @@ server {
     proxy_read_timeout 600s;
   }
 
+  location /tmp {
+    root /home/beta.liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/beta.liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/beta.liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/beta.liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;
diff --git a/docs/beta/beta.omnireader b/docs/beta/beta.omnireader
index 81f02114..0eba09ea 100644
--- a/docs/beta/beta.omnireader
+++ b/docs/beta/beta.omnireader
@@ -32,18 +32,22 @@ server {
     proxy_read_timeout 600s;
   }
 
+  location /tmp {
+    root /home/beta.liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/beta.liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/beta.liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/beta.liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;
diff --git a/docs/beta/beta.omnireader_http b/docs/beta/beta.omnireader_http
index df27997b..86ab80dc 100644
--- a/docs/beta/beta.omnireader_http
+++ b/docs/beta/beta.omnireader_http
@@ -27,18 +27,22 @@ server {
     proxy_read_timeout 600s;
   }
 
+  location /tmp {
+    root /home/beta.liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/beta.liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/beta.liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/beta.liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;
diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama
index 06bb276a..dff1aba5 100644
--- a/docs/liberama.top/liberama
+++ b/docs/liberama.top/liberama
@@ -98,18 +98,22 @@ server {
     proxy_read_timeout 600s;
   }
 
+  location /tmp {
+    root /home/liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;
diff --git a/docs/omnireader.ru/README.md b/docs/omnireader.ru/README.md
index e27f92fa..d3144baf 100644
--- a/docs/omnireader.ru/README.md
+++ b/docs/omnireader.ru/README.md
@@ -18,6 +18,7 @@ sudo apt install -y nodejs
 ```
 cd liberama
 npm i
+cd docs/omnireader.ru
 ```
 
 ### create public dir
@@ -30,8 +31,8 @@ sudo chown www-data.www-data /home/liberama
 #### download from https://download.calibre-ebook.com/
 ```
 wget "https://download.calibre-ebook.com/5.29.0/calibre-5.29.0-x86_64.txz"
-sudo -u www-data mkdir -p /home/liberama/data/calibre
-sudo -u www-data tar xvf calibre-5.29.0-x86_64.txz -C /home/liberama/data/calibre
+sudo -u www-data mkdir -p /home/liberama/.liberama/calibre
+sudo -u www-data tar xvf calibre-5.29.0-x86_64.txz -C /home/liberama/.liberama/calibre
 ```
 
 ### external converters
@@ -44,7 +45,7 @@ sudo apt install rar libreoffice poppler-utils djvulibre-bin libtiff-tools graph
 Сначала настроим для HTTP:
 ```
 sudo apt install nginx
-sudo cp docs/omnireader.ru/omnireader_http /etc/nginx/sites-available/omnireader
+sudo cp ./omnireader_http /etc/nginx/sites-available/omnireader
 sudo ln -s /etc/nginx/sites-available/omnireader /etc/nginx/sites-enabled/omnireader
 sudo rm /etc/nginx/sites-enabled/default
 sudo service nginx reload
@@ -55,7 +56,7 @@ sudo chown -R www-data.www-data /var/www
 #### Следовать инструкции установки certbot https://certbot.eff.org/instructions?ws=nginx&os=ubuntu-20
 После установки сертификата, можно использовать конфиг для nginx c ssl:
 ```
-sudo cp docs/omnireader.ru/omnireader /etc/nginx/sites-available/omnireader
+sudo cp ./omnireader /etc/nginx/sites-available/omnireader
 sudo service nginx reload
 
 ```
@@ -68,7 +69,7 @@ sudo service php7.4-fpm restart
 
 sudo mkdir /home/oldreader
 sudo chown www-data.www-data /home/oldreader
-sudo -u www-data cp -r docs/omnireader.ru/old/* /home/oldreader
+sudo -u www-data cp -r ./old/* /home/oldreader
 ```
 
 ## Запуск по крону
@@ -78,7 +79,6 @@ sudo -u www-data cp -r docs/omnireader.ru/old/* /home/oldreader
 
 ## Деплой и запуск
 ```
-cd docs/omnireader.ru
 ./stop_server.sh
 ./deploy.sh
 ./start_server.sh
diff --git a/docs/omnireader.ru/omnireader b/docs/omnireader.ru/omnireader
index aed54fd2..cb1880b4 100644
--- a/docs/omnireader.ru/omnireader
+++ b/docs/omnireader.ru/omnireader
@@ -32,18 +32,22 @@ server {
     proxy_read_timeout 600s;
   }
 
+  location /tmp {
+    root /home/liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;
diff --git a/docs/omnireader.ru/omnireader_http b/docs/omnireader.ru/omnireader_http
index f7db4e73..9076e6da 100644
--- a/docs/omnireader.ru/omnireader_http
+++ b/docs/omnireader.ru/omnireader_http
@@ -26,18 +26,22 @@ server {
     proxy_set_header Connection "upgrade";
   }
 
+  location /tmp {
+    root /home/liberama/.liberama/public-files;
+
+    types { } default_type "application/xml; charset=utf-8";
+    add_header Content-Encoding gzip;
+    try_files $uri @liberama;
+  }
+
+  location /upload {
+    root /home/liberama/.liberama/public-files;
+
+    try_files $uri @liberama;
+  }
+
   location / {
-    root /home/liberama/public;
-
-    location /tmp {
-      types { } default_type "application/xml; charset=utf-8";
-      add_header Content-Encoding gzip;
-      try_files $uri @liberama;
-    }
-
-    location /upload {
-      try_files $uri @liberama;
-    }
+    root /home/liberama/.liberama/public;
 
     location ~* \.(?:manifest|appcache|html)$ {
       expires -1;