Apache multiviews disabled due to bad nfs performance

This commit is contained in:
Juan 2018-05-04 22:46:09 +02:00
parent e344f6ac34
commit bbf691764c
6 changed files with 24 additions and 12 deletions

View File

@ -16,13 +16,26 @@
<FilesMatch "\.(ttf|otf|eot|woff)$"> <FilesMatch "\.(ttf|otf|eot|woff)$">
<IfModule mod_headers.c> <IfModule mod_headers.c>
Header set Access-Control-Allow-Origin "*" Header set Access-Control-Allow-Origin "*"
</IfModule> </IfModule>
</FilesMatch> </FilesMatch>
</Directory> </Directory>
<Directory /var/lib/hedera-web/image-db/> <Directory /var/lib/hedera-web/image-db/>
Options Indexes FollowSymLinks MultiViews Options +Indexes +FollowSymLinks
AllowOverride FileInfo Options
Require all granted Require all granted
</Directory> </Directory>
<Directory /var/lib/hedera-web/image-db/*/*>
Options -Indexes -MultiViews +FollowSymLinks
AllowOverride FileInfo Options
Require all granted
<IfModule mod_headers.c>
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}\.png -f
RewriteRule ^(.+)$ %{REQUEST_URI}.png [L]
</IfModule>
</Directory>

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.405.87) stable; urgency=low hedera-web (1.405.88) stable; urgency=low
* Initial Release. * Initial Release.

View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "1.405.87", "version": "1.405.88",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

View File

@ -10,7 +10,7 @@ require_once (__DIR__.'/lib.php');
* @param integer $maxHeight The maximum height of resized image in pixels * @param integer $maxHeight The maximum height of resized image in pixels
* @param integer $maxWidth The maximum width of resized image in pixels * @param integer $maxWidth The maximum width of resized image in pixels
* @param boolean $rewrite Wether to rewrite the destination file if it exits * @param boolean $rewrite Wether to rewrite the destination file if it exits
**/ */
class Resize extends Vn\Lib\Method class Resize extends Vn\Lib\Method
{ {
const PARAMS = [ const PARAMS = [
@ -25,7 +25,6 @@ class Resize extends Vn\Lib\Method
function run () function run ()
{ {
$options = getopt ('', $params); $options = getopt ('', $params);
if (!$this->checkParams ($options, self::PARAMS)) if (!$this->checkParams ($options, self::PARAMS))

View File

@ -18,18 +18,18 @@ class Sync extends Vn\Lib\Method
$this->dataDir = $this->util->dataDir; $this->dataDir = $this->util->dataDir;
} }
function run () function run ($db)
{ {
$db = $this->getSysConn (); $db = $this->getSysConn ();
set_time_limit (0); set_time_limit (0);
$this->$trashSubdir = date ('YmdHis'); $this->trashSubdir = date ('YmdHis');
$checkCount = 0; $checkCount = 0;
$query = 'SELECT DISTINCT `%3$s` FROM `%1$s`.`%2$s` $query = 'SELECT DISTINCT `%3$s` FROM `%1$s`.`%2$s`
WHERE `%3$s` IS NOT NULL AND `%3$s` != \'\''; WHERE `%3$s` IS NOT NULL AND `%3$s` != \'\'';
$dir = opendir ("{$this->dataDir}"); $dir = opendir ($this->dataDir);
if ($dir) if ($dir)
while ($schema = readdir ($dir)) while ($schema = readdir ($dir))

View File

@ -4,7 +4,7 @@ require_once (__DIR__.'/image.php');
/** /**
* Base class for image methods. * Base class for image methods.
**/ */
class Util class Util
{ {
var $app; var $app;
@ -20,7 +20,7 @@ class Util
* Loads information for specified schema. * Loads information for specified schema.
* *
* @param string $schema The schema name * @param string $schema The schema name
**/ */
function loadInfo ($schema) function loadInfo ($schema)
{ {
$db = $this->app->getSysConn (); $db = $this->app->getSysConn ();