diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-16 10:46:11 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-16 10:46:11 +0400 |
| commit | 81745ce738542b6a8fc8523ead13d91c5a246cd5 (patch) | |
| tree | e9068ceb25238a16b93bc34d1ad62dfb9d3cc1fd | |
| parent | e0d91d846dd5ac42a95a0832777cc76aaf579bc2 (diff) | |
finally rename icons/ (fixes #272)
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config.php-dist | 7 | ||||
| -rw-r--r-- | debian/tt-rss-common.postinst | 4 | ||||
| -rw-r--r-- | debian/tt-rss-common.postrm | 2 | ||||
| -rw-r--r-- | feed-icons/.empty (renamed from icons/.empty) | 0 |
5 files changed, 6 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index c62024a37..9c7c138e8 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 7ecbad7fe..4e231a6f0 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 2b455cacb..15286c1fa 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 c91674def..1911f0249 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/icons/.empty b/feed-icons/.empty index e69de29bb..e69de29bb 100644 --- a/icons/.empty +++ b/feed-icons/.empty |