From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 16 Nov 2011 06:46:11 +0000 (+0400)
Subject: finally rename icons/ (fixes #272)
X-Git-Tag: 1.5.7~8
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=81745ce738542b6a8fc8523ead13d91c5a246cd5;p=tt-rss.git

finally rename icons/ (fixes #272)
---

diff --git a/.gitignore b/.gitignore
index c62024a3..9c7c138e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 #*
 .idea/*
 config.php
-icons/*
+feed-icons/*
 cache/*/*
 lock/*
 tags
diff --git a/config.php-dist b/config.php-dist
index 7ecbad7f..4e231a6f 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -26,14 +26,11 @@
 	// Note that you (or your users) also have to enable image caching 
 	// in feed editor.
 
-	define('ICONS_DIR', "icons");
-	define('ICONS_URL', "icons");
+	define('ICONS_DIR', "feed-icons");
+	define('ICONS_URL', "feed-icons");
 	// Local and URL path to the directory, where feed favicons are stored.
 	// Unless you really know what you're doing, please keep those relative
 	// to tt-rss main directory.
-	// Please note that Apache may reserve /icons/ URL to itself so you might
-	// need to change this and rename icons/ directory if you install tt-rss
-	// into website root.
 
 	define('TMP_DIRECTORY', '/tmp');
 	// Directory for temporary files
diff --git a/debian/tt-rss-common.postinst b/debian/tt-rss-common.postinst
index 2b455cac..15286c1f 100644
--- a/debian/tt-rss-common.postinst
+++ b/debian/tt-rss-common.postinst
@@ -13,8 +13,8 @@ case "$1" in
 
 
 	echo "create misc folders"
-	if [ ! -d /usr/share/tt-rss/www/icons/ ]; then
-	install -d -m775 -gwww-data /usr/share/tt-rss/www/icons
+	if [ ! -d /usr/share/tt-rss/www/feed-icons/ ]; then
+	install -d -m775 -gwww-data /usr/share/tt-rss/www/feed-icons
 	fi
 
 	if [ ! -d /var/lock/tt-rss ]; then
diff --git a/debian/tt-rss-common.postrm b/debian/tt-rss-common.postrm
index c91674de..1911f024 100644
--- a/debian/tt-rss-common.postrm
+++ b/debian/tt-rss-common.postrm
@@ -8,7 +8,7 @@ fi
 
 
 if [ "$1" = "purge" ]; then
-	rm -rf /usr/share/tt-rss/www/icons
+	rm -rf /usr/share/tt-rss/www/feed-icons
 	rm -rf /var/lock/tt-rss
 	rm -rf /var/cache/tt-rss
 fi
diff --git a/feed-icons/.empty b/feed-icons/.empty
new file mode 100644
index 00000000..e69de29b
diff --git a/icons/.empty b/icons/.empty
deleted file mode 100644
index e69de29b..00000000