add internal directories for cache & lockfiles

diff --git a/.gitignore b/.gitignore
index 4f4773fb3403f3ec4097ab7c7b1fdec23b9aa924..f40b2b66fb99f4f6e488ef4b0dd362e83aef4a43 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 config.php
+cache/*/*
+lock/*

diff --git a/cache/.htaccess b/cache/.htaccess
new file mode 100644 (file)
index 0000000..93169e4
--- /dev/null
+++ b/cache/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all

diff --git a/cache/magpie/.empty b/cache/magpie/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/cache/simplepie/.empty b/cache/simplepie/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config.php-dist b/config.php-dist
index 08401133fd1b4ddbb10fec40f09346cd6d9e8d4b..b52414d9f3e333308c634e71e6ef9fe0933d3e68 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -15,7 +15,7 @@
        // longer than 5 seconds to generate.  To prevent failed
        // updates, increase this.
 
-       define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
+       define('MAGPIE_CACHE_DIR', 'cache/magpie');
        // Local cache directory for RSS feeds
 
        define('MAGPIE_CACHE_AGE', 60*30); 
@@ -95,7 +95,7 @@
        // 0 - Magpie
        // 1 - SimplePie
 
-       define('SIMPLEPIE_CACHE_DIR',   '/var/tmp/simplepie-ttrss-cache');
+       define('SIMPLEPIE_CACHE_DIR',   'cache/simplepie');
        // Cache directory for RSS feeds when using SimplePie
 
        define('SIMPLEPIE_CACHE_IMAGES', false);
@@ -134,7 +134,7 @@
        // option can be used to integrate tt-rss with Apache's external
        // authentication modules.
 
-       define('LOCK_DIRECTORY', '.');
+       define('LOCK_DIRECTORY', 'lock');
        // Directory for lockfiles, must be writable to the user you run
        // daemon process or cronjobs under.
 

diff --git a/lock/.empty b/lock/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lock/.htaccess b/lock/.htaccess
new file mode 100644 (file)
index 0000000..93169e4
--- /dev/null
+++ b/lock/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all