finally rename icons/ (fixes #272)

diff --git a/.gitignore b/.gitignore
index c62024a37ba22d0e52391f1f9f1b415f6d5d9025..9c7c138e88698c0eef4bdfbf23d7803e068cc07c 100644 (file)
--- 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 7ecbad7fe94baf395b552fd0ddd0fbf26a4d8909..4e231a6f0c81d9a81085dc9e85b3b33c33452038 100644 (file)
--- 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 2b455cacbed1869475d1c747a5d457bab280f037..15286c1fa2efca32e12cd2519b6054cc30dbe065 100644 (file)
--- 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 c91674def87cba2df8ae6ba633a0a126836fad45..1911f0249187b43f62c7d572cf285f19274aecdb 100644 (file)
--- 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 (file)
index 0000000..e69de29

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