From c86c5329b6e744850457cb3418b062b2d5553792 Mon Sep 17 00:00:00 2001
From: Mayel <git@mayel.space>
Date: Wed, 14 Jul 2021 13:57:41 +0200
Subject: [PATCH] another attempt

---
 README.md  | 2 +-
 abra.sh    | 2 +-
 nginx.conf | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 51f10a8..0819834 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Coöp Cloud + [PHP](https://php.org) + MariaDB + Nginx = 🥳
 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app YOURAPPDOMAIN deploy`
-6. Copy your site files using something like: `abra app YOURAPPDOMAIN cp index.html app:/var/www/html/`
+6. Copy your site files using something like: `abra app YOURAPPDOMAIN cp index.html app:/var/www/html/` or if you want to copy an entire directory: `tar cf - ./mysite | abra app YOURAPPDOMAIN cp - app:/var/www/html/`
 6. Use [restore functionality](https://docs.coopcloud.tech/backup-restore/) to import a SQL file into the db
 6. Open the configured domain in your browser to check all is good
 
diff --git a/abra.sh b/abra.sh
index 4c985ff..0e32a3a 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,8 +1,8 @@
+export NGINX_DEFAULT_CONF_VERSION=v3
 export PHP_UPLOADS_CONF_VERSION=v3
 export ENTRYPOINT_CONF_VERSION=v2
 export ENTRYPOINT_MAILRELAY_CONF_VERSION=v1
 export MSMTP_CONF_VERSION=v3
-export NGINX_DEFAULT_CONF_VERSION=v1
 
 abra_backup_app() {
   _abra_backup_dir "app:/var/www/html/"
diff --git a/nginx.conf b/nginx.conf
index 4f7b9a1..20cd333 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -9,8 +9,9 @@ server {
 
     location / {
         root   /var/www/html;
-        index  index.html index.htm;
-	    try_files $uri $uri/ $uri.html;
+        index  index.html index.htm index.php;
+        gzip_static on;
+	    try_files $uri $uri/ $uri.html $uri.php index.php?$query_string /index.php?$query_string;
     }
 
     #error_page  404              /404.html;
@@ -31,8 +32,7 @@ server {
     # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
     #
     location ~ \.php$ {
-        try_files $uri = 404;
-        #root           html;
+        try_files $uri =404;
         fastcgi_pass   app:9000;
         fastcgi_index  index.php;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;