Move cache directories to the data folder

Every time an update is pushed the various cache folders are overwritten
as well. Fix this by moving them to the data directory.  The feed-icons
folder is special since it is actually used to provide the icons. So
instead of changing the location of it create a symbolic link.

Author: richq

.openshift/action_hooks/build

@@ -9,4 +9,15 @@ else
     echo "***WARNING***: from \$OPENSHIFT_REPO_DIR/misc/config.php" | tee -a ${OPENSHIFT_PHP_LOG_DIR}/deploy.log
 fi
 
+# Set up various cache directories
+if [ ! -d ${OPENSHIFT_DATA_DIR}/ttrss ]; then
+  echo "Configuring tt-rss cache directories"| tee -a ${OPENSHIFT_PHP_LOG_DIR}/deploy.log
+  mkdir -p ${OPENSHIFT_DATA_DIR}/ttrss
+  cp -r ${OPENSHIFT_REPO_DIR}/php/{cache,lock} ${OPENSHIFT_DATA_DIR}/ttrss/
+  mv ${OPENSHIFT_REPO_DIR}/php/feed-icons ${OPENSHIFT_DATA_DIR}/ttrss/
+else
+  rm -rf ${OPENSHIFT_REPO_DIR}/php/feed-icons
+fi
+ln -sf ${OPENSHIFT_DATA_DIR}/ttrss/feed-icons ${OPENSHIFT_REPO_DIR}/php/feed-icons
+
 cp -a ${OPENSHIFT_REPO_DIR}/misc/htaccess ${OPENSHIFT_REPO_DIR}/php/.htaccess

misc/config.php

@@ -56,11 +56,11 @@
 	// then most probably you are using the CGI binary. If you are unsure what to 
 	// put in here, ask your hosting provider.
 
-	define('LOCK_DIRECTORY', 'lock');
+	define('LOCK_DIRECTORY', getenv(OPENSHIFT_DATA_DIR) . '/ttrss/lock');
 	// Directory for lockfiles, must be writable to the user you run
 	// daemon process or cronjobs under.
 
-	define('CACHE_DIR', 'cache');
+	define('CACHE_DIR', getenv(OPENSHIFT_DATA_DIR) . '/ttrss/cache');
 	// Local cache directory for RSS feed content.
 
 	define('ICONS_DIR', "feed-icons");