Merge pull request #49 from avail/avail-patch-1

[uguu.git] / README.md

diff --git a/README.md b/README.md
index caeb92574c03a1ea25f6297cf152820b09da46f2..cb3f58f87c0f467f1188deec76d8b9230b8f70c3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,10 +2,13 @@
 [Uguu.se](http://uguu.se) source code, stores files and deletes after X amount of time.
 
 # Tested with:
-* Nginx+PHP5-FPM (PHP 5.4) on Debian 7 Wheezy
 * Apache (PHP 5.4) on Ubuntu 14.04 LTS
 * Apache (PHP 5.6) on Debian 8 Jessie
+* Apache (PHP 5.6.33 (remi-php56)) on CentOS 6.9
+* Nginx+PHP5-FPM (PHP 5.4) on Debian 7 Wheezy
 * Nginx+PHP5-FPM (PHP 5.6) on Debian 8 Jessie
+* Nginx+PHP7-FPM (PHP 7.0) on Debian 9 Stretch
+* [Caddy](https://caddyserver.com/) + php7.0-fpm on Ubuntu 16.04.4 LTS
 
 # Install:
 
@@ -13,10 +16,10 @@
 * Modify includes/config.php (copy config.template.php as a starting point) to set up the main options for Uguu.
 * Some file extensions are blocked by default, this can be changed via includes/config.php's CONFIG_BLOCKED_EXTENSIONS value.
 * Copy `rain/template/footer.template.html` as `rain/template/footer.html` and personalize the footer as you wish
-* Execute check.sh regularly with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * bash /path/to/check.sh` (or adapt if you know how cron works).
+* Execute check.sh regularly with cron to delete old files: `crontab -e` and add `0,15,30,45 * * * * cd /path/to/uguu/includes && bash check.sh` (or adapt if you know how cron works).
 * Make the Uguu/public/files and Uguu/rain/cache directory modifiable by the web server user:
 `chown -R www-data:www-data /path/to/Uguu/public/files` and `chown -R www-data:www-data /path/to/Uguu/rain/cache`
-* Make sure the Uguu/public/files folder is not indexable, you may use a virtual host config similar to this one:
+* Make sure the Uguu/public/files folder is not indexable, you may use a virtual host config similar to this one using Apache:
 
 ```
 <VirtualHost *:80>
@@ -41,7 +44,7 @@
 </VirtualHost>
 ```
 
-Or something like this using Nginx:
+Or something like this using Nginx+PHP-FPM:
 
 uguu.se
 ```
@@ -53,8 +56,6 @@ server{
     autoindex           off;
     index                       index.html index.php;
 
-return 301 https://$host$request_uri;
-
     location ~* \.php$ {
         fastcgi_pass unix:/var/run/php5-fpm.sock;
         fastcgi_intercept_errors on;
@@ -82,8 +83,6 @@ server{
     autoindex       off;
     index           index.html;
 
-return 301 https://$host$request_uri;
-
         error_page      404 /404.html;
         error_page      403 /404.html;
         location /404.html {
@@ -92,6 +91,18 @@ return 301 https://$host$request_uri;
 }
 ```
 
+Or something like this for usage with caddy:
+```
+uguu.se {
+    fastcgi / /var/run/php/php7.0-fpm.sock php
+    root /home/neku/www
+}
+
+a.uguu.se {
+    root /home/neku/www/files
+}
+```
+
 
 # Using the API