diff --git a/config/apache/app.sixfold.org.conf b/config/apache/app.sixfold.org.conf index b09fe7c..9d79634 100644 --- a/config/apache/app.sixfold.org.conf +++ b/config/apache/app.sixfold.org.conf @@ -6,7 +6,7 @@ ServerName app.sixfold.org ServerAdmin sixfold@sixfold.org - DocumentRoot /var/www/html/app.sixfold.org/www + DocumentRoot /srv/app.sixfold.org/www ErrorLog ${APACHE_LOG_DIR}/app.sixfold.org-error.log CustomLog ${APACHE_LOG_DIR}/app.sixfold.org-access.log combined @@ -14,6 +14,17 @@ ErrorDocument 404 /errors/404 ErrorDocument 503 /errors/503 + + # Disable .htaccess files + AllowOverride none + + # Disable unneeded options + Options none + + # Allow access to www/ + Require all granted + + RewriteEngine On @@ -44,7 +55,7 @@ RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME}/index.php -f RewriteRule (.*) $1/index.php - + # Remove trailing slashes RewriteRule ^/(.+?)/$ /$1 [R=301,L] diff --git a/config/php/fpm/app.sixfold.org.ini b/config/php/fpm/app.sixfold.org.ini index 3cebfc7..92c0fe9 100644 --- a/config/php/fpm/app.sixfold.org.ini +++ b/config/php/fpm/app.sixfold.org.ini @@ -13,7 +13,7 @@ expose_php = Off post_max_size = 10M upload_max_filesize = 6M -include_path = /var/www/html/app.sixfold.org/lib +include_path = /srv/app.sixfold.org/lib auto_prepend_file = config.php [session]