[TT] icons are saved in /var/lib/
This commit is contained in:
parent
a1e5d0da8c
commit
2dfb698e80
5 changed files with 19 additions and 8 deletions
|
@ -22,6 +22,7 @@ services:
|
|||
volumes:
|
||||
- ./tt-rss:/app/public/tt-rss/
|
||||
- ./docker/ttrss-config.php:/app/public/tt-rss/config.php:ro
|
||||
- ./docker/ttrss-apache-tt.conf:/etc/apache2/conf.d/tt.conf:ro
|
||||
ports:
|
||||
- 8000:80
|
||||
- 9312:9312
|
||||
|
@ -39,6 +40,7 @@ services:
|
|||
- PHP_DISPLAY_ERRORS=stdout
|
||||
- PHP_DISPLAY_STARTUP_ERROR=1
|
||||
entrypoint: 'wait-db php7 /app/public/tt-rss/update.php --daemon'
|
||||
ports: []
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
|
|
|
@ -3,15 +3,15 @@ RUN apk update && apk upgrade && apk add util-linux php7-pgsql php7-fileinfo ope
|
|||
|
||||
COPY tt-rss/* /app/public/tt-rss/
|
||||
COPY docker/wait-db /usr/bin/
|
||||
COPY docker/ttrss-apache-tt.conf /etc/apache2/conf.d/tt.conf
|
||||
|
||||
RUN mkdir -p /app/public/tt-rss/ /var/cache/tt-rss/images \
|
||||
/var/cache/tt-rss/upload /var/cache/tt-rss/export/ \
|
||||
/var/cache/tt-rss/js /var/lock/tt-rss/ && \
|
||||
chown -R apache:root /app/public /var/cache/tt-rss/ /var/lock/tt-rss/ && \
|
||||
/var/cache/tt-rss/js /var/lock/tt-rss/ /var/lib/tt-rss/feed-icons/ && \
|
||||
chown -R apache:root /app/public /var/cache/tt-rss/ /var/lock/tt-rss/ /var/lib/tt-rss/ && \
|
||||
echo -e 'log_errors = On\nerror_log = syslog' >> /etc/php7/php.ini &&\
|
||||
sed -i '/^Listen/d' /etc/apache2/httpd.conf &&\
|
||||
sed -i -r 's@ErrorLog .*@ErrorLog "/proc/self/fd/2"@i' /etc/apache2/httpd.conf &&\
|
||||
echo -e 'TransferLog "/proc/self/fd/1"\nListen 0.0.0.0:80' >> /etc/apache2/httpd.conf
|
||||
sed -i -r 's@ErrorLog .*@ErrorLog "/proc/self/fd/2"@i' /etc/apache2/httpd.conf
|
||||
|
||||
|
||||
# vim: set ft=dockerfile:
|
||||
|
|
11
docker/ttrss-apache-tt.conf
Normal file
11
docker/ttrss-apache-tt.conf
Normal file
|
@ -0,0 +1,11 @@
|
|||
TransferLog "/proc/self/fd/1"
|
||||
Listen 0.0.0.0:80
|
||||
Alias "/tt-rss/ico" "/var/lib/tt-rss/feed-icons/"
|
||||
<Directory "/var/lib/tt-rss/feed-icons">
|
||||
Require all granted
|
||||
Options -Indexes
|
||||
AllowOverride None
|
||||
</Directory>
|
||||
|
||||
# vim: set bkc=yes ft=apache:
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
define('CACHE_DIR', '/var/cache/tt-rss');
|
||||
// Local cache directory for RSS feed content.
|
||||
|
||||
define('ICONS_DIR', "feed-icons");
|
||||
define('ICONS_DIR', "/var/lib/tt-rss/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
|
||||
|
|
4
dodo.py
4
dodo.py
|
@ -87,10 +87,8 @@ def task_dbprepare():
|
|||
|
||||
def task__fix_perms():
|
||||
'''fix permissions for shared www dir'''
|
||||
# currently empty, but keeping it for later use
|
||||
return {
|
||||
'actions': [
|
||||
'chmod -R 777 tt-rss/feed-icons/ || true'
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue